197 files changed, 47393 insertions, 0 deletions

diff --git a/src/lib/libcrypto/Makefile.ssl b/src/lib/libcrypto/Makefile.ssl
new file mode 100644
index 0000000000..efdbba38ac
--- /dev/null
+++ b/src/lib/libcrypto/Makefile.ssl
@@ -0,0 +1,161 @@
+#
+# SSLeay/crypto/Makefile
+#
+
+DIR=            crypto
+TOP=            ..
+CC=             cc
+INCLUDE=        -I. -I../include
+INCLUDES=       -I.. -I../../include
+CFLAG=          -g
+INSTALLTOP=     /usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+RM=             /bin/rm -f
+AR=             ar r
+
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+
+PEX_LIBS=
+EX_LIBS=
+ 
+CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS=" \"$(CC) $(CFLAG)\" "
+
+ERR=crypto
+ERRC=cpt_err
+
+LIBS=
+
+SDIRS=  md2 md5 sha mdc2 hmac ripemd \
+        des rc2 rc4 rc5 idea bf cast \
+        bn rsa dsa dh \
+        buffer bio stack lhash rand err objects \
+        evp pem x509 \
+        asn1 conf txt_db pkcs7
+
+GENERAL=Makefile README
+
+LIB= $(TOP)/libcrypto.a
+LIBSRC= cryptlib.c mem.c cversion.c ex_data.c $(ERRC).c
+LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= crypto.h cryptall.h
+HEADER= cryptlib.h date.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        @(cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all: date.h lib subdirs
+
+date.h: ../Makefile.ssl ../VERSION
+        echo "#define DATE      \"`date`\"" >date.h
+
+subdirs:
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making all in $$i..."; \
+        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_MULW='${BN_MULW}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${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}' all ); \
+        done;
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making 'files' in $$i..."; \
+        $(MAKE) files ); \
+        done;
+
+links:
+        /bin/rm -f Makefile 
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../include $(HEADER) ;
+        $(TOP)/util/mklink.sh ../test $(TEST) ;
+        $(TOP)/util/mklink.sh ../apps $(APPS) ;
+        $(TOP)/util/point.sh Makefile.ssl Makefile;
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making links in $$i..."; \
+        $(MAKE) links ); \
+        done;
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+libs:
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making libs in $$i..."; \
+        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
+        done;
+
+tests:
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making tests in $$i..."; \
+        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
+        done;
+
+install:
+        @for i in $(EXHEADER) ;\
+        do \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making install in $$i..."; \
+        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
+        done;
+
+lint:
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making lint in $$i..."; \
+        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
+        done;
+
+depend:
+        $(MAKEDEPEND) $(INCLUDE) $(PROGS) $(LIBSRC)
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making depend in $$i..."; \
+        $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' MAKEDEPEND='${MAKEDEPEND}' depend ); \
+        done;
+
+clean:
+        /bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making clean in $$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 $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making dclean in $$i..."; \
+        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
+        done;
+
+errors:
+        perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl err/err_genc.pl -s $(ERR).h $(ERRC).c
+        @for i in $(SDIRS) ;\
+        do \
+        (cd $$i; echo "making errors in $$i..."; \
+        $(MAKE) errors ); \
+        done;
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/asn1/Makefile.ssl b/src/lib/libcrypto/asn1/Makefile.ssl
new file mode 100644
index 0000000000..30751bd156
--- /dev/null
+++ b/src/lib/libcrypto/asn1/Makefile.ssl
@@ -0,0 +1,120 @@
+#
+# SSLeay/crypto/asn1/Makefile
+#
+
+DIR=    asn1
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=asn1
+ERRC=asn1_err
+GENERAL=Makefile README
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= a_object.c a_bitstr.c a_utctm.c a_int.c a_octet.c a_print.c \
+        a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
+        a_sign.c a_digest.c a_verify.c \
+        x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c \
+        x_name.c x_cinf.c x_x509.c x_crl.c x_info.c x_spki.c \
+        d2i_r_pr.c i2d_r_pr.c d2i_r_pu.c i2d_r_pu.c \
+        d2i_s_pr.c i2d_s_pr.c d2i_s_pu.c i2d_s_pu.c \
+        d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
+        t_req.c t_x509.c t_pkey.c \
+        p7_i_s.c p7_signi.c p7_signd.c p7_recip.c p7_enc_c.c p7_evp.c \
+        p7_dgst.c p7_s_e.c p7_enc.c p7_lib.c \
+        f_int.c f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c d2i_dsap.c n_pkey.c \
+        a_hdr.c x_pkey.c a_bool.c x_exten.c \
+        asn1_par.c asn1_lib.c $(ERRC).c a_meth.c a_bytes.c \
+        evp_asn1.c
+LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_int.o a_octet.o a_print.o \
+        a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
+        a_sign.o a_digest.o a_verify.o \
+        x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o \
+        x_name.o x_cinf.o x_x509.o x_crl.o x_info.o x_spki.o \
+        d2i_r_pr.o i2d_r_pr.o d2i_r_pu.o i2d_r_pu.o \
+        d2i_s_pr.o i2d_s_pr.o d2i_s_pu.o i2d_s_pu.o \
+        d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \
+        t_req.o t_x509.o t_pkey.o \
+        p7_i_s.o p7_signi.o p7_signd.o p7_recip.o p7_enc_c.o p7_evp.o \
+        p7_dgst.o p7_s_e.o p7_enc.o p7_lib.o \
+        f_int.o f_string.o i2d_dhp.o i2d_dsap.o d2i_dhp.o d2i_dsap.o n_pkey.o \
+        a_hdr.o x_pkey.o a_bool.o x_exten.o \
+        asn1_par.o asn1_lib.o $(ERRC).o a_meth.o a_bytes.o \
+        evp_asn1.o
+
+SRC= $(LIBSRC)
+
+EXHEADER=  asn1.h asn1_mac.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+test:   test.c
+        cc -g -I../../include -c test.c
+        cc -g -I../../include -o test test.o -L../.. -lcrypto
+
+pk:     pk.c
+        cc -g -I../../include -c pk.c
+        cc -g -I../../include -o pk pk.o -L../.. -lcrypto
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/asn1/a_bmp.c b/src/lib/libcrypto/asn1/a_bmp.c
new file mode 100644
index 0000000000..774502b1fc
--- /dev/null
+++ b/src/lib/libcrypto/asn1/a_bmp.c
@@ -0,0 +1,90 @@
+/* crypto/asn1/a_bmp.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 "cryptlib.h"
+#include "asn1.h"
+
+/* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER);
+ */
+
+int i2d_ASN1_BMPSTRING(a, pp)
+ASN1_BMPSTRING *a;
+unsigned char **pp;
+        {
+        return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
+                V_ASN1_BMPSTRING,V_ASN1_UNIVERSAL));
+        }
+
+ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(a, pp, length)
+ASN1_BMPSTRING **a;
+unsigned char **pp;
+long length;
+        {
+        ASN1_BMPSTRING *ret=NULL;
+
+        ret=(ASN1_BMPSTRING *)d2i_ASN1_bytes((ASN1_STRING **)a,
+        pp,length,V_ASN1_BMPSTRING,V_ASN1_UNIVERSAL);
+        if (ret == NULL)
+                {
+                ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_ERROR_STACK);
+                return(NULL);
+                }
+        return(ret);
+        }
+
diff --git a/src/lib/libcrypto/asn1/asn1.err b/src/lib/libcrypto/asn1/asn1.err
new file mode 100644
index 0000000000..c8b7011488
--- /dev/null
+++ b/src/lib/libcrypto/asn1/asn1.err
@@ -0,0 +1,182 @@
+/* Error codes for the ASN1 functions. */
+
+/* Function codes. */
+#define ASN1_F_A2D_ASN1_OBJECT                           100
+#define ASN1_F_A2I_ASN1_INTEGER                          101
+#define ASN1_F_A2I_ASN1_STRING                           102
+#define ASN1_F_ASN1_COLLATE_PRIMATIVE                    103
+#define ASN1_F_ASN1_D2I_BIO                              104
+#define ASN1_F_ASN1_D2I_FP                               105
+#define ASN1_F_ASN1_DUP                                  106
+#define ASN1_F_ASN1_GET_OBJECT                           107
+#define ASN1_F_ASN1_HEADER_NEW                           108
+#define ASN1_F_ASN1_I2D_BIO                              109
+#define ASN1_F_ASN1_I2D_FP                               110
+#define ASN1_F_ASN1_INTEGER_SET                          111
+#define ASN1_F_ASN1_INTEGER_TO_BN                        112
+#define ASN1_F_ASN1_OBJECT_NEW                           113
+#define ASN1_F_ASN1_SIGN                                 114
+#define ASN1_F_ASN1_STRING_NEW                           115
+#define ASN1_F_ASN1_STRING_TYPE_NEW                      116
+#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             117
+#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 118
+#define ASN1_F_ASN1_TYPE_NEW                             119
+#define ASN1_F_ASN1_UTCTIME_NEW                          120
+#define ASN1_F_ASN1_VERIFY                               121
+#define ASN1_F_BN_TO_ASN1_INTEGER                        122
+#define ASN1_F_D2I_ASN1_BIT_STRING                       123
+#define ASN1_F_D2I_ASN1_BMPSTRING                        124
+#define ASN1_F_D2I_ASN1_BOOLEAN                          125
+#define ASN1_F_D2I_ASN1_BYTES                            126
+#define ASN1_F_D2I_ASN1_HEADER                           127
+#define ASN1_F_D2I_ASN1_INTEGER                          128
+#define ASN1_F_D2I_ASN1_OBJECT                           129
+#define ASN1_F_D2I_ASN1_OCTET_STRING                     130
+#define ASN1_F_D2I_ASN1_PRINT_TYPE                       131
+#define ASN1_F_D2I_ASN1_SET                              132
+#define ASN1_F_D2I_ASN1_TYPE                             133
+#define ASN1_F_D2I_ASN1_TYPE_BYTES                       134
+#define ASN1_F_D2I_ASN1_UTCTIME                          135
+#define ASN1_F_D2I_DHPARAMS                              136
+#define ASN1_F_D2I_DSAPARAMS                             137
+#define ASN1_F_D2I_DSAPRIVATEKEY                         138
+#define ASN1_F_D2I_DSAPUBLICKEY                          139
+#define ASN1_F_D2I_NETSCAPE_PKEY                         140
+#define ASN1_F_D2I_NETSCAPE_RSA                          141
+#define ASN1_F_D2I_NETSCAPE_RSA_2                        142
+#define ASN1_F_D2I_NETSCAPE_SPKAC                        143
+#define ASN1_F_D2I_NETSCAPE_SPKI                         144
+#define ASN1_F_D2I_PKCS7                                 145
+#define ASN1_F_D2I_PKCS7_DIGEST                          146
+#define ASN1_F_D2I_PKCS7_ENCRYPT                         147
+#define ASN1_F_D2I_PKCS7_ENC_CONTENT                     148
+#define ASN1_F_D2I_PKCS7_ENVELOPE                        149
+#define ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL               150
+#define ASN1_F_D2I_PKCS7_RECIP_INFO                      151
+#define ASN1_F_D2I_PKCS7_SIGNED                          152
+#define ASN1_F_D2I_PKCS7_SIGNER_INFO                     153
+#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE                   154
+#define ASN1_F_D2I_PRIVATEKEY                            155
+#define ASN1_F_D2I_PUBLICKEY                             156
+#define ASN1_F_D2I_RSAPRIVATEKEY                         157
+#define ASN1_F_D2I_RSAPUBLICKEY                          158
+#define ASN1_F_D2I_X509                                  159
+#define ASN1_F_D2I_X509_ALGOR                            160
+#define ASN1_F_D2I_X509_ATTRIBUTE                        161
+#define ASN1_F_D2I_X509_CINF                             162
+#define ASN1_F_D2I_X509_CRL                              163
+#define ASN1_F_D2I_X509_CRL_INFO                         164
+#define ASN1_F_D2I_X509_EXTENSION                        165
+#define ASN1_F_D2I_X509_KEY                              166
+#define ASN1_F_D2I_X509_NAME                             167
+#define ASN1_F_D2I_X509_NAME_ENTRY                       168
+#define ASN1_F_D2I_X509_PKEY                             169
+#define ASN1_F_D2I_X509_PUBKEY                           170
+#define ASN1_F_D2I_X509_REQ                              171
+#define ASN1_F_D2I_X509_REQ_INFO                         172
+#define ASN1_F_D2I_X509_REVOKED                          173
+#define ASN1_F_D2I_X509_SIG                              174
+#define ASN1_F_D2I_X509_VAL                              175
+#define ASN1_F_I2D_ASN1_HEADER                           176
+#define ASN1_F_I2D_DHPARAMS                              177
+#define ASN1_F_I2D_DSAPARAMS                             178
+#define ASN1_F_I2D_DSAPRIVATEKEY                         179
+#define ASN1_F_I2D_DSAPUBLICKEY                          180
+#define ASN1_F_I2D_NETSCAPE_RSA                          181
+#define ASN1_F_I2D_PKCS7                                 182
+#define ASN1_F_I2D_PRIVATEKEY                            183
+#define ASN1_F_I2D_PUBLICKEY                             184
+#define ASN1_F_I2D_RSAPRIVATEKEY                         185
+#define ASN1_F_I2D_RSAPUBLICKEY                          186
+#define ASN1_F_I2D_X509_ATTRIBUTE                        187
+#define ASN1_F_I2T_ASN1_OBJECT                           188
+#define ASN1_F_NETSCAPE_PKEY_NEW                         189
+#define ASN1_F_NETSCAPE_SPKAC_NEW                        190
+#define ASN1_F_NETSCAPE_SPKI_NEW                         191
+#define ASN1_F_PKCS7_DIGEST_NEW                          192
+#define ASN1_F_PKCS7_ENCRYPT_NEW                         193
+#define ASN1_F_PKCS7_ENC_CONTENT_NEW                     194
+#define ASN1_F_PKCS7_ENVELOPE_NEW                        195
+#define ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW               196
+#define ASN1_F_PKCS7_NEW                                 197
+#define ASN1_F_PKCS7_RECIP_INFO_NEW                      198
+#define ASN1_F_PKCS7_SIGNED_NEW                          199
+#define ASN1_F_PKCS7_SIGNER_INFO_NEW                     200
+#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW                   201
+#define ASN1_F_X509_ALGOR_NEW                            202
+#define ASN1_F_X509_ATTRIBUTE_NEW                        203
+#define ASN1_F_X509_CINF_NEW                             204
+#define ASN1_F_X509_CRL_INFO_NEW                         205
+#define ASN1_F_X509_CRL_NEW                              206
+#define ASN1_F_X509_DHPARAMS_NEW                         207
+#define ASN1_F_X509_EXTENSION_NEW                        208
+#define ASN1_F_X509_INFO_NEW                             209
+#define ASN1_F_X509_KEY_NEW                              210
+#define ASN1_F_X509_NAME_ENTRY_NEW                       211
+#define ASN1_F_X509_NAME_NEW                             212
+#define ASN1_F_X509_NEW                                  213
+#define ASN1_F_X509_PKEY_NEW                             214
+#define ASN1_F_X509_PUBKEY_NEW                           215
+#define ASN1_F_X509_REQ_INFO_NEW                         216
+#define ASN1_F_X509_REQ_NEW                              217
+#define ASN1_F_X509_REVOKED_NEW                          218
+#define ASN1_F_X509_SIG_NEW                              219
+#define ASN1_F_X509_VAL_FREE                             220
+#define ASN1_F_X509_VAL_NEW                              221
+
+/* Reason codes. */
+#define ASN1_R_BAD_CLASS                                 100
+#define ASN1_R_BAD_GET_OBJECT                            101
+#define ASN1_R_BAD_OBJECT_HEADER                         102
+#define ASN1_R_BAD_PASSWORD_READ                         103
+#define ASN1_R_BAD_PKCS7_CONTENT                         104
+#define ASN1_R_BAD_PKCS7_TYPE                            105
+#define ASN1_R_BAD_TAG                                   106
+#define ASN1_R_BAD_TYPE                                  107
+#define ASN1_R_BN_LIB                                    108
+#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   109
+#define ASN1_R_BUFFER_TOO_SMALL                          110
+#define ASN1_R_DATA_IS_WRONG                             111
+#define ASN1_R_DECODING_ERROR                            112
+#define ASN1_R_ERROR_STACK                               113
+#define ASN1_R_EXPECTING_AN_INTEGER                      114
+#define ASN1_R_EXPECTING_AN_OBJECT                       115
+#define ASN1_R_EXPECTING_AN_OCTET_STRING                 116
+#define ASN1_R_EXPECTING_A_BIT_STRING                    117
+#define ASN1_R_EXPECTING_A_BOOLEAN                       118
+#define ASN1_R_EXPECTING_A_SEQUENCE                      119
+#define ASN1_R_EXPECTING_A_UTCTIME                       120
+#define ASN1_R_FIRST_NUM_TOO_LARGE                       121
+#define ASN1_R_HEADER_TOO_LONG                           122
+#define ASN1_R_INVALID_DIGIT                             123
+#define ASN1_R_INVALID_SEPARATOR                         124
+#define ASN1_R_INVALID_TIME_FORMAT                       125
+#define ASN1_R_IV_TOO_LARGE                              126
+#define ASN1_R_LENGTH_ERROR                              127
+#define ASN1_R_LENGTH_MISMATCH                           128
+#define ASN1_R_MISSING_EOS                               129
+#define ASN1_R_MISSING_SECOND_NUMBER                     130
+#define ASN1_R_NON_HEX_CHARACTERS                        131
+#define ASN1_R_NOT_ENOUGH_DATA                           132
+#define ASN1_R_ODD_NUMBER_OF_CHARS                       133
+#define ASN1_R_PARSING                                   134
+#define ASN1_R_PRIVATE_KEY_HEADER_MISSING                135
+#define ASN1_R_SECOND_NUMBER_TOO_LARGE                   136
+#define ASN1_R_SHORT_LINE                                137
+#define ASN1_R_STRING_TOO_SHORT                          138
+#define ASN1_R_TAG_VALUE_TOO_HIGH                        139
+#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 140
+#define ASN1_R_TOO_LONG                                  141
+#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  142
+#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          143
+#define ASN1_R_UNKNOWN_ATTRIBUTE_TYPE                    144
+#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          145
+#define ASN1_R_UNKNOWN_OBJECT_TYPE                       146
+#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   147
+#define ASN1_R_UNSUPPORTED_CIPHER                        148
+#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          149
+#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               150
+#define ASN1_R_UTCTIME_TOO_LONG                          151
+#define ASN1_R_WRONG_PRINTABLE_TYPE                      152
+#define ASN1_R_WRONG_TAG                                 153
+#define ASN1_R_WRONG_TYPE                                154
diff --git a/src/lib/libcrypto/asn1/d2i_dhp.c b/src/lib/libcrypto/asn1/d2i_dhp.c
new file mode 100644
index 0000000000..616a308100
--- /dev/null
+++ b/src/lib/libcrypto/asn1/d2i_dhp.c
@@ -0,0 +1,108 @@
+/* crypto/asn1/d2i_dhp.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 "cryptlib.h"
+#include "bn.h"
+#include "dh.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_DHPARAMS,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_DHPARAMS,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+DH *d2i_DHparams(a,pp,length)
+DH **a;
+unsigned char **pp;
+long length;
+        {
+        int i=ASN1_R_ERROR_STACK;
+        ASN1_INTEGER *bs=NULL;
+        long v=0;
+        M_ASN1_D2I_vars(a,DH *,DH_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->p=BN_bin2bn(bs->data,bs->length,ret->p)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->g=BN_bin2bn(bs->data,bs->length,ret->g)) == NULL) goto err_bn;
+
+        if (!M_ASN1_D2I_end_sequence())
+                {
+                M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+                for (i=0; i<bs->length; i++)
+                        v=(v<<8)|(bs->data[i]);
+                ret->length=(int)v;
+                }
+
+        ASN1_BIT_STRING_free(bs);
+
+        M_ASN1_D2I_Finish_2(a);
+
+err_bn:
+        i=ERR_R_BN_LIB;
+err:
+        ASN1err(ASN1_F_D2I_DHPARAMS,i);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret))) DH_free(ret);
+        if (bs != NULL) ASN1_BIT_STRING_free(bs);
+        return(NULL);
+        }
+
diff --git a/src/lib/libcrypto/asn1/d2i_dsap.c b/src/lib/libcrypto/asn1/d2i_dsap.c
new file mode 100644
index 0000000000..2c8ac7bbcf
--- /dev/null
+++ b/src/lib/libcrypto/asn1/d2i_dsap.c
@@ -0,0 +1,101 @@
+/* crypto/asn1/d2i_dsap.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 "cryptlib.h"
+#include "bn.h"
+#include "dsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_DSAPARAMS,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_DSAPARAMS,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+DSA *d2i_DSAparams(a,pp,length)
+DSA **a;
+unsigned char **pp;
+long length;
+        {
+        int i=ASN1_R_ERROR_STACK;
+        ASN1_INTEGER *bs=NULL;
+        M_ASN1_D2I_vars(a,DSA *,DSA_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->p=BN_bin2bn(bs->data,bs->length,ret->p)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->q=BN_bin2bn(bs->data,bs->length,ret->q)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->g=BN_bin2bn(bs->data,bs->length,ret->g)) == NULL) goto err_bn;
+
+        ASN1_BIT_STRING_free(bs);
+
+        M_ASN1_D2I_Finish_2(a);
+
+err_bn:
+        i=ERR_R_BN_LIB;
+err:
+        ASN1err(ASN1_F_D2I_DSAPARAMS,i);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret))) DSA_free(ret);
+        if (bs != NULL) ASN1_BIT_STRING_free(bs);
+        return(NULL);
+        }
+
diff --git a/src/lib/libcrypto/asn1/d2i_r_pr.c b/src/lib/libcrypto/asn1/d2i_r_pr.c
new file mode 100644
index 0000000000..0c53aa94bf
--- /dev/null
+++ b/src/lib/libcrypto/asn1/d2i_r_pr.c
@@ -0,0 +1,129 @@
+/* crypto/asn1/d2i_r_pr.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 "cryptlib.h"
+#include "bn.h"
+#include "rsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_PARSING);
+ */
+
+static ASN1_METHOD method={
+        (int (*)())  i2d_RSAPrivateKey,
+        (char *(*)())d2i_RSAPrivateKey,
+        (char *(*)())RSA_new,
+        (void (*)()) RSA_free};
+
+ASN1_METHOD *RSAPrivateKey_asn1_meth()
+        {
+        return(&method);
+        }
+
+RSA *d2i_RSAPrivateKey(a,pp,length)
+RSA **a;
+unsigned char **pp;
+long length;
+        {
+        int i=ASN1_R_PARSING;
+        ASN1_INTEGER *bs=NULL;
+        M_ASN1_D2I_vars(a,RSA *,RSA_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if (bs->length == 0)
+                ret->version=0;
+        else    ret->version=bs->data[0];
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->n=BN_bin2bn(bs->data,bs->length,ret->n)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->e=BN_bin2bn(bs->data,bs->length,ret->e)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->d=BN_bin2bn(bs->data,bs->length,ret->d)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->p=BN_bin2bn(bs->data,bs->length,ret->p)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->q=BN_bin2bn(bs->data,bs->length,ret->q)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->dmp1=BN_bin2bn(bs->data,bs->length,ret->dmp1)) == NULL)
+                goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->dmq1=BN_bin2bn(bs->data,bs->length,ret->dmq1)) == NULL)
+                goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->iqmp=BN_bin2bn(bs->data,bs->length,ret->iqmp)) == NULL)
+                goto err_bn;
+
+        ASN1_INTEGER_free(bs);
+
+        M_ASN1_D2I_Finish_2(a);
+err_bn:
+        i=ERR_R_BN_LIB;
+err:
+        ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,i);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret))) RSA_free(ret);
+        if (bs != NULL) ASN1_INTEGER_free(bs);
+        return(NULL);
+        }
+
diff --git a/src/lib/libcrypto/asn1/d2i_r_pu.c b/src/lib/libcrypto/asn1/d2i_r_pu.c
new file mode 100644
index 0000000000..778b792b1e
--- /dev/null
+++ b/src/lib/libcrypto/asn1/d2i_r_pu.c
@@ -0,0 +1,100 @@
+/* crypto/asn1/d2i_r_pu.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 "cryptlib.h"
+#include "bn.h"
+#include "rsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_RSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+RSA *d2i_RSAPublicKey(a,pp,length)
+RSA **a;
+unsigned char **pp;
+long length;
+        {
+        int i=ASN1_R_PARSING;
+        ASN1_INTEGER *bs=NULL;
+        M_ASN1_D2I_vars(a,RSA *,RSA_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->n=BN_bin2bn(bs->data,bs->length,ret->n)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->e=BN_bin2bn(bs->data,bs->length,ret->e)) == NULL) goto err_bn;
+
+        ASN1_INTEGER_free(bs);
+        bs=NULL;
+
+        M_ASN1_D2I_Finish_2(a);
+
+err_bn:
+        i=ERR_R_BN_LIB;
+err:
+        ASN1err(ASN1_F_D2I_RSAPUBLICKEY,i);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret))) RSA_free(ret);
+        if (bs != NULL) ASN1_INTEGER_free(bs);
+        return(NULL);
+        }
+
diff --git a/src/lib/libcrypto/asn1/d2i_s_pr.c b/src/lib/libcrypto/asn1/d2i_s_pr.c
new file mode 100644
index 0000000000..32ff8ba4b3
--- /dev/null
+++ b/src/lib/libcrypto/asn1/d2i_s_pr.c
@@ -0,0 +1,113 @@
+/* crypto/asn1/d2i_s_pr.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.]
+ */
+
+/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "bn.h"
+#include "dsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_DSAPRIVATEKEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_PARSING);
+ */
+
+DSA *d2i_DSAPrivateKey(a,pp,length)
+DSA **a;
+unsigned char **pp;
+long length;
+        {
+        int i=ASN1_R_PARSING;
+        ASN1_INTEGER *bs=NULL;
+        M_ASN1_D2I_vars(a,DSA *,DSA_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if (bs->length == 0)
+                ret->version=0;
+        else    ret->version=bs->data[0];
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->p=BN_bin2bn(bs->data,bs->length,ret->p)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->q=BN_bin2bn(bs->data,bs->length,ret->q)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->g=BN_bin2bn(bs->data,bs->length,ret->g)) == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->pub_key=BN_bin2bn(bs->data,bs->length,ret->pub_key))
+                == NULL) goto err_bn;
+        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+        if ((ret->priv_key=BN_bin2bn(bs->data,bs->length,ret->priv_key))
+                == NULL) goto err_bn;
+
+        ASN1_INTEGER_free(bs);
+
+        M_ASN1_D2I_Finish_2(a);
+err_bn:
+        i=ERR_R_BN_LIB;
+err:
+        ASN1err(ASN1_F_D2I_DSAPRIVATEKEY,i);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret))) DSA_free(ret);
+        if (bs != NULL) ASN1_INTEGER_free(bs);
+        return(NULL);
+        }
+
diff --git a/src/lib/libcrypto/asn1/d2i_s_pu.c b/src/lib/libcrypto/asn1/d2i_s_pu.c
new file mode 100644
index 0000000000..1002f41cd8
--- /dev/null
+++ b/src/lib/libcrypto/asn1/d2i_s_pu.c
@@ -0,0 +1,124 @@
+/* crypto/asn1/d2i_s_pu.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.]
+ */
+
+/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "bn.h"
+#include "dsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_DSAPUBLICKEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+DSA *d2i_DSAPublicKey(a,pp,length)
+DSA **a;
+unsigned char **pp;
+long length;
+        {
+        int i=ASN1_R_PARSING;
+        ASN1_INTEGER *bs=NULL;
+        M_ASN1_D2I_vars(a,DSA *,DSA_new);
+
+        M_ASN1_D2I_Init();
+        if ((length != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED))
+                == (V_ASN1_UNIVERSAL|(V_ASN1_INTEGER))))
+                {
+                c.slen=length;
+                M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+                if ((ret->pub_key=BN_bin2bn(bs->data,bs->length,ret->pub_key))
+                        == NULL)
+                        goto err_bn;
+                ret->write_params=0;
+                }
+        else
+                {
+                M_ASN1_D2I_start_sequence();
+                M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+                if ((ret->pub_key=BN_bin2bn(bs->data,bs->length,ret->pub_key))
+                        == NULL)
+                        goto err_bn;
+                M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+                if ((ret->p=BN_bin2bn(bs->data,bs->length,ret->p)) == NULL)
+                        goto err_bn;
+                M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+                if ((ret->q=BN_bin2bn(bs->data,bs->length,ret->q)) == NULL)
+                        goto err_bn;
+                M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
+                if ((ret->g=BN_bin2bn(bs->data,bs->length,ret->g)) == NULL)
+                        goto err_bn;
+
+                ret->write_params=1;
+                }
+
+        ASN1_INTEGER_free(bs);
+        bs=NULL;
+        M_ASN1_D2I_Finish_2(a);
+err_bn:
+        i=ERR_R_BN_LIB;
+err:
+        ASN1err(ASN1_F_D2I_DSAPUBLICKEY,i);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret))) DSA_free(ret);
+        if (bs != NULL) ASN1_INTEGER_free(bs);
+        return(NULL);
+        }
+
diff --git a/src/lib/libcrypto/asn1/f.c b/src/lib/libcrypto/asn1/f.c
new file mode 100644
index 0000000000..2ab3a262ac
--- /dev/null
+++ b/src/lib/libcrypto/asn1/f.c
@@ -0,0 +1,80 @@
+/* crypto/asn1/f.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 "asn1.h"
+#include "err.h"
+
+main()
+        {
+        ASN1_TYPE *at;
+        char buf[512];
+        int n;
+        long l;
+
+        at=ASN1_TYPE_new();
+
+        n=ASN1_TYPE_set_int_octetstring(at,98736,"01234567",8);
+        printf("%d\n",n);
+        n=ASN1_TYPE_get_int_octetstring(at,&l,buf,8);
+        buf[8]='\0';
+        printf("%ld %d %d\n",l,n,buf[8]);
+        buf[8]='\0';
+        printf("%s\n",buf);
+        ERR_load_crypto_strings();
+        ERR_print_errors_fp(stderr);
+        }
diff --git a/src/lib/libcrypto/asn1/i2d_dhp.c b/src/lib/libcrypto/asn1/i2d_dhp.c
new file mode 100644
index 0000000000..a454025ce3
--- /dev/null
+++ b/src/lib/libcrypto/asn1/i2d_dhp.c
@@ -0,0 +1,128 @@
+/* crypto/asn1/i2d_dhp.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 "cryptlib.h"
+#include "bn.h"
+#include "asn1_mac.h"
+#include "dh.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_DHPARAMS,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_X509_DHPARAMS_NEW,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_DHparams(a,pp)
+DH *a;
+unsigned char **pp;
+        {
+        BIGNUM *num[3];
+        ASN1_INTEGER bs;
+        unsigned int j,i,tot=0,len,max=0;
+        int t,ret= -1;
+        unsigned char *p;
+
+        if (a == NULL) return(0);
+        num[0]=a->p;
+        num[1]=a->g;
+        if (a->length != 0)
+                {
+                if ((num[2]=BN_new()) == NULL) goto err;
+                if (!BN_set_word(num[2],a->length)) goto err;
+                }
+        else    
+                num[2]=NULL;
+
+        for (i=0; i<3; i++)
+                {
+                if (num[i] == NULL) continue;
+                j=BN_num_bits(num[i]);
+                len=((j == 0)?0:((j/8)+1));
+                if (len > max) max=len;
+                len=ASN1_object_size(0,len,
+                        (num[i]->neg)?V_ASN1_NEG_INTEGER:V_ASN1_INTEGER);
+                tot+=len;
+                }
+
+        t=ASN1_object_size(1,tot,V_ASN1_SEQUENCE);
+        if (pp == NULL) return(t);
+
+        p= *pp;
+        ASN1_put_object(&p,1,tot,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+
+        bs.type=V_ASN1_INTEGER;
+        bs.data=(unsigned char *)Malloc(max+4);
+        if (bs.data == NULL)
+                {
+                ASN1err(ASN1_F_I2D_DHPARAMS,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        for (i=0; i<3; i++)
+                {
+                if (num[i] == NULL) continue;
+                bs.length=BN_bn2bin(num[i],bs.data);
+                i2d_ASN1_INTEGER(&bs,&p);
+                }
+        Free((char *)bs.data);
+        ret=t;
+err:
+        if (num[2] != NULL) BN_free(num[2]);
+        *pp=p;
+        return(ret);
+        }
diff --git a/src/lib/libcrypto/asn1/i2d_dsap.c b/src/lib/libcrypto/asn1/i2d_dsap.c
new file mode 100644
index 0000000000..94ecff1525
--- /dev/null
+++ b/src/lib/libcrypto/asn1/i2d_dsap.c
@@ -0,0 +1,121 @@
+/* crypto/asn1/i2d_dsap.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 "cryptlib.h"
+#include "bn.h"
+#include "asn1_mac.h"
+#include "dsa.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_DSAPARAMS,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_DSAparams(a,pp)
+DSA *a;
+unsigned char **pp;
+        {
+        BIGNUM *num[3];
+        ASN1_INTEGER bs;
+        unsigned int j,i,tot=0,len,max=0;
+        int t,ret= -1;
+        unsigned char *p;
+
+        if (a == NULL) return(0);
+        num[0]=a->p;
+        num[1]=a->q;
+        num[2]=a->g;
+
+        for (i=0; i<3; i++)
+                {
+                if (num[i] == NULL) continue;
+                j=BN_num_bits(num[i]);
+                len=((j == 0)?0:((j/8)+1));
+                if (len > max) max=len;
+                len=ASN1_object_size(0,len,
+                        (num[i]->neg)?V_ASN1_NEG_INTEGER:V_ASN1_INTEGER);
+                tot+=len;
+                }
+
+        t=ASN1_object_size(1,tot,V_ASN1_SEQUENCE);
+        if (pp == NULL) return(t);
+
+        p= *pp;
+        ASN1_put_object(&p,1,tot,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+
+        bs.type=V_ASN1_INTEGER;
+        bs.data=(unsigned char *)Malloc(max+4);
+        if (bs.data == NULL)
+                {
+                ASN1err(ASN1_F_I2D_DSAPARAMS,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        for (i=0; i<3; i++)
+                {
+                if (num[i] == NULL) continue;
+                bs.length=BN_bn2bin(num[i],bs.data);
+                i2d_ASN1_INTEGER(&bs,&p);
+                }
+        Free((char *)bs.data);
+        ret=t;
+err:
+        *pp=p;
+        return(ret);
+        }
+
diff --git a/src/lib/libcrypto/asn1/i2d_r_pr.c b/src/lib/libcrypto/asn1/i2d_r_pr.c
new file mode 100644
index 0000000000..aadbb92d8e
--- /dev/null
+++ b/src/lib/libcrypto/asn1/i2d_r_pr.c
@@ -0,0 +1,132 @@
+/* crypto/asn1/i2d_r_pr.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 "cryptlib.h"
+#include "bn.h"
+#include "rsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+int i2d_RSAPrivateKey(a,pp)
+RSA *a;
+unsigned char **pp;
+        {
+        BIGNUM *num[9];
+        unsigned char data[1];
+        ASN1_INTEGER bs;
+        unsigned int j,i,tot,t,len,max=0;
+        unsigned char *p;
+
+        if (a == NULL) return(0);
+
+        num[1]=a->n;
+        num[2]=a->e;
+        num[3]=a->d;
+        num[4]=a->p;
+        num[5]=a->q;
+        num[6]=a->dmp1;
+        num[7]=a->dmq1;
+        num[8]=a->iqmp;
+
+        bs.length=1;
+        bs.data=data;
+        bs.type=V_ASN1_INTEGER;
+        data[0]=a->version&0x7f;
+
+        tot=i2d_ASN1_INTEGER(&(bs),NULL);
+        for (i=1; i<9; i++)
+                {
+                j=BN_num_bits(num[i]);
+                len=((j == 0)?0:((j/8)+1));
+                if (len > max) max=len;
+                len=ASN1_object_size(0,len,
+                        (num[i]->neg)?V_ASN1_NEG_INTEGER:V_ASN1_INTEGER);
+                tot+=len;
+                }
+
+        t=ASN1_object_size(1,tot,V_ASN1_SEQUENCE);
+        if (pp == NULL) return(t);
+
+        p= *pp;
+        ASN1_put_object(&p,1,tot,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+
+        i2d_ASN1_INTEGER(&bs,&p);
+
+        bs.data=(unsigned char *)Malloc(max+4);
+        if (bs.data == NULL)
+                {
+                ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
+                return(-1);
+                }
+
+        for (i=1; i<9; i++)
+                {
+                bs.length=BN_bn2bin(num[i],bs.data);
+                i2d_ASN1_INTEGER(&bs,&p);
+                }
+        Free((char *)bs.data);
+        *pp=p;
+        return(t);
+        }
+
diff --git a/src/lib/libcrypto/asn1/i2d_r_pu.c b/src/lib/libcrypto/asn1/i2d_r_pu.c
new file mode 100644
index 0000000000..3c54f6709d
--- /dev/null
+++ b/src/lib/libcrypto/asn1/i2d_r_pu.c
@@ -0,0 +1,118 @@
+/* crypto/asn1/i2d_r_pu.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 "cryptlib.h"
+#include "bn.h"
+#include "rsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_I2D_RSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+int i2d_RSAPublicKey(a,pp)
+RSA *a;
+unsigned char **pp;
+        {
+        BIGNUM *num[2];
+        ASN1_INTEGER bs;
+        unsigned int j,i,tot=0,len,max=0,t;
+        unsigned char *p;
+
+        if (a == NULL) return(0);
+
+        num[0]=a->n;
+        num[1]=a->e;
+
+        for (i=0; i<2; i++)
+                {
+                j=BN_num_bits(num[i]);
+                len=((j == 0)?0:((j/8)+1));
+                if (len > max) max=len;
+                len=ASN1_object_size(0,len,
+                        (num[i]->neg)?V_ASN1_NEG_INTEGER:V_ASN1_INTEGER);
+                tot+=len;
+                }
+
+        t=ASN1_object_size(1,tot,V_ASN1_SEQUENCE);
+        if (pp == NULL) return(t);
+
+        p= *pp;
+        ASN1_put_object(&p,1,tot,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+
+        bs.type=V_ASN1_INTEGER;
+        bs.data=(unsigned char *)Malloc(max+4);
+        if (bs.data == NULL)
+                {
+                ASN1err(ASN1_F_I2D_RSAPUBLICKEY,ERR_R_MALLOC_FAILURE);
+                return(-1);
+                }
+
+        for (i=0; i<2; i++)
+                {
+                bs.length=BN_bn2bin(num[i],bs.data);
+                i2d_ASN1_INTEGER(&bs,&p);
+                }
+        Free((char *)bs.data);
+        *pp=p;
+        return(t);
+        }
+
diff --git a/src/lib/libcrypto/asn1/i2d_s_pr.c b/src/lib/libcrypto/asn1/i2d_s_pr.c
new file mode 100644
index 0000000000..6e95305548
--- /dev/null
+++ b/src/lib/libcrypto/asn1/i2d_s_pr.c
@@ -0,0 +1,128 @@
+/* crypto/asn1/i2d_s_pr.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 "cryptlib.h"
+#include "bn.h"
+#include "dsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+int i2d_DSAPrivateKey(a,pp)
+DSA *a;
+unsigned char **pp;
+        {
+        BIGNUM *num[6];
+        unsigned char data[1];
+        ASN1_INTEGER bs;
+        unsigned int j,i,tot,t,len,max=0;
+        unsigned char *p;
+
+        if (a == NULL) return(0);
+
+        num[1]=a->p;
+        num[2]=a->q;
+        num[3]=a->g;
+        num[4]=a->pub_key;
+        num[5]=a->priv_key;
+
+        bs.length=1;
+        bs.data=data;
+        bs.type=V_ASN1_INTEGER;
+        data[0]=a->version&0x7f;
+
+        tot=i2d_ASN1_INTEGER(&(bs),NULL);
+        for (i=1; i<6; i++)
+                {
+                j=BN_num_bits(num[i]);
+                len=((j == 0)?0:((j/8)+1));
+                if (len > max) max=len;
+                len=ASN1_object_size(0,len,
+                        (num[i]->neg)?V_ASN1_NEG_INTEGER:V_ASN1_INTEGER);
+                tot+=len;
+                }
+
+        t=ASN1_object_size(1,tot,V_ASN1_SEQUENCE);
+        if (pp == NULL) return(t);
+
+        p= *pp;
+        ASN1_put_object(&p,1,tot,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+
+        i2d_ASN1_INTEGER(&bs,&p);
+
+        bs.data=(unsigned char *)Malloc(max+4);
+        if (bs.data == NULL)
+                {
+                ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
+                return(-1);
+                }
+
+        for (i=1; i<6; i++)
+                {
+                bs.length=BN_bn2bin(num[i],bs.data);
+                i2d_ASN1_INTEGER(&bs,&p);
+                }
+        Free((char *)bs.data);
+        *pp=p;
+        return(t);
+        }
+
diff --git a/src/lib/libcrypto/asn1/i2d_s_pu.c b/src/lib/libcrypto/asn1/i2d_s_pu.c
new file mode 100644
index 0000000000..5cf2877069
--- /dev/null
+++ b/src/lib/libcrypto/asn1/i2d_s_pu.c
@@ -0,0 +1,133 @@
+/* crypto/asn1/i2d_s_pu.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 "cryptlib.h"
+#include "bn.h"
+#include "dsa.h"
+#include "objects.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
+ */
+
+int i2d_DSAPublicKey(a,pp)
+DSA *a;
+unsigned char **pp;
+        {
+        BIGNUM *num[4];
+        ASN1_INTEGER bs;
+        unsigned int j,i,tot=0,len,max=0,t=0,all,n=1;
+        unsigned char *p;
+
+        if (a == NULL) return(0);
+
+        all=a->write_params;
+
+        num[0]=a->pub_key;
+        if (all)
+                {
+                num[1]=a->p;
+                num[2]=a->q;
+                num[3]=a->g;
+                n=4;
+                }
+
+        for (i=0; i<n; i++)
+                {
+                j=BN_num_bits(num[i]);
+                len=((j == 0)?0:((j/8)+1));
+                if (len > max) max=len;
+                len=ASN1_object_size(0,len,
+                        (num[i]->neg)?V_ASN1_NEG_INTEGER:V_ASN1_INTEGER);
+                tot+=len;
+                }
+
+        if (all)
+                {
+                t=ASN1_object_size(1,tot,V_ASN1_SEQUENCE);
+                if (pp == NULL) return(t);
+                }
+        else
+                {
+                if (pp == NULL) return(tot);
+                }
+
+        p= *pp;
+        if (all)
+                ASN1_put_object(&p,1,tot,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+
+        bs.type=V_ASN1_INTEGER;
+        bs.data=(unsigned char *)Malloc(max+4);
+        if (bs.data == NULL)
+                {
+                ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ERR_R_MALLOC_FAILURE);
+                return(-1);
+                }
+
+        for (i=0; i<n; i++)
+                {
+                bs.length=BN_bn2bin(num[i],bs.data);
+                i2d_ASN1_INTEGER(&bs,&p);
+                }
+        Free((char *)bs.data);
+        *pp=p;
+        return(t);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_dgst.c b/src/lib/libcrypto/asn1/p7_dgst.c
new file mode 100644
index 0000000000..f71ed8eb1d
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_dgst.c
@@ -0,0 +1,130 @@
+/* crypto/asn1/p7_dgst.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_DIGEST_NEW,ASN1_R_MISSING_EOS);
+ * ASN1err(ASN1_F_D2I_PKCS7_DIGEST,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_DIGEST(a,pp)
+PKCS7_DIGEST *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len(a->md,i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->contents,i2d_PKCS7);
+        M_ASN1_I2D_len(a->digest,i2d_ASN1_OCTET_STRING);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put(a->md,i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->contents,i2d_PKCS7);
+        M_ASN1_I2D_put(a->digest,i2d_ASN1_OCTET_STRING);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_DIGEST *d2i_PKCS7_DIGEST(a,pp,length)
+PKCS7_DIGEST **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_DIGEST *,PKCS7_DIGEST_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get(ret->md,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->contents,d2i_PKCS7);
+        M_ASN1_D2I_get(ret->digest,d2i_ASN1_OCTET_STRING);
+
+        M_ASN1_D2I_Finish(a,PKCS7_DIGEST_free,ASN1_F_D2I_PKCS7_DIGEST);
+        }
+
+PKCS7_DIGEST *PKCS7_DIGEST_new()
+        {
+        PKCS7_DIGEST *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_DIGEST);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->md,X509_ALGOR_new);
+        M_ASN1_New(ret->contents,PKCS7_new);
+        M_ASN1_New(ret->digest,ASN1_OCTET_STRING_new);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_DIGEST_NEW);
+        }
+
+void PKCS7_DIGEST_free(a)
+PKCS7_DIGEST *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        X509_ALGOR_free(a->md);
+        PKCS7_free(a->contents);
+        ASN1_OCTET_STRING_free(a->digest);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_enc.c b/src/lib/libcrypto/asn1/p7_enc.c
new file mode 100644
index 0000000000..874dd78389
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_enc.c
@@ -0,0 +1,120 @@
+/* crypto/asn1/p7_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 <stdio.h>
+#include "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_ENCRYPT_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_ENCRYPT,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_ENCRYPT(a,pp)
+PKCS7_ENCRYPT *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len(a->enc_data,i2d_PKCS7_ENC_CONTENT);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put(a->enc_data,i2d_PKCS7_ENC_CONTENT);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_ENCRYPT *d2i_PKCS7_ENCRYPT(a,pp,length)
+PKCS7_ENCRYPT **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_ENCRYPT *,PKCS7_ENCRYPT_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get(ret->enc_data,d2i_PKCS7_ENC_CONTENT);
+
+        M_ASN1_D2I_Finish(a,PKCS7_ENCRYPT_free,ASN1_F_D2I_PKCS7_ENCRYPT);
+        }
+
+PKCS7_ENCRYPT *PKCS7_ENCRYPT_new()
+        {
+        PKCS7_ENCRYPT *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_ENCRYPT);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->enc_data,PKCS7_ENC_CONTENT_new);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_ENCRYPT_NEW);
+        }
+
+void PKCS7_ENCRYPT_free(a)
+PKCS7_ENCRYPT *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        PKCS7_ENC_CONTENT_free(a->enc_data);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_enc_c.c b/src/lib/libcrypto/asn1/p7_enc_c.c
new file mode 100644
index 0000000000..2860d3e925
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_enc_c.c
@@ -0,0 +1,127 @@
+/* crypto/asn1/p7_enc_c.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_ENC_CONTENT_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_ENC_CONTENT,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_ENC_CONTENT(a,pp)
+PKCS7_ENC_CONTENT *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->content_type,i2d_ASN1_OBJECT);
+        M_ASN1_I2D_len(a->algorithm,i2d_X509_ALGOR);
+        M_ASN1_I2D_len_IMP_opt(a->enc_data,i2d_ASN1_OCTET_STRING);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->content_type,i2d_ASN1_OBJECT);
+        M_ASN1_I2D_put(a->algorithm,i2d_X509_ALGOR);
+        M_ASN1_I2D_put_IMP_opt(a->enc_data,i2d_ASN1_OCTET_STRING,0);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_ENC_CONTENT *d2i_PKCS7_ENC_CONTENT(a,pp,length)
+PKCS7_ENC_CONTENT **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_ENC_CONTENT *,PKCS7_ENC_CONTENT_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->content_type,d2i_ASN1_OBJECT);
+        M_ASN1_D2I_get(ret->algorithm,d2i_X509_ALGOR);
+        M_ASN1_D2I_get_IMP_opt(ret->enc_data,d2i_ASN1_OCTET_STRING,0,
+                V_ASN1_OCTET_STRING);
+
+        M_ASN1_D2I_Finish(a,PKCS7_ENC_CONTENT_free,
+                ASN1_F_D2I_PKCS7_ENC_CONTENT);
+        }
+
+PKCS7_ENC_CONTENT *PKCS7_ENC_CONTENT_new()
+        {
+        PKCS7_ENC_CONTENT *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_ENC_CONTENT);
+        M_ASN1_New(ret->content_type,ASN1_OBJECT_new);
+        M_ASN1_New(ret->algorithm,X509_ALGOR_new);
+        ret->enc_data=NULL;
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_ENC_CONTENT_NEW);
+        }
+
+void PKCS7_ENC_CONTENT_free(a)
+PKCS7_ENC_CONTENT *a;
+        {
+        if (a == NULL) return;
+        ASN1_OBJECT_free(a->content_type);
+        X509_ALGOR_free(a->algorithm);
+        ASN1_OCTET_STRING_free(a->enc_data);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_evp.c b/src/lib/libcrypto/asn1/p7_evp.c
new file mode 100644
index 0000000000..4db0a7fe62
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_evp.c
@@ -0,0 +1,125 @@
+/* crypto/asn1/p7_evp.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_ENVELOPE_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_ENVELOPE,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_ENVELOPE(a,pp)
+PKCS7_ENVELOPE *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len_SET(a->recipientinfo,i2d_PKCS7_RECIP_INFO);
+        M_ASN1_I2D_len(a->enc_data,i2d_PKCS7_ENC_CONTENT);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put_SET(a->recipientinfo,i2d_PKCS7_RECIP_INFO);
+        M_ASN1_I2D_put(a->enc_data,i2d_PKCS7_ENC_CONTENT);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_ENVELOPE *d2i_PKCS7_ENVELOPE(a,pp,length)
+PKCS7_ENVELOPE **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_ENVELOPE *,PKCS7_ENVELOPE_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get_set(ret->recipientinfo,d2i_PKCS7_RECIP_INFO);
+        M_ASN1_D2I_get(ret->enc_data,d2i_PKCS7_ENC_CONTENT);
+
+        M_ASN1_D2I_Finish(a,PKCS7_ENVELOPE_free,ASN1_F_D2I_PKCS7_ENVELOPE);
+        }
+
+PKCS7_ENVELOPE *PKCS7_ENVELOPE_new()
+        {
+        PKCS7_ENVELOPE *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_ENVELOPE);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->recipientinfo,sk_new_null);
+        M_ASN1_New(ret->enc_data,PKCS7_ENC_CONTENT_new);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_ENVELOPE_NEW);
+        }
+
+void PKCS7_ENVELOPE_free(a)
+PKCS7_ENVELOPE *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        sk_pop_free(a->recipientinfo,PKCS7_RECIP_INFO_free);
+        PKCS7_ENC_CONTENT_free(a->enc_data);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_i_s.c b/src/lib/libcrypto/asn1/p7_i_s.c
new file mode 100644
index 0000000000..9b00c556d9
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_i_s.c
@@ -0,0 +1,120 @@
+/* crypto/asn1/p7_i_s.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_ISSUER_AND_SERIAL(a,pp)
+PKCS7_ISSUER_AND_SERIAL *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->issuer,i2d_X509_NAME);
+        M_ASN1_I2D_len(a->serial,i2d_ASN1_INTEGER);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->issuer,i2d_X509_NAME);
+        M_ASN1_I2D_put(a->serial,i2d_ASN1_INTEGER);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL(a,pp,length)
+PKCS7_ISSUER_AND_SERIAL **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_ISSUER_AND_SERIAL *,PKCS7_ISSUER_AND_SERIAL_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->issuer,d2i_X509_NAME);
+        M_ASN1_D2I_get(ret->serial,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_Finish(a,PKCS7_ISSUER_AND_SERIAL_free,
+                ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL);
+        }
+
+PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new()
+        {
+        PKCS7_ISSUER_AND_SERIAL *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_New(ret->issuer,X509_NAME_new);
+        M_ASN1_New(ret->serial,ASN1_INTEGER_new);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW);
+        }
+
+void PKCS7_ISSUER_AND_SERIAL_free(a)
+PKCS7_ISSUER_AND_SERIAL *a;
+        {
+        if (a == NULL) return;
+        X509_NAME_free(a->issuer);
+        ASN1_INTEGER_free(a->serial);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_lib.c b/src/lib/libcrypto/asn1/p7_lib.c
new file mode 100644
index 0000000000..2134e0974a
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_lib.c
@@ -0,0 +1,299 @@
+/* crypto/asn1/p7_lib.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "objects.h"
+
+/* ASN1err(ASN1_F_D2I_PKCS7,ASN1_R_BAD_PKCS7_CONTENT);
+ * ASN1err(ASN1_F_I2D_PKCS7,ASN1_R_BAD_PKCS7_TYPE);
+ * ASN1err(ASN1_F_PKCS7_NEW,ASN1_R_BAD_PKCS7_TYPE);
+ */
+
+int i2d_PKCS7(a,pp)
+PKCS7 *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        if (a->asn1 != NULL)
+                {
+                if (pp == NULL)
+                        return((int)a->length);
+                memcpy(*pp,a->asn1,(int)a->length);
+                *pp+=a->length;
+                return((int)a->length);
+                }
+
+        ret+=4; /* sequence, BER header plus '0 0' end padding */
+        M_ASN1_I2D_len(a->type,i2d_ASN1_OBJECT);
+        if (a->d.ptr != NULL)
+                {
+                ret+=4; /* explicit tag [ 0 ] BER plus '0 0' */
+                switch (OBJ_obj2nid(a->type))
+                        {
+                case NID_pkcs7_data:
+                        M_ASN1_I2D_len(a->d.data,i2d_ASN1_OCTET_STRING);
+                        break;
+                case NID_pkcs7_signed:
+                        M_ASN1_I2D_len(a->d.sign,i2d_PKCS7_SIGNED);
+                        break;
+                case NID_pkcs7_enveloped:
+                        M_ASN1_I2D_len(a->d.enveloped,i2d_PKCS7_ENVELOPE);
+                        break;
+                case NID_pkcs7_signedAndEnveloped:
+                        M_ASN1_I2D_len(a->d.signed_and_enveloped,
+                                i2d_PKCS7_SIGN_ENVELOPE);
+                        break;
+                case NID_pkcs7_digest:
+                        M_ASN1_I2D_len(a->d.digest,i2d_PKCS7_DIGEST);
+                        break;
+                case NID_pkcs7_encrypted:
+                        M_ASN1_I2D_len(a->d.encrypted,i2d_PKCS7_ENCRYPT);
+                        break;
+                default:
+                        break;
+                        }
+                }
+        r=ret;
+        if (pp == NULL) return(r);
+        p= *pp;
+        M_ASN1_I2D_INF_seq_start(V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
+        M_ASN1_I2D_put(a->type,i2d_ASN1_OBJECT);
+
+        if (a->d.ptr != NULL)
+                {
+                M_ASN1_I2D_INF_seq_start(0,V_ASN1_CONTEXT_SPECIFIC);
+                switch (OBJ_obj2nid(a->type))
+                        {
+                case NID_pkcs7_data:
+                        M_ASN1_I2D_put(a->d.data,i2d_ASN1_OCTET_STRING);
+                        break;
+                case NID_pkcs7_signed:
+                        M_ASN1_I2D_put(a->d.sign,i2d_PKCS7_SIGNED);
+                        break;
+                case NID_pkcs7_enveloped:
+                        M_ASN1_I2D_put(a->d.enveloped,i2d_PKCS7_ENVELOPE);
+                        break;
+                case NID_pkcs7_signedAndEnveloped:
+                        M_ASN1_I2D_put(a->d.signed_and_enveloped,
+                                i2d_PKCS7_SIGN_ENVELOPE);
+                        break;
+                case NID_pkcs7_digest:
+                        M_ASN1_I2D_put(a->d.digest,i2d_PKCS7_DIGEST);
+                        break;
+                case NID_pkcs7_encrypted:
+                        M_ASN1_I2D_put(a->d.encrypted,i2d_PKCS7_ENCRYPT);
+                        break;
+                default:
+                        break;
+                        }
+                M_ASN1_I2D_INF_seq_end();
+                }
+        M_ASN1_I2D_INF_seq_end();
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7 *d2i_PKCS7(a,pp,length)
+PKCS7 **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7 *,PKCS7_new);
+
+        if ((a != NULL) && ((*a) != NULL))
+                {
+                if ((*a)->asn1 != NULL)
+                        {
+                        Free((char *)(*a)->asn1);
+                        (*a)->asn1=NULL;
+                        }
+                (*a)->length=0;
+                }
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->type,d2i_ASN1_OBJECT);
+        if (!M_ASN1_D2I_end_sequence())
+                {
+                int Tinf,Ttag,Tclass;
+                long Tlen;
+
+                if (M_ASN1_next != (V_ASN1_CONSTRUCTED|
+                        V_ASN1_CONTEXT_SPECIFIC|0))
+                        {
+                        c.error=ASN1_R_BAD_PKCS7_CONTENT;
+                        goto err;
+                        }
+
+                ret->detached=0;
+
+                c.q=c.p;
+                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,
+                        (c.inf & 1)?(length+ *pp-c.q):c.slen);
+                if (Tinf & 0x80) goto err;
+                c.slen-=(c.p-c.q);
+
+                switch (OBJ_obj2nid(ret->type))
+                        {
+                case NID_pkcs7_data:
+                        M_ASN1_D2I_get(ret->d.data,d2i_ASN1_OCTET_STRING);
+                        break;
+                case NID_pkcs7_signed:
+                        M_ASN1_D2I_get(ret->d.sign,d2i_PKCS7_SIGNED);
+                        if (ret->d.sign->contents->d.ptr == NULL)
+                                ret->detached=1;
+                        break;
+                case NID_pkcs7_enveloped:
+                        M_ASN1_D2I_get(ret->d.enveloped,d2i_PKCS7_ENVELOPE);
+                        break;
+                case NID_pkcs7_signedAndEnveloped:
+                        M_ASN1_D2I_get(ret->d.signed_and_enveloped,
+                                d2i_PKCS7_SIGN_ENVELOPE);
+                        break;
+                case NID_pkcs7_digest:
+                        M_ASN1_D2I_get(ret->d.digest,d2i_PKCS7_DIGEST);
+                        break;
+                case NID_pkcs7_encrypted:
+                        M_ASN1_D2I_get(ret->d.encrypted,d2i_PKCS7_ENCRYPT);
+                        break;
+                default:
+                        c.error=ASN1_R_BAD_PKCS7_TYPE;
+                        goto err;
+                        break;
+                        }
+                if (Tinf == (1|V_ASN1_CONSTRUCTED))
+                        {
+                        if (!ASN1_check_infinite_end(&c.p,c.slen))
+                                {
+                                c.error=ASN1_R_MISSING_EOS;
+                                goto err;
+                                }
+                        }
+                }
+        else
+                ret->detached=1;
+                
+        M_ASN1_D2I_Finish(a,PKCS7_free,ASN1_F_D2I_PKCS7);
+        }
+
+PKCS7 *PKCS7_new()
+        {
+        PKCS7 *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7);
+        ret->type=ASN1_OBJECT_new();
+        ret->asn1=NULL;
+        ret->length=0;
+        ret->detached=0;
+        ret->d.ptr=NULL;
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_NEW);
+        }
+
+void PKCS7_free(a)
+PKCS7 *a;
+        {
+        if (a == NULL) return;
+
+        PKCS7_content_free(a);
+        if (a->type != NULL)
+                {
+                ASN1_OBJECT_free(a->type);
+                }
+        Free((char *)(char *)a);
+        }
+
+void PKCS7_content_free(a)
+PKCS7 *a;
+        {
+        if (a->asn1 != NULL) Free((char *)a->asn1);
+
+        if (a->d.ptr != NULL)
+                {
+                if (a->type == NULL) return;
+
+                switch (OBJ_obj2nid(a->type))
+                        {
+                case NID_pkcs7_data:
+                        ASN1_OCTET_STRING_free(a->d.data);
+                        break;
+                case NID_pkcs7_signed:
+                        PKCS7_SIGNED_free(a->d.sign);
+                        break;
+                case NID_pkcs7_enveloped:
+                        PKCS7_ENVELOPE_free(a->d.enveloped);
+                        break;
+                case NID_pkcs7_signedAndEnveloped:
+                        PKCS7_SIGN_ENVELOPE_free(a->d.signed_and_enveloped);
+                        break;
+                case NID_pkcs7_digest:
+                        PKCS7_DIGEST_free(a->d.digest);
+                        break;
+                case NID_pkcs7_encrypted:
+                        PKCS7_ENCRYPT_free(a->d.encrypted);
+                        break;
+                default:
+                        /* MEMORY LEAK */
+                        break;
+                        }
+                }
+        a->d.ptr=NULL;
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_recip.c b/src/lib/libcrypto/asn1/p7_recip.c
new file mode 100644
index 0000000000..f02233f5a8
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_recip.c
@@ -0,0 +1,132 @@
+/* crypto/asn1/p7_recip.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_RECIP_INFO_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_RECIP_INFO,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_RECIP_INFO(a,pp)
+PKCS7_RECIP_INFO *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len(a->issuer_and_serial,i2d_PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_I2D_len(a->key_enc_algor,i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->enc_key,i2d_ASN1_OCTET_STRING);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put(a->issuer_and_serial,i2d_PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_I2D_put(a->key_enc_algor,i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->enc_key,i2d_ASN1_OCTET_STRING);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_RECIP_INFO *d2i_PKCS7_RECIP_INFO(a,pp,length)
+PKCS7_RECIP_INFO **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_RECIP_INFO *,PKCS7_RECIP_INFO_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get(ret->issuer_and_serial,d2i_PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_D2I_get(ret->key_enc_algor,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->enc_key,d2i_ASN1_OCTET_STRING);
+
+        M_ASN1_D2I_Finish(a,PKCS7_RECIP_INFO_free,ASN1_F_D2I_PKCS7_RECIP_INFO);
+        }
+
+PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new()
+        {
+        PKCS7_RECIP_INFO *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_RECIP_INFO);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->issuer_and_serial,PKCS7_ISSUER_AND_SERIAL_new);
+        M_ASN1_New(ret->key_enc_algor,X509_ALGOR_new);
+        M_ASN1_New(ret->enc_key,ASN1_OCTET_STRING_new);
+        ret->cert=NULL;
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_RECIP_INFO_NEW);
+        }
+
+void PKCS7_RECIP_INFO_free(a)
+PKCS7_RECIP_INFO *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        PKCS7_ISSUER_AND_SERIAL_free(a->issuer_and_serial);
+        X509_ALGOR_free(a->key_enc_algor);
+        ASN1_OCTET_STRING_free(a->enc_key);
+        if (a->cert != NULL) X509_free(a->cert);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_s_e.c b/src/lib/libcrypto/asn1/p7_s_e.c
new file mode 100644
index 0000000000..d344211456
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_s_e.c
@@ -0,0 +1,146 @@
+/* crypto/asn1/p7_s_e.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_SIGN_ENVELOPE_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_SIGN_ENVELOPE,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_SIGN_ENVELOPE(a,pp)
+PKCS7_SIGN_ENVELOPE *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len_SET(a->recipientinfo,i2d_PKCS7_RECIP_INFO);
+        M_ASN1_I2D_len_SET(a->md_algs,i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->enc_data,i2d_PKCS7_ENC_CONTENT);
+        M_ASN1_I2D_len_IMP_set_opt(a->cert,i2d_X509,0);
+        M_ASN1_I2D_len_IMP_set_opt(a->crl,i2d_X509_CRL,1);
+        M_ASN1_I2D_len_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put_SET(a->recipientinfo,i2d_PKCS7_RECIP_INFO);
+        M_ASN1_I2D_put_SET(a->md_algs,i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->enc_data,i2d_PKCS7_ENC_CONTENT);
+        M_ASN1_I2D_put_IMP_set_opt(a->cert,i2d_X509,0);
+        M_ASN1_I2D_put_IMP_set_opt(a->crl,i2d_X509_CRL,1);
+        M_ASN1_I2D_put_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_SIGN_ENVELOPE *d2i_PKCS7_SIGN_ENVELOPE(a,pp,length)
+PKCS7_SIGN_ENVELOPE **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_SIGN_ENVELOPE *,PKCS7_SIGN_ENVELOPE_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get_set(ret->recipientinfo,d2i_PKCS7_RECIP_INFO);
+        M_ASN1_D2I_get_set(ret->md_algs,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->enc_data,d2i_PKCS7_ENC_CONTENT);
+        M_ASN1_D2I_get_IMP_set_opt(ret->cert,d2i_X509,0);
+        M_ASN1_D2I_get_IMP_set_opt(ret->crl,d2i_X509_CRL,1);
+        M_ASN1_D2I_get_set(ret->signer_info,d2i_PKCS7_SIGNER_INFO);
+
+        M_ASN1_D2I_Finish(a,PKCS7_SIGN_ENVELOPE_free,
+                ASN1_F_D2I_PKCS7_SIGN_ENVELOPE);
+        }
+
+PKCS7_SIGN_ENVELOPE *PKCS7_SIGN_ENVELOPE_new()
+        {
+        PKCS7_SIGN_ENVELOPE *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_SIGN_ENVELOPE);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->recipientinfo,sk_new_null);
+        M_ASN1_New(ret->md_algs,sk_new_null);
+        M_ASN1_New(ret->enc_data,PKCS7_ENC_CONTENT_new);
+        ret->cert=NULL;
+        ret->crl=NULL;
+        M_ASN1_New(ret->signer_info,sk_new_null);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_SIGN_ENVELOPE_NEW);
+        }
+
+void PKCS7_SIGN_ENVELOPE_free(a)
+PKCS7_SIGN_ENVELOPE *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        sk_pop_free(a->recipientinfo,PKCS7_RECIP_INFO_free);
+        sk_pop_free(a->md_algs,X509_ALGOR_free);
+        PKCS7_ENC_CONTENT_free(a->enc_data);
+        sk_pop_free(a->cert,X509_free);
+        sk_pop_free(a->crl,X509_CRL_free);
+        sk_pop_free(a->signer_info,PKCS7_SIGNER_INFO_free);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_signd.c b/src/lib/libcrypto/asn1/p7_signd.c
new file mode 100644
index 0000000000..40f9a44fa8
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_signd.c
@@ -0,0 +1,140 @@
+/* crypto/asn1/p7_signd.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_SIGNED_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_SIGNED,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_SIGNED(a,pp)
+PKCS7_SIGNED *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len_SET(a->md_algs,i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->contents,i2d_PKCS7);
+        M_ASN1_I2D_len_IMP_set_opt(a->cert,i2d_X509,0);
+        M_ASN1_I2D_len_IMP_set_opt(a->crl,i2d_X509_CRL,1);
+        M_ASN1_I2D_len_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put_SET(a->md_algs,i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->contents,i2d_PKCS7);
+        M_ASN1_I2D_put_IMP_set_opt(a->cert,i2d_X509,0);
+        M_ASN1_I2D_put_IMP_set_opt(a->crl,i2d_X509_CRL,1);
+        M_ASN1_I2D_put_SET(a->signer_info,i2d_PKCS7_SIGNER_INFO);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_SIGNED *d2i_PKCS7_SIGNED(a,pp,length)
+PKCS7_SIGNED **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_SIGNED *,PKCS7_SIGNED_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get_set(ret->md_algs,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->contents,d2i_PKCS7);
+        M_ASN1_D2I_get_IMP_set_opt(ret->cert,d2i_X509,0);
+        M_ASN1_D2I_get_IMP_set_opt(ret->crl,d2i_X509_CRL,1);
+        M_ASN1_D2I_get_set(ret->signer_info,d2i_PKCS7_SIGNER_INFO);
+
+        M_ASN1_D2I_Finish(a,PKCS7_SIGNED_free,ASN1_F_D2I_PKCS7_SIGNED);
+        }
+
+PKCS7_SIGNED *PKCS7_SIGNED_new()
+        {
+        PKCS7_SIGNED *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_SIGNED);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->md_algs,sk_new_null);
+        M_ASN1_New(ret->contents,PKCS7_new);
+        ret->cert=NULL;
+        ret->crl=NULL;
+        M_ASN1_New(ret->signer_info,sk_new_null);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_SIGNED_NEW);
+        }
+
+void PKCS7_SIGNED_free(a)
+PKCS7_SIGNED *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        sk_pop_free(a->md_algs,X509_ALGOR_free);
+        PKCS7_free(a->contents);
+        sk_pop_free(a->cert,X509_free);
+        sk_pop_free(a->crl,X509_CRL_free);
+        sk_pop_free(a->signer_info,PKCS7_SIGNER_INFO_free);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/p7_signi.c b/src/lib/libcrypto/asn1/p7_signi.c
new file mode 100644
index 0000000000..0da92169fc
--- /dev/null
+++ b/src/lib/libcrypto/asn1/p7_signi.c
@@ -0,0 +1,149 @@
+/* crypto/asn1/p7_signi.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "x509.h"
+
+/*
+ * ASN1err(ASN1_F_PKCS7_SIGNER_INFO_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_SIGNER_INFO,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_PKCS7_SIGNER_INFO(a,pp)
+PKCS7_SIGNER_INFO *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len(a->issuer_and_serial,i2d_PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_I2D_len(a->digest_alg,i2d_X509_ALGOR);
+        M_ASN1_I2D_len_IMP_set_opt(a->auth_attr,i2d_X509_ATTRIBUTE,0);
+        M_ASN1_I2D_len(a->digest_enc_alg,i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->enc_digest,i2d_ASN1_OCTET_STRING);
+        M_ASN1_I2D_len_IMP_set_opt(a->unauth_attr,i2d_X509_ATTRIBUTE,1);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put(a->issuer_and_serial,i2d_PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_I2D_put(a->digest_alg,i2d_X509_ALGOR);
+        M_ASN1_I2D_put_IMP_set_opt(a->auth_attr,i2d_X509_ATTRIBUTE,0);
+        M_ASN1_I2D_put(a->digest_enc_alg,i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->enc_digest,i2d_ASN1_OCTET_STRING);
+        M_ASN1_I2D_put_IMP_set_opt(a->unauth_attr,i2d_X509_ATTRIBUTE,1);
+
+        M_ASN1_I2D_finish();
+        }
+
+PKCS7_SIGNER_INFO *d2i_PKCS7_SIGNER_INFO(a,pp,length)
+PKCS7_SIGNER_INFO **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,PKCS7_SIGNER_INFO *,PKCS7_SIGNER_INFO_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get(ret->issuer_and_serial,d2i_PKCS7_ISSUER_AND_SERIAL);
+        M_ASN1_D2I_get(ret->digest_alg,d2i_X509_ALGOR);
+        M_ASN1_D2I_get_IMP_set_opt(ret->auth_attr,d2i_X509_ATTRIBUTE,0);
+        M_ASN1_D2I_get(ret->digest_enc_alg,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->enc_digest,d2i_ASN1_OCTET_STRING);
+        M_ASN1_D2I_get_IMP_set_opt(ret->unauth_attr,d2i_X509_ATTRIBUTE,1);
+
+        M_ASN1_D2I_Finish(a,PKCS7_SIGNER_INFO_free,
+                ASN1_F_D2I_PKCS7_SIGNER_INFO);
+        }
+
+PKCS7_SIGNER_INFO *PKCS7_SIGNER_INFO_new()
+        {
+        PKCS7_SIGNER_INFO *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,PKCS7_SIGNER_INFO);
+        M_ASN1_New(ret->version,ASN1_INTEGER_new);
+        M_ASN1_New(ret->issuer_and_serial,PKCS7_ISSUER_AND_SERIAL_new);
+        M_ASN1_New(ret->digest_alg,X509_ALGOR_new);
+        ret->auth_attr=NULL;
+        M_ASN1_New(ret->digest_enc_alg,X509_ALGOR_new);
+        M_ASN1_New(ret->enc_digest,ASN1_OCTET_STRING_new);
+        ret->unauth_attr=NULL;
+        ret->pkey=NULL;
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_PKCS7_SIGNER_INFO_NEW);
+        }
+
+void PKCS7_SIGNER_INFO_free(a)
+PKCS7_SIGNER_INFO *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        PKCS7_ISSUER_AND_SERIAL_free(a->issuer_and_serial);
+        X509_ALGOR_free(a->digest_alg);
+        sk_pop_free(a->auth_attr,X509_ATTRIBUTE_free);
+        X509_ALGOR_free(a->digest_enc_alg);
+        ASN1_OCTET_STRING_free(a->enc_digest);
+        sk_pop_free(a->unauth_attr,X509_ATTRIBUTE_free);
+        if (a->pkey != NULL)
+                EVP_PKEY_free(a->pkey);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/pkcs8.c b/src/lib/libcrypto/asn1/pkcs8.c
new file mode 100644
index 0000000000..03fdadd51a
--- /dev/null
+++ b/src/lib/libcrypto/asn1/pkcs8.c
@@ -0,0 +1,142 @@
+/* crypto/asn1/pkcs8.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 "cryptlib.h"
+#include "asn1_mac.h"
+#include "objects.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_X509_KEY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_X509_KEY_NEW,ASN1_R_BAD_GET_OBJECT);
+ */
+
+int i2d_X509_KEY(a,pp)
+X509 *a;
+unsigned char **pp;
+        {
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len(a->cert_info,    i2d_X509_CINF);
+        M_ASN1_I2D_len(a->sig_alg,      i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->signature,    i2d_ASN1_BIT_STRING);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put(a->cert_info,    i2d_X509_CINF);
+        M_ASN1_I2D_put(a->sig_alg,      i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->signature,    i2d_ASN1_BIT_STRING);
+
+        M_ASN1_I2D_finish();
+        }
+
+X509 *d2i_X509_KEY(a,pp,length)
+X509 **a;
+unsigned char **pp;
+long length;
+        {
+        M_ASN1_D2I_vars(a,X509 *,X509_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        M_ASN1_D2I_get(ret->cert_info,d2i_X509_CINF);
+        M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
+        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
+        }
+
+X509 *X509_KEY_new()
+        {
+        X509_KEY *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,X509_KEY);
+        ret->references=1;
+        ret->type=NID
+        M_ASN1_New(ret->cert_info,X509_CINF_new);
+        M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
+        M_ASN1_New(ret->signature,ASN1_BIT_STRING_new);
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_X509_NEW);
+        }
+
+void X509_KEY_free(a)
+X509 *a;
+        {
+        int i;
+
+        if (a == NULL) return;
+
+        i=CRYPTO_add_lock(&a->references,-1,CRYPTO_LOCK_X509_KEY);
+#ifdef REF_PRINT
+        REF_PRINT("X509_KEY",a);
+#endif
+        if (i > 0) return;
+#ifdef REF_CHECK
+        if (i < 0)
+                {
+                fprintf(stderr,"X509_KEY_free, bad reference count\n");
+                abort();
+                }
+#endif
+
+        X509_CINF_free(a->cert_info);
+        X509_ALGOR_free(a->sig_alg);
+        ASN1_BIT_STRING_free(a->signature);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/asn1/x_cinf.c b/src/lib/libcrypto/asn1/x_cinf.c
new file mode 100644
index 0000000000..4fc2cc9f6e
--- /dev/null
+++ b/src/lib/libcrypto/asn1/x_cinf.c
@@ -0,0 +1,197 @@
+/* crypto/asn1/x_cinf.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 "cryptlib.h"
+#include "asn1_mac.h"
+
+/*
+ * ASN1err(ASN1_F_D2I_X509_CINF,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_X509_CINF_NEW,ASN1_R_LENGTH_MISMATCH);
+ */
+
+int i2d_X509_CINF(a,pp)
+X509_CINF *a;
+unsigned char **pp;
+        {
+        int v1=0,v2=0;
+        M_ASN1_I2D_vars(a);
+
+        M_ASN1_I2D_len_EXP_opt(a->version,i2d_ASN1_INTEGER,0,v1);
+        M_ASN1_I2D_len(a->serialNumber,         i2d_ASN1_INTEGER);
+        M_ASN1_I2D_len(a->signature,            i2d_X509_ALGOR);
+        M_ASN1_I2D_len(a->issuer,               i2d_X509_NAME);
+        M_ASN1_I2D_len(a->validity,             i2d_X509_VAL);
+        M_ASN1_I2D_len(a->subject,              i2d_X509_NAME);
+        M_ASN1_I2D_len(a->key,                  i2d_X509_PUBKEY);
+        M_ASN1_I2D_len_IMP_opt(a->issuerUID,    i2d_ASN1_BIT_STRING);
+        M_ASN1_I2D_len_IMP_opt(a->subjectUID,   i2d_ASN1_BIT_STRING);
+        M_ASN1_I2D_len_EXP_set_opt(a->extensions,i2d_X509_EXTENSION,3,V_ASN1_SEQUENCE,v2);
+
+        M_ASN1_I2D_seq_total();
+
+        M_ASN1_I2D_put_EXP_opt(a->version,i2d_ASN1_INTEGER,0,v1);
+        M_ASN1_I2D_put(a->serialNumber,         i2d_ASN1_INTEGER);
+        M_ASN1_I2D_put(a->signature,            i2d_X509_ALGOR);
+        M_ASN1_I2D_put(a->issuer,               i2d_X509_NAME);
+        M_ASN1_I2D_put(a->validity,             i2d_X509_VAL);
+        M_ASN1_I2D_put(a->subject,              i2d_X509_NAME);
+        M_ASN1_I2D_put(a->key,                  i2d_X509_PUBKEY);
+        M_ASN1_I2D_put_IMP_opt(a->issuerUID,    i2d_ASN1_BIT_STRING,1);
+        M_ASN1_I2D_put_IMP_opt(a->subjectUID,   i2d_ASN1_BIT_STRING,2);
+        M_ASN1_I2D_put_EXP_set_opt(a->extensions,i2d_X509_EXTENSION,3,V_ASN1_SEQUENCE,v2);
+
+        M_ASN1_I2D_finish();
+        }
+
+X509_CINF *d2i_X509_CINF(a,pp,length)
+X509_CINF **a;
+unsigned char **pp;
+long length;
+        {
+        int ver=0;
+        M_ASN1_D2I_vars(a,X509_CINF *,X509_CINF_new);
+
+        M_ASN1_D2I_Init();
+        M_ASN1_D2I_start_sequence();
+        /* we have the optional version field */
+        if (M_ASN1_next == (V_ASN1_CONTEXT_SPECIFIC | V_ASN1_CONSTRUCTED | 0))
+                {
+                M_ASN1_D2I_get_EXP_opt(ret->version,d2i_ASN1_INTEGER,0);
+                if (ret->version->data != NULL)
+                        ver=ret->version->data[0];
+                }
+        else
+                {
+                if (ret->version != NULL)
+                        {
+                        ASN1_INTEGER_free(ret->version);
+                        ret->version=NULL;
+                        }
+                }
+        M_ASN1_D2I_get(ret->serialNumber,d2i_ASN1_INTEGER);
+        M_ASN1_D2I_get(ret->signature,d2i_X509_ALGOR);
+        M_ASN1_D2I_get(ret->issuer,d2i_X509_NAME);
+        M_ASN1_D2I_get(ret->validity,d2i_X509_VAL);
+        M_ASN1_D2I_get(ret->subject,d2i_X509_NAME);
+        M_ASN1_D2I_get(ret->key,d2i_X509_PUBKEY);
+        if (ver >= 1) /* version 2 extensions */
+                {
+                if (ret->issuerUID != NULL)
+                        {
+                        ASN1_BIT_STRING_free(ret->issuerUID);
+                        ret->issuerUID=NULL;
+                        }
+                if (ret->subjectUID != NULL)
+                        {
+                        ASN1_BIT_STRING_free(ret->subjectUID);
+                        ret->issuerUID=NULL;
+                        }
+                M_ASN1_D2I_get_IMP_opt(ret->issuerUID,d2i_ASN1_BIT_STRING,  1,
+                        V_ASN1_BIT_STRING);
+                M_ASN1_D2I_get_IMP_opt(ret->subjectUID,d2i_ASN1_BIT_STRING, 2,
+                        V_ASN1_BIT_STRING);
+                }
+        if (ver >= 2) /* version 3 extensions */
+                {
+                if (ret->extensions != NULL)
+                        while (sk_num(ret->extensions))
+                                X509_EXTENSION_free((X509_EXTENSION *)
+                                        sk_pop(ret->extensions));
+                M_ASN1_D2I_get_EXP_set_opt(ret->extensions,d2i_X509_EXTENSION,3,
+                        V_ASN1_SEQUENCE);
+                }
+        M_ASN1_D2I_Finish(a,X509_CINF_free,ASN1_F_D2I_X509_CINF);
+        }
+
+X509_CINF *X509_CINF_new()
+        {
+        X509_CINF *ret=NULL;
+
+        M_ASN1_New_Malloc(ret,X509_CINF);
+        ret->version=NULL;
+        M_ASN1_New(ret->serialNumber,ASN1_INTEGER_new);
+        M_ASN1_New(ret->signature,X509_ALGOR_new);
+        M_ASN1_New(ret->issuer,X509_NAME_new);
+        M_ASN1_New(ret->validity,X509_VAL_new);
+        M_ASN1_New(ret->subject,X509_NAME_new);
+        M_ASN1_New(ret->key,X509_PUBKEY_new);
+        ret->issuerUID=NULL;
+        ret->subjectUID=NULL;
+        ret->extensions=NULL;
+        return(ret);
+        M_ASN1_New_Error(ASN1_F_X509_CINF_NEW);
+        }
+
+void X509_CINF_free(a)
+X509_CINF *a;
+        {
+        if (a == NULL) return;
+        ASN1_INTEGER_free(a->version);
+        ASN1_INTEGER_free(a->serialNumber);
+        X509_ALGOR_free(a->signature);
+        X509_NAME_free(a->issuer);
+        X509_VAL_free(a->validity);
+        X509_NAME_free(a->subject);
+        X509_PUBKEY_free(a->key);
+        ASN1_BIT_STRING_free(a->issuerUID);
+        ASN1_BIT_STRING_free(a->subjectUID);
+        sk_pop_free(a->extensions,X509_EXTENSION_free);
+        Free((char *)a);
+        }
+
diff --git a/src/lib/libcrypto/bf/Makefile.ssl b/src/lib/libcrypto/bf/Makefile.ssl
new file mode 100644
index 0000000000..236671f238
--- /dev/null
+++ b/src/lib/libcrypto/bf/Makefile.ssl
@@ -0,0 +1,107 @@
+#
+# SSLeay/crypto/blowfish/Makefile
+#
+
+DIR=    bf
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+BF_ENC=         bf_enc.o
+# or use
+#DES_ENC=       bx86-elf.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=bftest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c 
+LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= blowfish.h
+HEADER= bf_pi.h bf_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/bx86-elf.o: asm/bx86unix.cpp
+        $(CPP) -DELF asm/bx86unix.cpp | as -o asm/bx86-elf.o
+
+# solaris
+asm/bx86-sol.o: asm/bx86unix.cpp
+        $(CC) -E -DSOL asm/bx86unix.cpp | sed 's/^#.*//' > asm/bx86-sol.s
+        as -o asm/bx86-sol.o asm/bx86-sol.s
+        rm -f asm/bx86-sol.s
+
+# a.out
+asm/bx86-out.o: asm/bx86unix.cpp
+        $(CPP) -DOUT asm/bx86unix.cpp | as -o asm/bx86-out.o
+
+# bsdi
+asm/bx86bsdi.o: asm/bx86unix.cpp
+        $(CPP) -DBSDI asm/bx86unix.cpp | as -o asm/bx86bsdi.o
+
+asm/bx86unix.cpp:
+        (cd asm; perl bf-586.pl cpp >bx86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/point.sh ../../doc/blowfish.doc blowfish.doc ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/bf/Makefile.uni b/src/lib/libcrypto/bf/Makefile.uni
new file mode 100644
index 0000000000..9ba5b0c854
--- /dev/null
+++ b/src/lib/libcrypto/bf/Makefile.uni
@@ -0,0 +1,169 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+DIR=    bf
+TOP=    .
+# use BF_PTR2 for intel boxes,
+# BF_PTR for sparc and MIPS/SGI
+# use nothing for Alpha and HP.
+
+# There are 3 possible performance options, experiment :-)
+#OPTS= -DBF_PTR  # usr for sparc and MIPS/SGI
+#OPTS= -DBF_PTR2 # use for pentium
+OPTS=            # use for pentium pro, Alpha and HP
+
+MAKE=make -f Makefile
+#CC=cc
+#CFLAG= -O
+
+CC=gcc
+#CFLAG= -O4 -funroll-loops -fomit-frame-pointer
+CFLAG= -O3 -fomit-frame-pointer
+
+CFLAGS=$(OPTS) $(CFLAG)
+CPP=$(CC) -E
+AS=as
+
+# Assember version of bf_encrypt().
+BF_ENC=bf_enc.o         # normal C version
+#BF_ENC=asm/bx86-elf.o  # elf format x86
+#BF_ENC=asm/bx86-out.o  # a.out format x86
+#BF_ENC=asm/bx86-sol.o  # solaris format x86 
+#BF_ENC=asm/bx86bsdi.o  # bsdi format x86 
+
+LIBDIR=/usr/local/lib
+BINDIR=/usr/local/bin
+INCDIR=/usr/local/include
+MANDIR=/usr/local/man
+MAN1=1
+MAN3=3
+SHELL=/bin/sh
+LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o
+LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
+
+GENERAL=Makefile Makefile.ssl Makefile.uni asm bf_locl.org README \
+        COPYRIGHT blowfish.doc INSTALL
+
+TESTING=    bftest bfspeed bf_opts
+TESTING_SRC=bftest.c bfspeed.c bf_opts.c
+HEADERS=bf_locl.h blowfish.h bf_pi.h
+
+ALL=    $(GENERAL) $(TESTING_SRC) $(LIBSRC) $(HEADERS)
+
+BLIB=   libblowfish.a
+
+all: $(BLIB) $(TESTING)
+
+cc:
+        $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all
+
+gcc:
+        $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all
+
+x86-elf:
+        $(MAKE) BF_ENC='asm/bx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all
+
+x86-out:
+        $(MAKE) BF_ENC='asm/bx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all
+
+x86-solaris:
+        $(MAKE) BF_ENC='asm/bx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all
+
+x86-bsdi:
+        $(MAKE) BF_ENC='asm/bx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all
+
+# elf
+asm/bx86-elf.o: asm/bx86unix.cpp
+        $(CPP) -DELF asm/bx86unix.cpp | $(AS) -o asm/bx86-elf.o
+
+# solaris
+asm/bx86-sol.o: asm/bx86unix.cpp
+        $(CC) -E -DSOL asm/bx86unix.cpp | sed 's/^#.*//' > asm/bx86-sol.s
+        as -o asm/bx86-sol.o asm/bx86-sol.s
+        rm -f asm/bx86-sol.s
+
+# a.out
+asm/bx86-out.o: asm/bx86unix.cpp
+        $(CPP) -DOUT asm/bx86unix.cpp | $(AS) -o asm/bx86-out.o
+
+# bsdi
+asm/bx86bsdi.o: asm/bx86unix.cpp
+        $(CPP) -DBSDI asm/bx86unix.cpp | $(AS) -o asm/bx86bsdi.o
+
+asm/bx86unix.cpp:
+        (cd asm; perl bf-586.pl cpp >bx86unix.cpp)
+        
+test:   all
+        ./bftest
+
+$(BLIB): $(LIBOBJ)
+        /bin/rm -f $(BLIB)
+        ar cr $(BLIB) $(LIBOBJ)
+        -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \
+        else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \
+        else exit 0; fi; fi
+
+bftest: bftest.o $(BLIB)
+        $(CC) $(CFLAGS) -o bftest bftest.o $(BLIB)
+
+bfspeed: bfspeed.o $(BLIB)
+        $(CC) $(CFLAGS) -o bfspeed bfspeed.o $(BLIB)
+
+bf_opts: bf_opts.o $(BLIB)
+        $(CC) $(CFLAGS) -o bf_opts bf_opts.o $(BLIB)
+
+tags:
+        ctags $(TESTING_SRC) $(LIBBF)
+
+tar:
+        tar chf libbf.tar $(ALL)
+
+shar:
+        shar $(ALL) >libbf.shar
+
+depend:
+        makedepend $(LIBBF) $(TESTING_SRC)
+
+clean:
+        /bin/rm -f *.o tags core $(TESTING) $(BLIB) .nfs* *.old *.bak asm/*.o 
+
+dclean:
+        sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new
+        mv -f Makefile.new Makefile
+
+# Eric is probably going to choke when he next looks at this --tjh
+install: $(BLIB)
+        if test $(INSTALLTOP); then \
+            echo SSL style install; \
+            cp $(BLIB) $(INSTALLTOP)/lib; \
+            if test -s /bin/ranlib; then \
+                /bin/ranlib $(INSTALLTOP)/lib/$(BLIB); \
+            else \
+                if test -s /usr/bin/ranlib; then \
+                /usr/bin/ranlib $(INSTALLTOP)/lib/$(BLIB); \
+            fi; fi; \
+            chmod 644 $(INSTALLTOP)/lib/$(BLIB); \
+            cp blowfish.h $(INSTALLTOP)/include; \
+            chmod 644 $(INSTALLTOP)/include/blowfish.h; \
+        else \
+            echo Standalone install; \
+            cp $(BLIB) $(LIBDIR)/$(BLIB); \
+            if test -s /bin/ranlib; then \
+              /bin/ranlib $(LIBDIR)/$(BLIB); \
+            else \
+              if test -s /usr/bin/ranlib; then \
+                /usr/bin/ranlib $(LIBDIR)/$(BLIB); \
+              fi; \
+            fi; \
+            chmod 644 $(LIBDIR)/$(BLIB); \
+            cp blowfish.h $(INCDIR)/blowfish.h; \
+            chmod 644 $(INCDIR)/blowfish.h; \
+        fi
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/bf/asm/b-win32.asm b/src/lib/libcrypto/bf/asm/b-win32.asm
new file mode 100644
index 0000000000..138c99d0aa
--- /dev/null
+++ b/src/lib/libcrypto/bf/asm/b-win32.asm
@@ -0,0 +1,906 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by bf-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   bf-586.asm
+        .486
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _BF_encrypt
+
+_BF_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        push    esi
+        push    edi
+        ; Load the 2 words
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        xor     eax,            eax
+        mov     ebx,            DWORD PTR [ebp]
+        xor     ecx,            ecx
+        xor     edi,            ebx
+        ; 
+        ; Round 0
+        mov     edx,            DWORD PTR 4[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 1
+        mov     edx,            DWORD PTR 8[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 2
+        mov     edx,            DWORD PTR 12[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 3
+        mov     edx,            DWORD PTR 16[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 4
+        mov     edx,            DWORD PTR 20[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 5
+        mov     edx,            DWORD PTR 24[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 6
+        mov     edx,            DWORD PTR 28[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 7
+        mov     edx,            DWORD PTR 32[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 8
+        mov     edx,            DWORD PTR 36[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 9
+        mov     edx,            DWORD PTR 40[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 10
+        mov     edx,            DWORD PTR 44[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 11
+        mov     edx,            DWORD PTR 48[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 12
+        mov     edx,            DWORD PTR 52[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 13
+        mov     edx,            DWORD PTR 56[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 14
+        mov     edx,            DWORD PTR 60[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 15
+        mov     edx,            DWORD PTR 64[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        ; Load parameter 0 (16) enc=1
+        mov     eax,            DWORD PTR 20[esp]
+        xor     edi,            ebx
+        mov     edx,            DWORD PTR 68[ebp]
+        xor     esi,            edx
+        mov     DWORD PTR 4[eax],edi
+        mov     DWORD PTR [eax],esi
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_BF_encrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _BF_decrypt
+
+_BF_decrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        push    esi
+        push    edi
+        ; Load the 2 words
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        xor     eax,            eax
+        mov     ebx,            DWORD PTR 68[ebp]
+        xor     ecx,            ecx
+        xor     edi,            ebx
+        ; 
+        ; Round 16
+        mov     edx,            DWORD PTR 64[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 15
+        mov     edx,            DWORD PTR 60[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 14
+        mov     edx,            DWORD PTR 56[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 13
+        mov     edx,            DWORD PTR 52[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 12
+        mov     edx,            DWORD PTR 48[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 11
+        mov     edx,            DWORD PTR 44[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 10
+        mov     edx,            DWORD PTR 40[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 9
+        mov     edx,            DWORD PTR 36[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 8
+        mov     edx,            DWORD PTR 32[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 7
+        mov     edx,            DWORD PTR 28[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 6
+        mov     edx,            DWORD PTR 24[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 5
+        mov     edx,            DWORD PTR 20[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 4
+        mov     edx,            DWORD PTR 16[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 3
+        mov     edx,            DWORD PTR 12[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     edi,            ebx
+        ; 
+        ; Round 2
+        mov     edx,            DWORD PTR 8[ebp]
+        mov     ebx,            edi
+        xor     esi,            edx
+        shr     ebx,            16
+        mov     edx,            edi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        xor     eax,            eax
+        xor     esi,            ebx
+        ; 
+        ; Round 1
+        mov     edx,            DWORD PTR 4[ebp]
+        mov     ebx,            esi
+        xor     edi,            edx
+        shr     ebx,            16
+        mov     edx,            esi
+        mov     al,             bh
+        and     ebx,            255
+        mov     cl,             dh
+        and     edx,            255
+        mov     eax,            DWORD PTR 72[eax*4+ebp]
+        mov     ebx,            DWORD PTR 1096[ebx*4+ebp]
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 2120[ecx*4+ebp]
+        xor     ebx,            eax
+        mov     edx,            DWORD PTR 3144[edx*4+ebp]
+        add     ebx,            edx
+        ; Load parameter 0 (1) enc=0
+        mov     eax,            DWORD PTR 20[esp]
+        xor     edi,            ebx
+        mov     edx,            DWORD PTR [ebp]
+        xor     esi,            edx
+        mov     DWORD PTR 4[eax],edi
+        mov     DWORD PTR [eax],esi
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_BF_decrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _BF_cbc_encrypt
+
+_BF_cbc_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        mov     ebp,            DWORD PTR 28[esp]
+        ; getting iv ptr from parameter 4
+        mov     ebx,            DWORD PTR 36[esp]
+        mov     esi,            DWORD PTR [ebx]
+        mov     edi,            DWORD PTR 4[ebx]
+        push    edi
+        push    esi
+        push    edi
+        push    esi
+        mov     ebx,            esp
+        mov     esi,            DWORD PTR 36[esp]
+        mov     edi,            DWORD PTR 40[esp]
+        ; getting encrypt flag from parameter 5
+        mov     ecx,            DWORD PTR 56[esp]
+        ; get and push parameter 3
+        mov     eax,            DWORD PTR 48[esp]
+        push    eax
+        push    ebx
+        cmp     ecx,            0
+        jz      $L000decrypt
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        jz      $L001encrypt_finish
+L002encrypt_loop:
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR 4[esi]
+        xor     eax,            ecx
+        xor     ebx,            edx
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _BF_encrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L002encrypt_loop
+$L001encrypt_finish:
+        mov     ebp,            DWORD PTR 52[esp]
+        and     ebp,            7
+        jz      $L003finish
+        xor     ecx,            ecx
+        xor     edx,            edx
+        mov     ebp,            DWORD PTR $L004cbc_enc_jmp_table[ebp*4]
+        jmp      ebp
+L005ej7:
+        mov     dh,             BYTE PTR 6[esi]
+        shl     edx,            8
+L006ej6:
+        mov     dh,             BYTE PTR 5[esi]
+L007ej5:
+        mov     dl,             BYTE PTR 4[esi]
+L008ej4:
+        mov     ecx,            DWORD PTR [esi]
+        jmp     $L009ejend
+L010ej3:
+        mov     ch,             BYTE PTR 2[esi]
+        shl     ecx,            8
+L011ej2:
+        mov     ch,             BYTE PTR 1[esi]
+L012ej1:
+        mov     cl,             BYTE PTR [esi]
+$L009ejend:
+        xor     eax,            ecx
+        xor     ebx,            edx
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _BF_encrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        jmp     $L003finish
+$L000decrypt:
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        jz      $L013decrypt_finish
+L014decrypt_loop:
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _BF_decrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     ecx,            DWORD PTR 16[esp]
+        mov     edx,            DWORD PTR 20[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR [edi],ecx
+        mov     DWORD PTR 4[edi],edx
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L014decrypt_loop
+$L013decrypt_finish:
+        mov     ebp,            DWORD PTR 52[esp]
+        and     ebp,            7
+        jz      $L003finish
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _BF_decrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     ecx,            DWORD PTR 16[esp]
+        mov     edx,            DWORD PTR 20[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+L015dj7:
+        ror     edx,            16
+        mov     BYTE PTR 6[edi],dl
+        shr     edx,            16
+L016dj6:
+        mov     BYTE PTR 5[edi],dh
+L017dj5:
+        mov     BYTE PTR 4[edi],dl
+L018dj4:
+        mov     DWORD PTR [edi],ecx
+        jmp     $L019djend
+L020dj3:
+        ror     ecx,            16
+        mov     BYTE PTR 2[edi],cl
+        shl     ecx,            16
+L021dj2:
+        mov     BYTE PTR 1[esi],ch
+L022dj1:
+        mov     BYTE PTR [esi], cl
+$L019djend:
+        jmp     $L003finish
+$L003finish:
+        mov     ecx,            DWORD PTR 60[esp]
+        add     esp,            24
+        mov     DWORD PTR [ecx],eax
+        mov     DWORD PTR 4[ecx],ebx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+$L004cbc_enc_jmp_table:
+        DD      0
+        DD      L012ej1
+        DD      L011ej2
+        DD      L010ej3
+        DD      L008ej4
+        DD      L007ej5
+        DD      L006ej6
+        DD      L005ej7
+L023cbc_dec_jmp_table:
+        DD      0
+        DD      L022dj1
+        DD      L021dj2
+        DD      L020dj3
+        DD      L018dj4
+        DD      L017dj5
+        DD      L016dj6
+        DD      L015dj7
+_BF_cbc_encrypt ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/bf/asm/bx86unix.cpp b/src/lib/libcrypto/bf/asm/bx86unix.cpp
new file mode 100644
index 0000000000..cdaa269378
--- /dev/null
+++ b/src/lib/libcrypto/bf/asm/bx86unix.cpp
@@ -0,0 +1,976 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define BF_encrypt _BF_encrypt
+#define BF_decrypt _BF_decrypt
+#define BF_cbc_encrypt _BF_cbc_encrypt
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by bf-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "bf-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl BF_encrypt
+        TYPE(BF_encrypt,@function)
+BF_encrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        movl    12(%esp),       %ebx
+        movl    16(%esp),       %ebp
+        pushl   %esi
+        pushl   %edi
+        /* Load the 2 words */
+        movl    (%ebx),         %edi
+        movl    4(%ebx),        %esi
+        xorl    %eax,           %eax
+        movl    (%ebp),         %ebx
+        xorl    %ecx,           %ecx
+        xorl    %ebx,           %edi
+
+        /* Round 0 */
+        movl    4(%ebp),        %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 1 */
+        movl    8(%ebp),        %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 2 */
+        movl    12(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 3 */
+        movl    16(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 4 */
+        movl    20(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 5 */
+        movl    24(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 6 */
+        movl    28(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 7 */
+        movl    32(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 8 */
+        movl    36(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 9 */
+        movl    40(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 10 */
+        movl    44(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 11 */
+        movl    48(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 12 */
+        movl    52(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 13 */
+        movl    56(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 14 */
+        movl    60(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 15 */
+        movl    64(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        /* Load parameter 0 (16) enc=1 */
+        movl    20(%esp),       %eax
+        xorl    %ebx,           %edi
+        movl    68(%ebp),       %edx
+        xorl    %edx,           %esi
+        movl    %edi,           4(%eax)
+        movl    %esi,           (%eax)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.BF_encrypt_end:
+        SIZE(BF_encrypt,.BF_encrypt_end-BF_encrypt)
+.ident  "BF_encrypt"
+.text
+        .align ALIGN
+.globl BF_decrypt
+        TYPE(BF_decrypt,@function)
+BF_decrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        movl    12(%esp),       %ebx
+        movl    16(%esp),       %ebp
+        pushl   %esi
+        pushl   %edi
+        /* Load the 2 words */
+        movl    (%ebx),         %edi
+        movl    4(%ebx),        %esi
+        xorl    %eax,           %eax
+        movl    68(%ebp),       %ebx
+        xorl    %ecx,           %ecx
+        xorl    %ebx,           %edi
+
+        /* Round 16 */
+        movl    64(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 15 */
+        movl    60(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 14 */
+        movl    56(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 13 */
+        movl    52(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 12 */
+        movl    48(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 11 */
+        movl    44(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 10 */
+        movl    40(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 9 */
+        movl    36(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 8 */
+        movl    32(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 7 */
+        movl    28(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 6 */
+        movl    24(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 5 */
+        movl    20(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 4 */
+        movl    16(%ebp),       %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 3 */
+        movl    12(%ebp),       %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %edi
+
+        /* Round 2 */
+        movl    8(%ebp),        %edx
+        movl    %edi,           %ebx
+        xorl    %edx,           %esi
+        shrl    $16,            %ebx
+        movl    %edi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        xorl    %eax,           %eax
+        xorl    %ebx,           %esi
+
+        /* Round 1 */
+        movl    4(%ebp),        %edx
+        movl    %esi,           %ebx
+        xorl    %edx,           %edi
+        shrl    $16,            %ebx
+        movl    %esi,           %edx
+        movb    %bh,            %al
+        andl    $255,           %ebx
+        movb    %dh,            %cl
+        andl    $255,           %edx
+        movl    72(%ebp,%eax,4),%eax
+        movl    1096(%ebp,%ebx,4),%ebx
+        addl    %eax,           %ebx
+        movl    2120(%ebp,%ecx,4),%eax
+        xorl    %eax,           %ebx
+        movl    3144(%ebp,%edx,4),%edx
+        addl    %edx,           %ebx
+        /* Load parameter 0 (1) enc=0 */
+        movl    20(%esp),       %eax
+        xorl    %ebx,           %edi
+        movl    (%ebp),         %edx
+        xorl    %edx,           %esi
+        movl    %edi,           4(%eax)
+        movl    %esi,           (%eax)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.BF_decrypt_end:
+        SIZE(BF_decrypt,.BF_decrypt_end-BF_decrypt)
+.ident  "BF_decrypt"
+.text
+        .align ALIGN
+.globl BF_cbc_encrypt
+        TYPE(BF_cbc_encrypt,@function)
+BF_cbc_encrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+        movl    28(%esp),       %ebp
+        /* getting iv ptr from parameter 4 */
+        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
+        /* getting encrypt flag from parameter 5 */
+        movl    56(%esp),       %ecx
+        /* get and push parameter 3 */
+        movl    48(%esp),       %eax
+        pushl   %eax
+        pushl   %ebx
+        cmpl    $0,             %ecx
+        jz      .L000decrypt
+        andl    $4294967288,    %ebp
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        jz      .L001encrypt_finish
+.L002encrypt_loop:
+        movl    (%esi),         %ecx
+        movl    4(%esi),        %edx
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    BF_encrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        addl    $8,             %esi
+        addl    $8,             %edi
+        subl    $8,             %ebp
+        jnz     .L002encrypt_loop
+.L001encrypt_finish:
+        movl    52(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L003finish
+        xorl    %ecx,           %ecx
+        xorl    %edx,           %edx
+        movl    .L004cbc_enc_jmp_table(,%ebp,4),%ebp
+        jmp     *%ebp
+.L005ej7:
+        movb    6(%esi),        %dh
+        sall    $8,             %edx
+.L006ej6:
+        movb    5(%esi),        %dh
+.L007ej5:
+        movb    4(%esi),        %dl
+.L008ej4:
+        movl    (%esi),         %ecx
+        jmp     .L009ejend
+.L010ej3:
+        movb    2(%esi),        %ch
+        sall    $8,             %ecx
+.L011ej2:
+        movb    1(%esi),        %ch
+.L012ej1:
+        movb    (%esi),         %cl
+.L009ejend:
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    BF_encrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        jmp     .L003finish
+.align ALIGN
+.L000decrypt:
+        andl    $4294967288,    %ebp
+        movl    16(%esp),       %eax
+        movl    20(%esp),       %ebx
+        jz      .L013decrypt_finish
+.L014decrypt_loop:
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    BF_decrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    16(%esp),       %ecx
+        movl    20(%esp),       %edx
+        xorl    %eax,           %ecx
+        xorl    %ebx,           %edx
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %ecx,           (%edi)
+        movl    %edx,           4(%edi)
+        movl    %eax,           16(%esp)
+        movl    %ebx,           20(%esp)
+        addl    $8,             %esi
+        addl    $8,             %edi
+        subl    $8,             %ebp
+        jnz     .L014decrypt_loop
+.L013decrypt_finish:
+        movl    52(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L003finish
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    BF_decrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    16(%esp),       %ecx
+        movl    20(%esp),       %edx
+        xorl    %eax,           %ecx
+        xorl    %ebx,           %edx
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.L015dj7:
+        rorl    $16,            %edx
+        movb    %dl,            6(%edi)
+        shrl    $16,            %edx
+.L016dj6:
+        movb    %dh,            5(%edi)
+.L017dj5:
+        movb    %dl,            4(%edi)
+.L018dj4:
+        movl    %ecx,           (%edi)
+        jmp     .L019djend
+.L020dj3:
+        rorl    $16,            %ecx
+        movb    %cl,            2(%edi)
+        sall    $16,            %ecx
+.L021dj2:
+        movb    %ch,            1(%esi)
+.L022dj1:
+        movb    %cl,            (%esi)
+.L019djend:
+        jmp     .L003finish
+.align ALIGN
+.L003finish:
+        movl    60(%esp),       %ecx
+        addl    $24,            %esp
+        movl    %eax,           (%ecx)
+        movl    %ebx,           4(%ecx)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.align ALIGN
+.L004cbc_enc_jmp_table:
+        .long 0
+        .long .L012ej1
+        .long .L011ej2
+        .long .L010ej3
+        .long .L008ej4
+        .long .L007ej5
+        .long .L006ej6
+        .long .L005ej7
+.align ALIGN
+.L023cbc_dec_jmp_table:
+        .long 0
+        .long .L022dj1
+        .long .L021dj2
+        .long .L020dj3
+        .long .L018dj4
+        .long .L017dj5
+        .long .L016dj6
+        .long .L015dj7
+.BF_cbc_encrypt_end:
+        SIZE(BF_cbc_encrypt,.BF_cbc_encrypt_end-BF_cbc_encrypt)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/bf/bf_locl.org b/src/lib/libcrypto/bf/bf_locl.org
new file mode 100644
index 0000000000..a5663de8ca
--- /dev/null
+++ b/src/lib/libcrypto/bf/bf_locl.org
@@ -0,0 +1,242 @@
+/* crypto/bf/bf_locl.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *
+ * Always modify bf_locl.org since bf_locl.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+/* Special defines which change the way the code is built depending on the
+   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
+   even newer MIPS CPU's, but at the moment one size fits all for
+   optimization options.  Older Sparc's work better with only UNROLL, but
+   there's no way to tell at compile time what it is you're running on */
+
+#if defined( sun )                    /* Newer Sparc's */
+#  define BF_PTR
+#elif defined( __ultrix )     /* Older MIPS */
+#  define BF_PTR
+#elif defined( __osf1__ )     /* Alpha */
+  /* None */
+#elif defined ( _AIX )                /* RS6000 */
+  /* Unknown */
+#elif defined( __hpux )               /* HP-PA */
+  /* None */
+#elif defined( __aux )                /* 68K */
+  /* Unknown */
+#elif defined( __dgux )               /* 88K (but P6 in latest boxes) */
+  /* Unknown */
+#elif defined( __sgi )                /* Newer MIPS */
+#  define BF_PTR
+#elif defined( i386 )         /* x86 boxes, should be gcc */
+#elif defined( _MSC_VER )     /* x86 boxes, Visual C */
+#endif /* Systems-specific speed defines */
+
+#undef c2l
+#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \
+                         l|=((unsigned long)(*((c)++)))<< 8L, \
+                         l|=((unsigned long)(*((c)++)))<<16L, \
+                         l|=((unsigned long)(*((c)++)))<<24L)
+
+/* NOTE - c is not incremented as per c2l */
+#undef c2ln
+#define c2ln(c,l1,l2,n) { \
+                        c+=n; \
+                        l1=l2=0; \
+                        switch (n) { \
+                        case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
+                        case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
+                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
+                        case 5: l2|=((unsigned long)(*(--(c))));     \
+                        case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
+                        case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
+                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
+                        case 1: l1|=((unsigned long)(*(--(c))));     \
+                                } \
+                        }
+
+#undef l2c
+#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))
+
+/* NOTE - c is not incremented as per l2c */
+#undef l2cn
+#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); \
+                                } \
+                        }
+
+/* NOTE - c is not incremented as per n2l */
+#define n2ln(c,l1,l2,n) { \
+                        c+=n; \
+                        l1=l2=0; \
+                        switch (n) { \
+                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
+                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
+                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
+                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
+                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
+                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
+                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
+                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
+                                } \
+                        }
+
+/* NOTE - c is not incremented as per l2n */
+#define l2nn(l1,l2,c,n) { \
+                        c+=n; \
+                        switch (n) { \
+                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
+                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
+                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
+                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
+                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
+                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
+                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
+                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
+                                } \
+                        }
+
+#undef n2l
+#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
+                         l|=((unsigned long)(*((c)++)))<<16L, \
+                         l|=((unsigned long)(*((c)++)))<< 8L, \
+                         l|=((unsigned long)(*((c)++))))
+
+#undef l2n
+#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))
+
+/* This is actually a big endian algorithm, the most significate byte
+ * is used to lookup array 0 */
+
+/* use BF_PTR2 for intel boxes,
+ * BF_PTR for sparc and MIPS/SGI
+ * use nothing for Alpha and HP.
+ */
+#if !defined(BF_PTR) && !defined(BF_PTR2)
+#undef BF_PTR
+#endif
+
+#define BF_M    0x3fc
+#define BF_0    22L
+#define BF_1    14L
+#define BF_2     6L
+#define BF_3     2L /* left shift */
+
+#if defined(BF_PTR2)
+
+/* This is basically a special pentium verson */
+#define BF_ENC(LL,R,S,P) \
+        { \
+        BF_LONG t,u,v; \
+        u=R>>BF_0; \
+        v=R>>BF_1; \
+        u&=BF_M; \
+        v&=BF_M; \
+        t=  *(BF_LONG *)((unsigned char *)&(S[  0])+u); \
+        u=R>>BF_2; \
+        t+= *(BF_LONG *)((unsigned char *)&(S[256])+v); \
+        v=R<<BF_3; \
+        u&=BF_M; \
+        v&=BF_M; \
+        t^= *(BF_LONG *)((unsigned char *)&(S[512])+u); \
+        LL^=P; \
+        t+= *(BF_LONG *)((unsigned char *)&(S[768])+v); \
+        LL^=t; \
+        }
+
+#elif defined(BF_PTR)
+
+/* This is normally very good */
+
+#define BF_ENC(LL,R,S,P) \
+        LL^=P; \
+        LL^= (((*(BF_LONG *)((unsigned char *)&(S[  0])+((R>>BF_0)&BF_M))+ \
+                *(BF_LONG *)((unsigned char *)&(S[256])+((R>>BF_1)&BF_M)))^ \
+                *(BF_LONG *)((unsigned char *)&(S[512])+((R>>BF_2)&BF_M)))+ \
+                *(BF_LONG *)((unsigned char *)&(S[768])+((R<<BF_3)&BF_M)));
+#else
+
+/* This will always work, even on 64 bit machines and strangly enough,
+ * on the Alpha it is faster than the pointer versions (both 32 and 64
+ * versions of BF_LONG) */
+
+#define BF_ENC(LL,R,S,P) \
+        LL^=P; \
+        LL^=((( S[        (int)(R>>24L)      ] + \
+                S[0x0100+((int)(R>>16L)&0xff)])^ \
+                S[0x0200+((int)(R>> 8L)&0xff)])+ \
+                S[0x0300+((int)(R     )&0xff)])&0xffffffffL;
+#endif
diff --git a/src/lib/libcrypto/bio/Makefile.ssl b/src/lib/libcrypto/bio/Makefile.ssl
new file mode 100644
index 0000000000..42e11e1c94
--- /dev/null
+++ b/src/lib/libcrypto/bio/Makefile.ssl
@@ -0,0 +1,92 @@
+#
+# SSLeay/crypto/bio/Makefile
+#
+
+DIR=    bio
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=bio
+ERRC=bio_err
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= bio_lib.c bio_cb.c $(ERRC).c \
+        bss_mem.c bss_null.c bss_fd.c \
+        bss_file.c bss_sock.c bss_conn.c \
+        bf_null.c bf_buff.c b_print.c b_dump.c \
+        b_sock.c bss_acpt.c bf_nbio.c
+LIBOBJ= bio_lib.o bio_cb.o $(ERRC).o \
+        bss_mem.o bss_null.o bss_fd.o \
+        bss_file.o bss_sock.o bss_conn.o \
+        bf_null.o bf_buff.o b_print.o b_dump.o \
+        b_sock.o bss_acpt.o bf_nbio.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= bio.h bss_file.c
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) bss_file.c ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/bio/bio.err b/src/lib/libcrypto/bio/bio.err
new file mode 100644
index 0000000000..6e2f2b63ca
--- /dev/null
+++ b/src/lib/libcrypto/bio/bio.err
@@ -0,0 +1,46 @@
+/* Error codes for the BIO functions. */
+
+/* Function codes. */
+#define BIO_F_ACPT_STATE                                 100
+#define BIO_F_BIO_ACCEPT                                 101
+#define BIO_F_BIO_CTRL                                   102
+#define BIO_F_BIO_GETS                                   103
+#define BIO_F_BIO_GET_ACCEPT_SOCKET                      104
+#define BIO_F_BIO_GET_HOST_IP                            105
+#define BIO_F_BIO_GET_PORT                               106
+#define BIO_F_BIO_NEW                                    107
+#define BIO_F_BIO_NEW_FILE                               108
+#define BIO_F_BIO_PUTS                                   109
+#define BIO_F_BIO_READ                                   110
+#define BIO_F_BIO_SOCK_INIT                              111
+#define BIO_F_BIO_WRITE                                  112
+#define BIO_F_BUFFER_CTRL                                113
+#define BIO_F_CONN_STATE                                 114
+#define BIO_F_FILE_CTRL                                  115
+#define BIO_F_MEM_WRITE                                  116
+#define BIO_F_SSL_NEW                                    117
+#define BIO_F_WSASTARTUP                                 118
+
+/* Reason codes. */
+#define BIO_R_ACCEPT_ERROR                               100
+#define BIO_R_BAD_FOPEN_MODE                             101
+#define BIO_R_BAD_HOSTNAME_LOOKUP                        102
+#define BIO_R_CONNECT_ERROR                              103
+#define BIO_R_ERROR_SETTING_NBIO                         104
+#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET      105
+#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET        106
+#define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET          107
+#define BIO_R_INVALID_IP_ADDRESS                         108
+#define BIO_R_KEEPALIVE                                  109
+#define BIO_R_NBIO_CONNECT_ERROR                         110
+#define BIO_R_NO_ACCEPT_PORT_SPECIFIED                   111
+#define BIO_R_NO_HOSTHNAME_SPECIFIED                     112
+#define BIO_R_NO_PORT_DEFINED                            113
+#define BIO_R_NO_PORT_SPECIFIED                          114
+#define BIO_R_NULL_PARAMETER                             115
+#define BIO_R_UNABLE_TO_BIND_SOCKET                      116
+#define BIO_R_UNABLE_TO_CREATE_SOCKET                    117
+#define BIO_R_UNABLE_TO_LISTEN_SOCKET                    118
+#define BIO_R_UNINITALISED                               119
+#define BIO_R_UNSUPPORTED_METHOD                         120
+#define BIO_R_WSASTARTUP                                 121
diff --git a/src/lib/libcrypto/bn/Makefile.ssl b/src/lib/libcrypto/bn/Makefile.ssl
new file mode 100644
index 0000000000..9809d26cbc
--- /dev/null
+++ b/src/lib/libcrypto/bn/Makefile.ssl
@@ -0,0 +1,133 @@
+#
+# SSLeay/crypto/bn/Makefile
+#
+
+DIR=    bn
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+BN_MULW=        bn_mulw.o
+# or use
+#BN_MULW=       bn86-elf.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=bn
+ERRC=bn_err
+GENERAL=Makefile
+TEST=bntest.c exptest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mod.c bn_mul.c \
+        bn_print.c bn_rand.c bn_shift.c bn_sub.c bn_word.c bn_blind.c \
+        bn_gcd.c bn_prime.c $(ERRC).c bn_sqr.c bn_mulw.c bn_recp.c bn_mont.c \
+        bn_mpi.c
+
+LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_mod.o bn_mul.o \
+        bn_print.o bn_rand.o bn_shift.o bn_sub.o bn_word.o bn_blind.o \
+        bn_gcd.o bn_prime.o $(ERRC).o bn_sqr.o $(BN_MULW) bn_recp.o bn_mont.o \
+        bn_mpi.o
+
+
+SRC= $(LIBSRC)
+
+EXHEADER= bn.h
+HEADER= bn_lcl.h bn_prime.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+knuth: bn_knuth.c
+        cc -pg -I.. -I../../include bn_knuth.c -o knuth $(LIB) #../../../libefence.a
+
+knuth.fast: bn_knuth.c
+        cc -pg -fast -I.. -I../../include bn_knuth.c -o knuth $(LIB) #../../../libefence.a
+
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/bn86-elf.o: asm/bn86unix.cpp
+        $(CPP) -DELF asm/bn86unix.cpp | as -o asm/bn86-elf.o
+
+# solaris
+asm/bn86-sol.o: asm/bn86unix.cpp
+        $(CC) -E -DSOL asm/bn86unix.cpp | sed 's/^#.*//' > asm/bn86-sol.s
+        as -o asm/bn86-sol.o asm/bn86-sol.s
+        rm -f asm/bn86-sol.s
+
+# a.out
+asm/bn86-out.o: asm/bn86unix.cpp
+        $(CPP) -DOUT asm/bn86unix.cpp | as -o asm/bn86-out.o
+
+# bsdi
+asm/bn86bsdi.o: asm/bn86unix.cpp
+        $(CPP) -DBSDI asm/bn86unix.cpp | as -o asm/bn86bsdi.o
+
+asm/bn86unix.cpp:
+        (cd asm; perl bn-586.pl cpp >bn86unix.cpp )
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+exptest:
+        /bin/rm -f exptest
+        gcc -I../../include -g2 -ggdb -o exptest exptest.c ../../libcrypto.a
+
+div:
+        /bin/rm -f a.out
+        gcc -I.. -g div.c ../../libcrypto.a
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_mulw.s
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # special case .org
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/bn/asm/bn-win32.asm b/src/lib/libcrypto/bn/asm/bn-win32.asm
new file mode 100644
index 0000000000..017ea462b0
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/bn-win32.asm
@@ -0,0 +1,689 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by bn-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   bn-586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _bn_mul_add_words
+
+_bn_mul_add_words PROC NEAR
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        ; 
+        xor     esi,            esi
+        mov     edi,            DWORD PTR 20[esp]
+        mov     ecx,            DWORD PTR 28[esp]
+        mov     ebx,            DWORD PTR 24[esp]
+        and     ecx,            4294967288
+        mov     ebp,            DWORD PTR 32[esp]
+        push    ecx
+        jz      $L000maw_finish
+L001maw_loop:
+        mov     DWORD PTR [esp],ecx
+        ; Round 0
+        mov     eax,            DWORD PTR [ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR [edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR [edi],eax
+        mov     esi,            edx
+        ; Round 4
+        mov     eax,            DWORD PTR 4[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 4[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 4[edi],eax
+        mov     esi,            edx
+        ; Round 8
+        mov     eax,            DWORD PTR 8[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 8[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 8[edi],eax
+        mov     esi,            edx
+        ; Round 12
+        mov     eax,            DWORD PTR 12[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 12[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 12[edi],eax
+        mov     esi,            edx
+        ; Round 16
+        mov     eax,            DWORD PTR 16[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 16[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 16[edi],eax
+        mov     esi,            edx
+        ; Round 20
+        mov     eax,            DWORD PTR 20[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 20[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 20[edi],eax
+        mov     esi,            edx
+        ; Round 24
+        mov     eax,            DWORD PTR 24[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 24[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 24[edi],eax
+        mov     esi,            edx
+        ; Round 28
+        mov     eax,            DWORD PTR 28[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 28[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 28[edi],eax
+        mov     esi,            edx
+        ; 
+        mov     ecx,            DWORD PTR [esp]
+        add     ebx,            32
+        add     edi,            32
+        sub     ecx,            8
+        jnz     L001maw_loop
+$L000maw_finish:
+        mov     ecx,            DWORD PTR 32[esp]
+        and     ecx,            7
+        jnz     $L002maw_finish2
+        jmp     $L003maw_end
+$L002maw_finish2:
+        ; Tail Round 0
+        mov     eax,            DWORD PTR [ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR [edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        dec     ecx
+        mov     DWORD PTR [edi],eax
+        mov     esi,            edx
+        jz      $L003maw_end
+        ; Tail Round 1
+        mov     eax,            DWORD PTR 4[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 4[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        dec     ecx
+        mov     DWORD PTR 4[edi],eax
+        mov     esi,            edx
+        jz      $L003maw_end
+        ; Tail Round 2
+        mov     eax,            DWORD PTR 8[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 8[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        dec     ecx
+        mov     DWORD PTR 8[edi],eax
+        mov     esi,            edx
+        jz      $L003maw_end
+        ; Tail Round 3
+        mov     eax,            DWORD PTR 12[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 12[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        dec     ecx
+        mov     DWORD PTR 12[edi],eax
+        mov     esi,            edx
+        jz      $L003maw_end
+        ; Tail Round 4
+        mov     eax,            DWORD PTR 16[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 16[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        dec     ecx
+        mov     DWORD PTR 16[edi],eax
+        mov     esi,            edx
+        jz      $L003maw_end
+        ; Tail Round 5
+        mov     eax,            DWORD PTR 20[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 20[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        dec     ecx
+        mov     DWORD PTR 20[edi],eax
+        mov     esi,            edx
+        jz      $L003maw_end
+        ; Tail Round 6
+        mov     eax,            DWORD PTR 24[ebx]
+        mul     ebp
+        add     eax,            esi
+        mov     esi,            DWORD PTR 24[edi]
+        adc     edx,            0
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 24[edi],eax
+        mov     esi,            edx
+$L003maw_end:
+        mov     eax,            esi
+        pop     ecx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_bn_mul_add_words ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _bn_mul_words
+
+_bn_mul_words PROC NEAR
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        ; 
+        xor     esi,            esi
+        mov     edi,            DWORD PTR 20[esp]
+        mov     ebx,            DWORD PTR 24[esp]
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     ecx,            DWORD PTR 32[esp]
+        and     ebp,            4294967288
+        jz      $L004mw_finish
+L005mw_loop:
+        ; Round 0
+        mov     eax,            DWORD PTR [ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR [edi],eax
+        mov     esi,            edx
+        ; Round 4
+        mov     eax,            DWORD PTR 4[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 4[edi],eax
+        mov     esi,            edx
+        ; Round 8
+        mov     eax,            DWORD PTR 8[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 8[edi],eax
+        mov     esi,            edx
+        ; Round 12
+        mov     eax,            DWORD PTR 12[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 12[edi],eax
+        mov     esi,            edx
+        ; Round 16
+        mov     eax,            DWORD PTR 16[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 16[edi],eax
+        mov     esi,            edx
+        ; Round 20
+        mov     eax,            DWORD PTR 20[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 20[edi],eax
+        mov     esi,            edx
+        ; Round 24
+        mov     eax,            DWORD PTR 24[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 24[edi],eax
+        mov     esi,            edx
+        ; Round 28
+        mov     eax,            DWORD PTR 28[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 28[edi],eax
+        mov     esi,            edx
+        ; 
+        add     ebx,            32
+        add     edi,            32
+        sub     ebp,            8
+        jz      $L004mw_finish
+        jmp     L005mw_loop
+$L004mw_finish:
+        mov     ebp,            DWORD PTR 28[esp]
+        and     ebp,            7
+        jnz     $L006mw_finish2
+        jmp     $L007mw_end
+$L006mw_finish2:
+        ; Tail Round 0
+        mov     eax,            DWORD PTR [ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR [edi],eax
+        mov     esi,            edx
+        dec     ebp
+        jz      $L007mw_end
+        ; Tail Round 1
+        mov     eax,            DWORD PTR 4[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 4[edi],eax
+        mov     esi,            edx
+        dec     ebp
+        jz      $L007mw_end
+        ; Tail Round 2
+        mov     eax,            DWORD PTR 8[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 8[edi],eax
+        mov     esi,            edx
+        dec     ebp
+        jz      $L007mw_end
+        ; Tail Round 3
+        mov     eax,            DWORD PTR 12[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 12[edi],eax
+        mov     esi,            edx
+        dec     ebp
+        jz      $L007mw_end
+        ; Tail Round 4
+        mov     eax,            DWORD PTR 16[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 16[edi],eax
+        mov     esi,            edx
+        dec     ebp
+        jz      $L007mw_end
+        ; Tail Round 5
+        mov     eax,            DWORD PTR 20[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 20[edi],eax
+        mov     esi,            edx
+        dec     ebp
+        jz      $L007mw_end
+        ; Tail Round 6
+        mov     eax,            DWORD PTR 24[ebx]
+        mul     ecx
+        add     eax,            esi
+        adc     edx,            0
+        mov     DWORD PTR 24[edi],eax
+        mov     esi,            edx
+$L007mw_end:
+        mov     eax,            esi
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_bn_mul_words ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _bn_sqr_words
+
+_bn_sqr_words PROC NEAR
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        ; 
+        mov     esi,            DWORD PTR 20[esp]
+        mov     edi,            DWORD PTR 24[esp]
+        mov     ebx,            DWORD PTR 28[esp]
+        and     ebx,            4294967288
+        jz      $L008sw_finish
+L009sw_loop:
+        ; Round 0
+        mov     eax,            DWORD PTR [edi]
+        mul     eax
+        mov     DWORD PTR [esi],eax
+        mov     DWORD PTR 4[esi],edx
+        ; Round 4
+        mov     eax,            DWORD PTR 4[edi]
+        mul     eax
+        mov     DWORD PTR 8[esi],eax
+        mov     DWORD PTR 12[esi],edx
+        ; Round 8
+        mov     eax,            DWORD PTR 8[edi]
+        mul     eax
+        mov     DWORD PTR 16[esi],eax
+        mov     DWORD PTR 20[esi],edx
+        ; Round 12
+        mov     eax,            DWORD PTR 12[edi]
+        mul     eax
+        mov     DWORD PTR 24[esi],eax
+        mov     DWORD PTR 28[esi],edx
+        ; Round 16
+        mov     eax,            DWORD PTR 16[edi]
+        mul     eax
+        mov     DWORD PTR 32[esi],eax
+        mov     DWORD PTR 36[esi],edx
+        ; Round 20
+        mov     eax,            DWORD PTR 20[edi]
+        mul     eax
+        mov     DWORD PTR 40[esi],eax
+        mov     DWORD PTR 44[esi],edx
+        ; Round 24
+        mov     eax,            DWORD PTR 24[edi]
+        mul     eax
+        mov     DWORD PTR 48[esi],eax
+        mov     DWORD PTR 52[esi],edx
+        ; Round 28
+        mov     eax,            DWORD PTR 28[edi]
+        mul     eax
+        mov     DWORD PTR 56[esi],eax
+        mov     DWORD PTR 60[esi],edx
+        ; 
+        add     edi,            32
+        add     esi,            64
+        sub     ebx,            8
+        jnz     L009sw_loop
+$L008sw_finish:
+        mov     ebx,            DWORD PTR 28[esp]
+        and     ebx,            7
+        jz      $L010sw_end
+        ; Tail Round 0
+        mov     eax,            DWORD PTR [edi]
+        mul     eax
+        mov     DWORD PTR [esi],eax
+        dec     ebx
+        mov     DWORD PTR 4[esi],edx
+        jz      $L010sw_end
+        ; Tail Round 1
+        mov     eax,            DWORD PTR 4[edi]
+        mul     eax
+        mov     DWORD PTR 8[esi],eax
+        dec     ebx
+        mov     DWORD PTR 12[esi],edx
+        jz      $L010sw_end
+        ; Tail Round 2
+        mov     eax,            DWORD PTR 8[edi]
+        mul     eax
+        mov     DWORD PTR 16[esi],eax
+        dec     ebx
+        mov     DWORD PTR 20[esi],edx
+        jz      $L010sw_end
+        ; Tail Round 3
+        mov     eax,            DWORD PTR 12[edi]
+        mul     eax
+        mov     DWORD PTR 24[esi],eax
+        dec     ebx
+        mov     DWORD PTR 28[esi],edx
+        jz      $L010sw_end
+        ; Tail Round 4
+        mov     eax,            DWORD PTR 16[edi]
+        mul     eax
+        mov     DWORD PTR 32[esi],eax
+        dec     ebx
+        mov     DWORD PTR 36[esi],edx
+        jz      $L010sw_end
+        ; Tail Round 5
+        mov     eax,            DWORD PTR 20[edi]
+        mul     eax
+        mov     DWORD PTR 40[esi],eax
+        dec     ebx
+        mov     DWORD PTR 44[esi],edx
+        jz      $L010sw_end
+        ; Tail Round 6
+        mov     eax,            DWORD PTR 24[edi]
+        mul     eax
+        mov     DWORD PTR 48[esi],eax
+        mov     DWORD PTR 52[esi],edx
+$L010sw_end:
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_bn_sqr_words ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _bn_div64
+
+_bn_div64 PROC NEAR
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        mov     edx,            DWORD PTR 20[esp]
+        mov     eax,            DWORD PTR 24[esp]
+        mov     ebx,            DWORD PTR 28[esp]
+        div     ebx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_bn_div64 ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _bn_add_words
+
+_bn_add_words PROC NEAR
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        ; 
+        mov     ebx,            DWORD PTR 20[esp]
+        mov     esi,            DWORD PTR 24[esp]
+        mov     edi,            DWORD PTR 28[esp]
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     eax,            eax
+        and     ebp,            4294967288
+        jz      $L011aw_finish
+L012aw_loop:
+        ; Round 0
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR [edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR [ebx],ecx
+        ; Round 1
+        mov     ecx,            DWORD PTR 4[esi]
+        mov     edx,            DWORD PTR 4[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 4[ebx],ecx
+        ; Round 2
+        mov     ecx,            DWORD PTR 8[esi]
+        mov     edx,            DWORD PTR 8[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 8[ebx],ecx
+        ; Round 3
+        mov     ecx,            DWORD PTR 12[esi]
+        mov     edx,            DWORD PTR 12[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 12[ebx],ecx
+        ; Round 4
+        mov     ecx,            DWORD PTR 16[esi]
+        mov     edx,            DWORD PTR 16[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 16[ebx],ecx
+        ; Round 5
+        mov     ecx,            DWORD PTR 20[esi]
+        mov     edx,            DWORD PTR 20[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 20[ebx],ecx
+        ; Round 6
+        mov     ecx,            DWORD PTR 24[esi]
+        mov     edx,            DWORD PTR 24[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 24[ebx],ecx
+        ; Round 7
+        mov     ecx,            DWORD PTR 28[esi]
+        mov     edx,            DWORD PTR 28[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 28[ebx],ecx
+        ; 
+        add     esi,            32
+        add     edi,            32
+        add     ebx,            32
+        sub     ebp,            8
+        jnz     L012aw_loop
+$L011aw_finish:
+        mov     ebp,            DWORD PTR 32[esp]
+        and     ebp,            7
+        jz      $L013aw_end
+        ; Tail Round 0
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR [edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        dec     ebp
+        mov     DWORD PTR [ebx],ecx
+        jz      $L013aw_end
+        ; Tail Round 1
+        mov     ecx,            DWORD PTR 4[esi]
+        mov     edx,            DWORD PTR 4[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        dec     ebp
+        mov     DWORD PTR 4[ebx],ecx
+        jz      $L013aw_end
+        ; Tail Round 2
+        mov     ecx,            DWORD PTR 8[esi]
+        mov     edx,            DWORD PTR 8[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        dec     ebp
+        mov     DWORD PTR 8[ebx],ecx
+        jz      $L013aw_end
+        ; Tail Round 3
+        mov     ecx,            DWORD PTR 12[esi]
+        mov     edx,            DWORD PTR 12[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        dec     ebp
+        mov     DWORD PTR 12[ebx],ecx
+        jz      $L013aw_end
+        ; Tail Round 4
+        mov     ecx,            DWORD PTR 16[esi]
+        mov     edx,            DWORD PTR 16[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        dec     ebp
+        mov     DWORD PTR 16[ebx],ecx
+        jz      $L013aw_end
+        ; Tail Round 5
+        mov     ecx,            DWORD PTR 20[esi]
+        mov     edx,            DWORD PTR 20[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        dec     ebp
+        mov     DWORD PTR 20[ebx],ecx
+        jz      $L013aw_end
+        ; Tail Round 6
+        mov     ecx,            DWORD PTR 24[esi]
+        mov     edx,            DWORD PTR 24[edi]
+        add     ecx,            eax
+        mov     eax,            0
+        adc     eax,            eax
+        add     ecx,            edx
+        adc     eax,            0
+        mov     DWORD PTR 24[ebx],ecx
+$L013aw_end:
+        mov     eax,            eax
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_bn_add_words ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/bn/asm/bn86unix.cpp b/src/lib/libcrypto/bn/asm/bn86unix.cpp
new file mode 100644
index 0000000000..64702201ea
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/bn86unix.cpp
@@ -0,0 +1,752 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define bn_mul_add_words _bn_mul_add_words
+#define bn_mul_words _bn_mul_words
+#define bn_sqr_words _bn_sqr_words
+#define bn_div64 _bn_div64
+#define bn_add_words _bn_add_words
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by bn-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "bn-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl bn_mul_add_words
+        TYPE(bn_mul_add_words,@function)
+bn_mul_add_words:
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+
+
+        xorl    %esi,           %esi
+        movl    20(%esp),       %edi
+        movl    28(%esp),       %ecx
+        movl    24(%esp),       %ebx
+        andl    $4294967288,    %ecx
+        movl    32(%esp),       %ebp
+        pushl   %ecx
+        jz      .L000maw_finish
+.L001maw_loop:
+        movl    %ecx,           (%esp)
+        /* Round 0 */
+        movl    (%ebx),         %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    (%edi),         %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           (%edi)
+        movl    %edx,           %esi
+        /* Round 4 */
+        movl    4(%ebx),        %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    4(%edi),        %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           4(%edi)
+        movl    %edx,           %esi
+        /* Round 8 */
+        movl    8(%ebx),        %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    8(%edi),        %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           8(%edi)
+        movl    %edx,           %esi
+        /* Round 12 */
+        movl    12(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    12(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           12(%edi)
+        movl    %edx,           %esi
+        /* Round 16 */
+        movl    16(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    16(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           16(%edi)
+        movl    %edx,           %esi
+        /* Round 20 */
+        movl    20(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    20(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           20(%edi)
+        movl    %edx,           %esi
+        /* Round 24 */
+        movl    24(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    24(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           24(%edi)
+        movl    %edx,           %esi
+        /* Round 28 */
+        movl    28(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    28(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           28(%edi)
+        movl    %edx,           %esi
+
+        movl    (%esp),         %ecx
+        addl    $32,            %ebx
+        addl    $32,            %edi
+        subl    $8,             %ecx
+        jnz     .L001maw_loop
+.L000maw_finish:
+        movl    32(%esp),       %ecx
+        andl    $7,             %ecx
+        jnz     .L002maw_finish2
+        jmp     .L003maw_end
+.align ALIGN
+.L002maw_finish2:
+        /* Tail Round 0 */
+        movl    (%ebx),         %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    (%edi),         %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        decl    %ecx
+        movl    %eax,           (%edi)
+        movl    %edx,           %esi
+        jz      .L003maw_end
+        /* Tail Round 1 */
+        movl    4(%ebx),        %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    4(%edi),        %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        decl    %ecx
+        movl    %eax,           4(%edi)
+        movl    %edx,           %esi
+        jz      .L003maw_end
+        /* Tail Round 2 */
+        movl    8(%ebx),        %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    8(%edi),        %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        decl    %ecx
+        movl    %eax,           8(%edi)
+        movl    %edx,           %esi
+        jz      .L003maw_end
+        /* Tail Round 3 */
+        movl    12(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    12(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        decl    %ecx
+        movl    %eax,           12(%edi)
+        movl    %edx,           %esi
+        jz      .L003maw_end
+        /* Tail Round 4 */
+        movl    16(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    16(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        decl    %ecx
+        movl    %eax,           16(%edi)
+        movl    %edx,           %esi
+        jz      .L003maw_end
+        /* Tail Round 5 */
+        movl    20(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    20(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        decl    %ecx
+        movl    %eax,           20(%edi)
+        movl    %edx,           %esi
+        jz      .L003maw_end
+        /* Tail Round 6 */
+        movl    24(%ebx),       %eax
+        mull    %ebp
+        addl    %esi,           %eax
+        movl    24(%edi),       %esi
+        adcl    $0,             %edx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           24(%edi)
+        movl    %edx,           %esi
+.L003maw_end:
+        movl    %esi,           %eax
+        popl    %ecx
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.bn_mul_add_words_end:
+        SIZE(bn_mul_add_words,.bn_mul_add_words_end-bn_mul_add_words)
+.ident  "bn_mul_add_words"
+.text
+        .align ALIGN
+.globl bn_mul_words
+        TYPE(bn_mul_words,@function)
+bn_mul_words:
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+
+
+        xorl    %esi,           %esi
+        movl    20(%esp),       %edi
+        movl    24(%esp),       %ebx
+        movl    28(%esp),       %ebp
+        movl    32(%esp),       %ecx
+        andl    $4294967288,    %ebp
+        jz      .L004mw_finish
+.L005mw_loop:
+        /* Round 0 */
+        movl    (%ebx),         %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           (%edi)
+        movl    %edx,           %esi
+        /* Round 4 */
+        movl    4(%ebx),        %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           4(%edi)
+        movl    %edx,           %esi
+        /* Round 8 */
+        movl    8(%ebx),        %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           8(%edi)
+        movl    %edx,           %esi
+        /* Round 12 */
+        movl    12(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           12(%edi)
+        movl    %edx,           %esi
+        /* Round 16 */
+        movl    16(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           16(%edi)
+        movl    %edx,           %esi
+        /* Round 20 */
+        movl    20(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           20(%edi)
+        movl    %edx,           %esi
+        /* Round 24 */
+        movl    24(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           24(%edi)
+        movl    %edx,           %esi
+        /* Round 28 */
+        movl    28(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           28(%edi)
+        movl    %edx,           %esi
+
+        addl    $32,            %ebx
+        addl    $32,            %edi
+        subl    $8,             %ebp
+        jz      .L004mw_finish
+        jmp     .L005mw_loop
+.L004mw_finish:
+        movl    28(%esp),       %ebp
+        andl    $7,             %ebp
+        jnz     .L006mw_finish2
+        jmp     .L007mw_end
+.align ALIGN
+.L006mw_finish2:
+        /* Tail Round 0 */
+        movl    (%ebx),         %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           (%edi)
+        movl    %edx,           %esi
+        decl    %ebp
+        jz      .L007mw_end
+        /* Tail Round 1 */
+        movl    4(%ebx),        %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           4(%edi)
+        movl    %edx,           %esi
+        decl    %ebp
+        jz      .L007mw_end
+        /* Tail Round 2 */
+        movl    8(%ebx),        %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           8(%edi)
+        movl    %edx,           %esi
+        decl    %ebp
+        jz      .L007mw_end
+        /* Tail Round 3 */
+        movl    12(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           12(%edi)
+        movl    %edx,           %esi
+        decl    %ebp
+        jz      .L007mw_end
+        /* Tail Round 4 */
+        movl    16(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           16(%edi)
+        movl    %edx,           %esi
+        decl    %ebp
+        jz      .L007mw_end
+        /* Tail Round 5 */
+        movl    20(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           20(%edi)
+        movl    %edx,           %esi
+        decl    %ebp
+        jz      .L007mw_end
+        /* Tail Round 6 */
+        movl    24(%ebx),       %eax
+        mull    %ecx
+        addl    %esi,           %eax
+        adcl    $0,             %edx
+        movl    %eax,           24(%edi)
+        movl    %edx,           %esi
+.L007mw_end:
+        movl    %esi,           %eax
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.bn_mul_words_end:
+        SIZE(bn_mul_words,.bn_mul_words_end-bn_mul_words)
+.ident  "bn_mul_words"
+.text
+        .align ALIGN
+.globl bn_sqr_words
+        TYPE(bn_sqr_words,@function)
+bn_sqr_words:
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+
+
+        movl    20(%esp),       %esi
+        movl    24(%esp),       %edi
+        movl    28(%esp),       %ebx
+        andl    $4294967288,    %ebx
+        jz      .L008sw_finish
+.L009sw_loop:
+        /* Round 0 */
+        movl    (%edi),         %eax
+        mull    %eax
+        movl    %eax,           (%esi)
+        movl    %edx,           4(%esi)
+        /* Round 4 */
+        movl    4(%edi),        %eax
+        mull    %eax
+        movl    %eax,           8(%esi)
+        movl    %edx,           12(%esi)
+        /* Round 8 */
+        movl    8(%edi),        %eax
+        mull    %eax
+        movl    %eax,           16(%esi)
+        movl    %edx,           20(%esi)
+        /* Round 12 */
+        movl    12(%edi),       %eax
+        mull    %eax
+        movl    %eax,           24(%esi)
+        movl    %edx,           28(%esi)
+        /* Round 16 */
+        movl    16(%edi),       %eax
+        mull    %eax
+        movl    %eax,           32(%esi)
+        movl    %edx,           36(%esi)
+        /* Round 20 */
+        movl    20(%edi),       %eax
+        mull    %eax
+        movl    %eax,           40(%esi)
+        movl    %edx,           44(%esi)
+        /* Round 24 */
+        movl    24(%edi),       %eax
+        mull    %eax
+        movl    %eax,           48(%esi)
+        movl    %edx,           52(%esi)
+        /* Round 28 */
+        movl    28(%edi),       %eax
+        mull    %eax
+        movl    %eax,           56(%esi)
+        movl    %edx,           60(%esi)
+
+        addl    $32,            %edi
+        addl    $64,            %esi
+        subl    $8,             %ebx
+        jnz     .L009sw_loop
+.L008sw_finish:
+        movl    28(%esp),       %ebx
+        andl    $7,             %ebx
+        jz      .L010sw_end
+        /* Tail Round 0 */
+        movl    (%edi),         %eax
+        mull    %eax
+        movl    %eax,           (%esi)
+        decl    %ebx
+        movl    %edx,           4(%esi)
+        jz      .L010sw_end
+        /* Tail Round 1 */
+        movl    4(%edi),        %eax
+        mull    %eax
+        movl    %eax,           8(%esi)
+        decl    %ebx
+        movl    %edx,           12(%esi)
+        jz      .L010sw_end
+        /* Tail Round 2 */
+        movl    8(%edi),        %eax
+        mull    %eax
+        movl    %eax,           16(%esi)
+        decl    %ebx
+        movl    %edx,           20(%esi)
+        jz      .L010sw_end
+        /* Tail Round 3 */
+        movl    12(%edi),       %eax
+        mull    %eax
+        movl    %eax,           24(%esi)
+        decl    %ebx
+        movl    %edx,           28(%esi)
+        jz      .L010sw_end
+        /* Tail Round 4 */
+        movl    16(%edi),       %eax
+        mull    %eax
+        movl    %eax,           32(%esi)
+        decl    %ebx
+        movl    %edx,           36(%esi)
+        jz      .L010sw_end
+        /* Tail Round 5 */
+        movl    20(%edi),       %eax
+        mull    %eax
+        movl    %eax,           40(%esi)
+        decl    %ebx
+        movl    %edx,           44(%esi)
+        jz      .L010sw_end
+        /* Tail Round 6 */
+        movl    24(%edi),       %eax
+        mull    %eax
+        movl    %eax,           48(%esi)
+        movl    %edx,           52(%esi)
+.L010sw_end:
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.bn_sqr_words_end:
+        SIZE(bn_sqr_words,.bn_sqr_words_end-bn_sqr_words)
+.ident  "bn_sqr_words"
+.text
+        .align ALIGN
+.globl bn_div64
+        TYPE(bn_div64,@function)
+bn_div64:
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+
+        movl    20(%esp),       %edx
+        movl    24(%esp),       %eax
+        movl    28(%esp),       %ebx
+        divl    %ebx
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.bn_div64_end:
+        SIZE(bn_div64,.bn_div64_end-bn_div64)
+.ident  "bn_div64"
+.text
+        .align ALIGN
+.globl bn_add_words
+        TYPE(bn_add_words,@function)
+bn_add_words:
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+
+
+        movl    20(%esp),       %ebx
+        movl    24(%esp),       %esi
+        movl    28(%esp),       %edi
+        movl    32(%esp),       %ebp
+        xorl    %eax,           %eax
+        andl    $4294967288,    %ebp
+        jz      .L011aw_finish
+.L012aw_loop:
+        /* Round 0 */
+        movl    (%esi),         %ecx
+        movl    (%edi),         %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           (%ebx)
+        /* Round 1 */
+        movl    4(%esi),        %ecx
+        movl    4(%edi),        %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           4(%ebx)
+        /* Round 2 */
+        movl    8(%esi),        %ecx
+        movl    8(%edi),        %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           8(%ebx)
+        /* Round 3 */
+        movl    12(%esi),       %ecx
+        movl    12(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           12(%ebx)
+        /* Round 4 */
+        movl    16(%esi),       %ecx
+        movl    16(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           16(%ebx)
+        /* Round 5 */
+        movl    20(%esi),       %ecx
+        movl    20(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           20(%ebx)
+        /* Round 6 */
+        movl    24(%esi),       %ecx
+        movl    24(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           24(%ebx)
+        /* Round 7 */
+        movl    28(%esi),       %ecx
+        movl    28(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           28(%ebx)
+
+        addl    $32,            %esi
+        addl    $32,            %edi
+        addl    $32,            %ebx
+        subl    $8,             %ebp
+        jnz     .L012aw_loop
+.L011aw_finish:
+        movl    32(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L013aw_end
+        /* Tail Round 0 */
+        movl    (%esi),         %ecx
+        movl    (%edi),         %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        decl    %ebp
+        movl    %ecx,           (%ebx)
+        jz      .L013aw_end
+        /* Tail Round 1 */
+        movl    4(%esi),        %ecx
+        movl    4(%edi),        %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        decl    %ebp
+        movl    %ecx,           4(%ebx)
+        jz      .L013aw_end
+        /* Tail Round 2 */
+        movl    8(%esi),        %ecx
+        movl    8(%edi),        %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        decl    %ebp
+        movl    %ecx,           8(%ebx)
+        jz      .L013aw_end
+        /* Tail Round 3 */
+        movl    12(%esi),       %ecx
+        movl    12(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        decl    %ebp
+        movl    %ecx,           12(%ebx)
+        jz      .L013aw_end
+        /* Tail Round 4 */
+        movl    16(%esi),       %ecx
+        movl    16(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        decl    %ebp
+        movl    %ecx,           16(%ebx)
+        jz      .L013aw_end
+        /* Tail Round 5 */
+        movl    20(%esi),       %ecx
+        movl    20(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        decl    %ebp
+        movl    %ecx,           20(%ebx)
+        jz      .L013aw_end
+        /* Tail Round 6 */
+        movl    24(%esi),       %ecx
+        movl    24(%edi),       %edx
+        addl    %eax,           %ecx
+        movl    $0,             %eax
+        adcl    %eax,           %eax
+        addl    %edx,           %ecx
+        adcl    $0,             %eax
+        movl    %ecx,           24(%ebx)
+.L013aw_end:
+        movl    %eax,           %eax
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.bn_add_words_end:
+        SIZE(bn_add_words,.bn_add_words_end-bn_add_words)
+.ident  "bn_add_words"
diff --git a/src/lib/libcrypto/bn/asm/sparc.s b/src/lib/libcrypto/bn/asm/sparc.s
new file mode 100644
index 0000000000..f9e533caa8
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/sparc.s
@@ -0,0 +1,462 @@
+        .file   "bn_mulw.c"
+gcc2_compiled.:
+.section        ".text"
+        .align 4
+        .global bn_mul_add_words
+        .type    bn_mul_add_words,#function
+        .proc   016
+bn_mul_add_words:
+        !#PROLOGUE# 0
+        save %sp,-112,%sp
+        !#PROLOGUE# 1
+        mov %i0,%o0
+        mov %i1,%o2
+        mov %i2,%g1
+        mov %i3,%o1
+        mov 0,%i4
+        add %o0,12,%g4
+        add %o2,12,%o7
+.LL2:
+        mov %i4,%i3
+        mov 0,%i2
+        ld [%o0],%g2
+        mov %g2,%i1
+        ld [%o2],%g2
+        mov 0,%i0
+        umul %o1,%g2,%g3
+        rd %y,%g2
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %g3,%i3,%g3
+        addx %g2,%i2,%g2
+        st %g3,[%o0]
+        mov %g2,%i5
+        mov 0,%i4
+        addcc %g1,-1,%g1
+        be .LL3
+        mov %i5,%i4
+        mov %i4,%i3
+        mov 0,%i2
+        ld [%g4-8],%g2
+        mov %g2,%i1
+        ld [%o7-8],%g2
+        mov 0,%i0
+        umul %o1,%g2,%g3
+        rd %y,%g2
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %g3,%i3,%g3
+        addx %g2,%i2,%g2
+        st %g3,[%g4-8]
+        mov %g2,%i5
+        mov 0,%i4
+        addcc %g1,-1,%g1
+        be .LL3
+        mov %i5,%i4
+        mov %i4,%i3
+        mov 0,%i2
+        ld [%g4-4],%g2
+        mov %g2,%i1
+        ld [%o7-4],%g2
+        mov 0,%i0
+        umul %o1,%g2,%g3
+        rd %y,%g2
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %g3,%i3,%g3
+        addx %g2,%i2,%g2
+        st %g3,[%g4-4]
+        mov %g2,%i5
+        mov 0,%i4
+        addcc %g1,-1,%g1
+        be .LL3
+        mov %i5,%i4
+        mov %i4,%i3
+        mov 0,%i2
+        ld [%g4],%g2
+        mov %g2,%i1
+        ld [%o7],%g2
+        mov 0,%i0
+        umul %o1,%g2,%g3
+        rd %y,%g2
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %g3,%i3,%g3
+        addx %g2,%i2,%g2
+        st %g3,[%g4]
+        mov %g2,%i5
+        mov 0,%i4
+        addcc %g1,-1,%g1
+        be .LL3
+        mov %i5,%i4
+        add %o7,16,%o7
+        add %o2,16,%o2
+        add %g4,16,%g4
+        b .LL2
+        add %o0,16,%o0
+.LL3:
+        ret
+        restore %g0,%i4,%o0
+.LLfe1:
+        .size    bn_mul_add_words,.LLfe1-bn_mul_add_words
+        .align 4
+        .global bn_mul_words
+        .type    bn_mul_words,#function
+        .proc   016
+bn_mul_words:
+        !#PROLOGUE# 0
+        save %sp,-112,%sp
+        !#PROLOGUE# 1
+        mov %i0,%o7
+        mov %i1,%o0
+        mov %i2,%i4
+        mov %i3,%g4
+        mov 0,%i0
+        add %o7,12,%g1
+        add %o0,12,%i5
+.LL18:
+        mov %i0,%g3
+        mov 0,%g2
+        ld [%o0],%i2
+        umul %g4,%i2,%i3
+        rd %y,%i2
+        addcc %i3,%g3,%i3
+        addx %i2,%g2,%i2
+        st %i3,[%o7]
+        mov %i2,%i1
+        mov 0,%i0
+        addcc %i4,-1,%i4
+        be .LL19
+        mov %i1,%i0
+        mov %i0,%g3
+        mov 0,%g2
+        ld [%i5-8],%i2
+        umul %g4,%i2,%i3
+        rd %y,%i2
+        addcc %i3,%g3,%i3
+        addx %i2,%g2,%i2
+        st %i3,[%g1-8]
+        mov %i2,%i1
+        mov 0,%i0
+        addcc %i4,-1,%i4
+        be .LL19
+        mov %i1,%i0
+        mov %i0,%g3
+        mov 0,%g2
+        ld [%i5-4],%i2
+        umul %g4,%i2,%i3
+        rd %y,%i2
+        addcc %i3,%g3,%i3
+        addx %i2,%g2,%i2
+        st %i3,[%g1-4]
+        mov %i2,%i1
+        mov 0,%i0
+        addcc %i4,-1,%i4
+        be .LL19
+        mov %i1,%i0
+        mov %i0,%g3
+        mov 0,%g2
+        ld [%i5],%i2
+        umul %g4,%i2,%i3
+        rd %y,%i2
+        addcc %i3,%g3,%i3
+        addx %i2,%g2,%i2
+        st %i3,[%g1]
+        mov %i2,%i1
+        mov 0,%i0
+        addcc %i4,-1,%i4
+        be .LL19
+        mov %i1,%i0
+        add %i5,16,%i5
+        add %o0,16,%o0
+        add %g1,16,%g1
+        b .LL18
+        add %o7,16,%o7
+.LL19:
+        ret
+        restore
+.LLfe2:
+        .size    bn_mul_words,.LLfe2-bn_mul_words
+        .align 4
+        .global bn_sqr_words
+        .type    bn_sqr_words,#function
+        .proc   020
+bn_sqr_words:
+        !#PROLOGUE# 0
+        !#PROLOGUE# 1
+        mov %o0,%g4
+        add %g4,28,%o3
+        add %o1,12,%g1
+.LL34:
+        ld [%o1],%o0
+        addcc %o2,-1,%o2
+        umul %o0,%o0,%o5
+        rd %y,%o4
+        st %o5,[%g4]
+        mov %o4,%g3
+        mov 0,%g2
+        be .LL35
+        st %g3,[%o3-24]
+        ld [%g1-8],%o0
+        addcc %o2,-1,%o2
+        umul %o0,%o0,%o5
+        rd %y,%o4
+        st %o5,[%o3-20]
+        mov %o4,%g3
+        mov 0,%g2
+        be .LL35
+        st %g3,[%o3-16]
+        ld [%g1-4],%o0
+        addcc %o2,-1,%o2
+        umul %o0,%o0,%o5
+        rd %y,%o4
+        st %o5,[%o3-12]
+        mov %o4,%g3
+        mov 0,%g2
+        be .LL35
+        st %g3,[%o3-8]
+        ld [%g1],%o0
+        addcc %o2,-1,%o2
+        umul %o0,%o0,%o5
+        rd %y,%o4
+        st %o5,[%o3-4]
+        mov %o4,%g3
+        mov 0,%g2
+        be .LL35
+        st %g3,[%o3]
+        add %g1,16,%g1
+        add %o1,16,%o1
+        add %o3,32,%o3
+        b .LL34
+        add %g4,32,%g4
+.LL35:
+        retl
+        nop
+.LLfe3:
+        .size    bn_sqr_words,.LLfe3-bn_sqr_words
+        .align 4
+        .global bn_add_words
+        .type    bn_add_words,#function
+        .proc   016
+bn_add_words:
+        !#PROLOGUE# 0
+        save %sp,-112,%sp
+        !#PROLOGUE# 1
+        mov %i0,%o2
+        mov %i1,%o3
+        mov %i2,%o4
+        mov %i3,%i5
+        mov 0,%o0
+        mov 0,%o1
+        add %o2,12,%o7
+        add %o4,12,%g4
+        b .LL42
+        add %o3,12,%g1
+.LL45:
+        add %i5,-1,%i5
+        mov %i4,%g3
+        ld [%g4-8],%i4
+        mov 0,%g2
+        mov %i4,%i1
+        mov 0,%i0
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %o1,%g3,%o1
+        addx %o0,%g2,%o0
+        st %o1,[%o7-8]
+        mov %o0,%i3
+        mov 0,%i2
+        mov %i2,%o0
+        mov %i3,%o1
+        cmp %i5,0
+        ble .LL43
+        add %i5,-1,%i5
+        ld [%g1-4],%i4
+        mov %i4,%g3
+        ld [%g4-4],%i4
+        mov 0,%g2
+        mov %i4,%i1
+        mov 0,%i0
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %o1,%g3,%o1
+        addx %o0,%g2,%o0
+        st %o1,[%o7-4]
+        mov %o0,%i3
+        mov 0,%i2
+        mov %i2,%o0
+        mov %i3,%o1
+        cmp %i5,0
+        ble .LL43
+        add %i5,-1,%i5
+        ld [%g1],%i4
+        mov %i4,%g3
+        ld [%g4],%i4
+        mov 0,%g2
+        mov %i4,%i1
+        mov 0,%i0
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %o1,%g3,%o1
+        addx %o0,%g2,%o0
+        st %o1,[%o7]
+        mov %o0,%i3
+        mov 0,%i2
+        mov %i2,%o0
+        mov %i3,%o1
+        cmp %i5,0
+        ble .LL43
+        add %g1,16,%g1
+        add %o3,16,%o3
+        add %g4,16,%g4
+        add %o4,16,%o4
+        add %o7,16,%o7
+        add %o2,16,%o2
+.LL42:
+        ld [%o3],%i4
+        add %i5,-1,%i5
+        mov %i4,%g3
+        ld [%o4],%i4
+        mov 0,%g2
+        mov %i4,%i1
+        mov 0,%i0
+        addcc %g3,%i1,%g3
+        addx %g2,%i0,%g2
+        addcc %o1,%g3,%o1
+        addx %o0,%g2,%o0
+        st %o1,[%o2]
+        mov %o0,%i3
+        mov 0,%i2
+        mov %i2,%o0
+        mov %i3,%o1
+        cmp %i5,0
+        bg,a .LL45
+        ld [%g1-8],%i4
+.LL43:
+        ret
+        restore %g0,%o1,%o0
+.LLfe4:
+        .size    bn_add_words,.LLfe4-bn_add_words
+.section        ".rodata"
+        .align 8
+.LLC0:
+        .asciz  "Division would overflow (%d)\n"
+.section        ".text"
+        .align 4
+        .global bn_div64
+        .type    bn_div64,#function
+        .proc   016
+bn_div64:
+        !#PROLOGUE# 0
+        save %sp,-112,%sp
+        !#PROLOGUE# 1
+        mov 0,%l1
+        cmp %i2,0
+        bne .LL51
+        mov 2,%l0
+        b .LL68
+        mov -1,%i0
+.LL51:
+        call BN_num_bits_word,0
+        mov %i2,%o0
+        mov %o0,%o2
+        cmp %o2,32
+        be .LL52
+        mov 1,%o0
+        sll %o0,%o2,%o0
+        cmp %i0,%o0
+        bleu .LL69
+        mov 32,%o0
+        sethi %hi(__iob+32),%o0
+        or %o0,%lo(__iob+32),%o0
+        sethi %hi(.LLC0),%o1
+        call fprintf,0
+        or %o1,%lo(.LLC0),%o1
+        call abort,0
+        nop
+.LL52:
+        mov 32,%o0
+.LL69:
+        cmp %i0,%i2
+        blu .LL53
+        sub %o0,%o2,%o2
+        sub %i0,%i2,%i0
+.LL53:
+        cmp %o2,0
+        be .LL54
+        sll %i0,%o2,%o1
+        sll %i2,%o2,%i2
+        sub %o0,%o2,%o0
+        srl %i1,%o0,%o0
+        or %o1,%o0,%i0
+        sll %i1,%o2,%i1
+.LL54:
+        srl %i2,16,%g2
+        sethi %hi(65535),%o0
+        or %o0,%lo(65535),%o1
+        and %i2,%o1,%g3
+        mov %o0,%g4
+        sethi %hi(-65536),%o7
+        mov %o1,%g1
+.LL55:
+        srl %i0,16,%o0
+        cmp %o0,%g2
+        be .LL59
+        or %g4,%lo(65535),%o3
+        wr %g0,%g0,%y
+        nop
+        nop
+        nop
+        udiv %i0,%g2,%o3
+.LL59:
+        and %i1,%o7,%o0
+        srl %o0,16,%o5
+        smul %o3,%g3,%o4
+        smul %o3,%g2,%o2
+.LL60:
+        sub %i0,%o2,%o1
+        andcc %o1,%o7,%g0
+        bne .LL61
+        sll %o1,16,%o0
+        add %o0,%o5,%o0
+        cmp %o4,%o0
+        bleu .LL61
+        sub %o4,%g3,%o4
+        sub %o2,%g2,%o2
+        b .LL60
+        add %o3,-1,%o3
+.LL61:
+        smul %o3,%g2,%o2
+        smul %o3,%g3,%o0
+        srl %o0,16,%o1
+        sll %o0,16,%o0
+        and %o0,%o7,%o0
+        cmp %i1,%o0
+        bgeu .LL65
+        add %o2,%o1,%o2
+        add %o2,1,%o2
+.LL65:
+        cmp %i0,%o2
+        bgeu .LL66
+        sub %i1,%o0,%i1
+        add %i0,%i2,%i0
+        add %o3,-1,%o3
+.LL66:
+        addcc %l0,-1,%l0
+        be .LL56
+        sub %i0,%o2,%i0
+        sll %o3,16,%l1
+        sll %i0,16,%o0
+        srl %i1,16,%o1
+        or %o0,%o1,%i0
+        and %i1,%g1,%o0
+        b .LL55
+        sll %o0,16,%i1
+.LL56:
+        or %l1,%o3,%i0
+.LL68:
+        ret
+        restore
+.LLfe5:
+        .size    bn_div64,.LLfe5-bn_div64
+        .ident  "GCC: (GNU) 2.7.2.3"
diff --git a/src/lib/libcrypto/bn/asm/x86w16.asm b/src/lib/libcrypto/bn/asm/x86w16.asm
new file mode 100644
index 0000000000..74a933a8cd
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/x86w16.asm
@@ -0,0 +1,297 @@
+;       Static Name Aliases
+;
+        TITLE   bn_mulw.c
+        .8087
+F_TEXT  SEGMENT  WORD PUBLIC 'CODE'
+F_TEXT  ENDS
+_DATA   SEGMENT  WORD PUBLIC 'DATA'
+_DATA   ENDS
+CONST   SEGMENT  WORD PUBLIC 'CONST'
+CONST   ENDS
+_BSS    SEGMENT  WORD PUBLIC 'BSS'
+_BSS    ENDS
+DGROUP  GROUP   CONST, _BSS, _DATA
+        ASSUME DS: DGROUP, SS: DGROUP
+F_TEXT      SEGMENT
+        ASSUME  CS: F_TEXT
+        PUBLIC  _bn_mul_add_words
+_bn_mul_add_words       PROC FAR
+; Line 58
+        push    bp
+        push    bx
+        push    si
+        push    di
+        push    ds
+        push    es
+        mov     bp,sp
+;       w = 26
+;       num = 24
+;       ap = 20
+;       rp = 16
+        xor     si,si                   ;c=0;
+        mov     di,WORD PTR [bp+16]     ; load r
+        mov     ds,WORD PTR [bp+18]     ; load r
+        mov     bx,WORD PTR [bp+20]     ; load a
+        mov     es,WORD PTR [bp+22]     ; load a
+        mov     cx,WORD PTR [bp+26]     ; load w
+        mov     bp,WORD PTR [bp+24]     ; load num
+
+        shr     bp,1    ; div count by 4 and do groups of 4
+        shr     bp,1
+        je      $L555
+
+$L546:
+        mov     ax,cx
+        mul     WORD PTR es:[bx]        ; w* *a
+        add     ax,WORD PTR ds:[di]     ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di],ax
+        mov     si,dx
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+2]      ; w* *a
+        add     ax,WORD PTR ds:[di+2]   ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+2],ax
+        mov     si,dx
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+4]      ; w* *a
+        add     ax,WORD PTR ds:[di+4]   ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+4],ax
+        mov     si,dx
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+6]      ; w* *a
+        add     ax,WORD PTR ds:[di+6]   ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+6],ax
+        mov     si,dx
+        ;
+        add     bx,8
+        add     di,8
+        ;
+        dec     bp
+        je      $L555
+        jmp     $L546
+;
+;
+$L555:
+        mov     bp,sp
+        mov     bp,WORD PTR [bp+24]     ; load num
+        and     bp,3
+        dec     bp
+        js      $L547
+
+        mov     ax,cx
+        mul     WORD PTR es:[bx]        ; w* *a
+        add     ax,WORD PTR ds:[di]     ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di],ax
+        mov     si,dx
+        dec     bp
+        js      $L547                   ; Note that we are now testing for -1
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+2]      ; w* *a
+        add     ax,WORD PTR ds:[di+2]   ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+2],ax
+        mov     si,dx
+        dec     bp
+        js      $L547
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+4]      ; w* *a
+        add     ax,WORD PTR ds:[di+4]   ; + *r
+        adc     dx,0
+        adc     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+4],ax
+        mov     si,dx
+$L547:
+        mov     ax,si
+        pop     es
+        pop     ds
+        pop     di
+        pop     si
+        pop     bx
+        pop     bp
+        ret     
+        nop     
+
+_bn_mul_add_words       ENDP
+        PUBLIC  _bn_mul_words
+_bn_mul_words   PROC FAR
+; Line 76
+        push    bp
+        push    bx
+        push    si
+        push    di
+        push    ds
+        push    es
+        xor     si,si
+        mov     bp,sp
+        mov     di,WORD PTR [bp+16]     ; r
+        mov     ds,WORD PTR [bp+18]
+        mov     bx,WORD PTR [bp+20]     ; a
+        mov     es,WORD PTR [bp+22]
+        mov     cx,WORD PTR [bp+26]     ; w
+        mov     bp,WORD PTR [bp+24]     ; num 
+$FC743:
+        mov     ax,cx
+        mul     WORD PTR es:[bx]
+        add     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di],ax
+        mov     si,dx
+        dec     bp
+        je      $L764
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+2]
+        add     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+2],ax
+        mov     si,dx
+        dec     bp
+        je      $L764
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+4]
+        add     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+4],ax
+        mov     si,dx
+        dec     bp
+        je      $L764
+        ;
+        mov     ax,cx
+        mul     WORD PTR es:[bx+6]
+        add     ax,si
+        adc     dx,0
+        mov     WORD PTR ds:[di+6],ax
+        mov     si,dx
+        dec     bp
+        je      $L764
+        ;
+        add     bx,8
+        add     di,8
+        jmp     $FC743
+        nop
+$L764:
+        mov     ax,si
+        pop     es
+        pop     ds
+        pop     di
+        pop     si
+        pop     bx
+        pop     bp
+        ret     
+        nop     
+_bn_mul_words   ENDP
+        PUBLIC  _bn_sqr_words
+_bn_sqr_words   PROC FAR
+; Line 92
+        push    bp
+        push    bx
+        push    si
+        push    di
+        push    ds
+        push    es
+        mov     bp,sp
+        mov     si,WORD PTR [bp+16]
+        mov     ds,WORD PTR [bp+18]
+        mov     di,WORD PTR [bp+20]
+        mov     es,WORD PTR [bp+22]
+        mov     bx,WORD PTR [bp+24]
+
+        mov     bp,bx   ; save a memory lookup later
+        shr     bx,1    ; div count by 4 and do groups of 4
+        shr     bx,1
+        je      $L666
+
+$L765:
+        mov     ax,WORD PTR es:[di]
+        mul     ax
+        mov     WORD PTR ds:[si],ax
+        mov     WORD PTR ds:[si+2],dx
+        ;
+        mov     ax,WORD PTR es:[di+2]
+        mul     ax
+        mov     WORD PTR ds:[si+4],ax
+        mov     WORD PTR ds:[si+6],dx
+        ;
+        mov     ax,WORD PTR es:[di+4]
+        mul     ax
+        mov     WORD PTR ds:[si+8],ax
+        mov     WORD PTR ds:[si+10],dx
+        ;
+        mov     ax,WORD PTR es:[di+6]
+        mul     ax
+        mov     WORD PTR ds:[si+12],ax
+        mov     WORD PTR ds:[si+14],dx
+        ;
+        add     di,8
+        add     si,16
+        dec     bx
+        je      $L666
+        jmp     $L765
+$L666:
+        and     bp,3
+        dec     bp      ; The copied value of bx (num)
+        js      $L645
+        ;
+        mov     ax,WORD PTR es:[di]
+        mul     ax
+        mov     WORD PTR ds:[si],ax
+        mov     WORD PTR ds:[si+2],dx
+        dec     bp
+        js      $L645
+        ;
+        mov     ax,WORD PTR es:[di+2]
+        mul     ax
+        mov     WORD PTR ds:[si+4],ax
+        mov     WORD PTR ds:[si+6],dx
+        dec     bp
+        js      $L645
+        ;
+        mov     ax,WORD PTR es:[di+4]
+        mul     ax
+        mov     WORD PTR ds:[si+8],ax
+        mov     WORD PTR ds:[si+10],dx
+$L645:
+        pop     es
+        pop     ds
+        pop     di
+        pop     si
+        pop     bx
+        pop     bp
+        ret     
+
+_bn_sqr_words   ENDP
+        PUBLIC  _bn_div64
+_bn_div64       PROC FAR
+        push    bp
+        mov     bp,sp
+        mov     dx, WORD PTR [bp+6]
+        mov     ax, WORD PTR [bp+8]
+        div     WORD PTR [bp+10]
+        pop     bp
+        ret     
+_bn_div64       ENDP
+F_TEXT  ENDS
+END
diff --git a/src/lib/libcrypto/bn/asm/x86w32.asm b/src/lib/libcrypto/bn/asm/x86w32.asm
new file mode 100644
index 0000000000..fc6f917714
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/x86w32.asm
@@ -0,0 +1,362 @@
+;       Static Name Aliases
+;
+        TITLE   bn_mulw.c
+        .386
+F_TEXT  SEGMENT  WORD USE16 PUBLIC 'CODE'
+F_TEXT  ENDS
+_DATA   SEGMENT  WORD USE16 PUBLIC 'DATA'
+_DATA   ENDS
+CONST   SEGMENT  WORD USE16 PUBLIC 'CONST'
+CONST   ENDS
+_BSS    SEGMENT  WORD USE16 PUBLIC 'BSS'
+_BSS    ENDS
+DGROUP  GROUP   CONST, _BSS, _DATA
+        ASSUME DS: DGROUP, SS: DGROUP
+F_TEXT      SEGMENT
+        ASSUME  CS: F_TEXT
+        PUBLIC  _bn_mul_add_words
+_bn_mul_add_words       PROC FAR
+; Line 58
+        push    bp
+        push    bx
+        push    esi
+        push    di
+        push    ds
+        push    es
+        mov     bp,sp
+;       w = 28
+;       num = 26
+;       ap = 22
+;       rp = 18
+        xor     esi,esi                 ;c=0;
+        mov     di,WORD PTR [bp+18]     ; load r
+        mov     ds,WORD PTR [bp+20]     ; load r
+        mov     bx,WORD PTR [bp+22]     ; load a
+        mov     es,WORD PTR [bp+24]     ; load a
+        mov     ecx,DWORD PTR [bp+28]   ; load w
+        mov     bp,WORD PTR [bp+26]     ; load num
+        shr     bp,1    ; div count by 4 and do groups of 4
+        shr     bp,1
+        je      $L555
+
+$L546:
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx]       ; w* *a
+        add     eax,DWORD PTR ds:[di]   ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di],eax
+        mov     esi,edx
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+4]     ; w* *a
+        add     eax,DWORD PTR ds:[di+4] ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+4],eax
+        mov     esi,edx
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+8]     ; w* *a
+        add     eax,DWORD PTR ds:[di+8] ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+8],eax
+        mov     esi,edx
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+12]    ; w* *a
+        add     eax,DWORD PTR ds:[di+12]        ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+12],eax
+        mov     esi,edx
+        ;
+        add     bx,16
+        add     di,16
+        ;
+        dec     bp
+        je      $L555
+        jmp     $L546
+;
+;
+$L555:
+        mov     bp,sp
+        mov     bp,WORD PTR [bp+26]     ; load num
+        and     bp,3
+        dec     bp
+        js      $L547
+
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx]       ; w* *a
+        add     eax,DWORD PTR ds:[di]   ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di],eax
+        mov     esi,edx
+        dec     bp
+        js      $L547                   ; Note that we are now testing for -1
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+4]     ; w* *a
+        add     eax,DWORD PTR ds:[di+4] ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+4],eax
+        mov     esi,edx
+        dec     bp
+        js      $L547
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+8]     ; w* *a
+        add     eax,DWORD PTR ds:[di+8] ; + *r
+        adc     edx,0
+        adc     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+8],eax
+        mov     esi,edx
+$L547:
+        mov     eax,esi
+        mov     edx,esi
+        shr     edx,16
+        pop     es
+        pop     ds
+        pop     di
+        pop     esi
+        pop     bx
+        pop     bp
+        ret     
+        nop     
+_bn_mul_add_words       ENDP
+
+        PUBLIC  _bn_mul_words
+_bn_mul_words   PROC FAR
+; Line 76
+        push    bp
+        push    bx
+        push    esi
+        push    di
+        push    ds
+        push    es
+        xor     esi,esi
+        mov     bp,sp
+        mov     di,WORD PTR [bp+18]     ; r
+        mov     ds,WORD PTR [bp+20]
+        mov     bx,WORD PTR [bp+22]     ; a
+        mov     es,WORD PTR [bp+24]
+        mov     ecx,DWORD PTR [bp+28]   ; w
+        mov     bp,WORD PTR [bp+26]     ; num 
+
+$FC743:
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx]
+        add     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di],eax
+        mov     esi,edx
+        dec     bp
+        je      $L764
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+4]
+        add     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+4],eax
+        mov     esi,edx
+        dec     bp
+        je      $L764
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+8]
+        add     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+8],eax
+        mov     esi,edx
+        dec     bp
+        je      $L764
+        ;
+        mov     eax,ecx
+        mul     DWORD PTR es:[bx+12]
+        add     eax,esi
+        adc     edx,0
+        mov     DWORD PTR ds:[di+12],eax
+        mov     esi,edx
+        dec     bp
+        je      $L764
+        ;
+        add     bx,16
+        add     di,16
+        jmp     $FC743
+        nop
+$L764:
+        mov     eax,esi
+        mov     edx,esi
+        shr     edx,16
+        pop     es
+        pop     ds
+        pop     di
+        pop     esi
+        pop     bx
+        pop     bp
+        ret     
+        nop     
+_bn_mul_words   ENDP
+        PUBLIC  _bn_sqr_words
+_bn_sqr_words   PROC FAR
+; Line 92
+        push    bp
+        push    bx
+        push    si
+        push    di
+        push    ds
+        push    es
+        mov     bp,sp
+        mov     si,WORD PTR [bp+16]
+        mov     ds,WORD PTR [bp+18]
+        mov     di,WORD PTR [bp+20]
+        mov     es,WORD PTR [bp+22]
+        mov     bx,WORD PTR [bp+24]
+
+        mov     bp,bx   ; save a memory lookup later
+        shr     bx,1    ; div count by 4 and do groups of 4
+        shr     bx,1
+        je      $L666
+
+$L765:
+        mov     eax,DWORD PTR es:[di]
+        mul     eax
+        mov     DWORD PTR ds:[si],eax
+        mov     DWORD PTR ds:[si+4],edx
+        ;
+        mov     eax,DWORD PTR es:[di+4]
+        mul     eax
+        mov     DWORD PTR ds:[si+8],eax
+        mov     DWORD PTR ds:[si+12],edx
+        ;
+        mov     eax,DWORD PTR es:[di+8]
+        mul     eax
+        mov     DWORD PTR ds:[si+16],eax
+        mov     DWORD PTR ds:[si+20],edx
+        ;
+        mov     eax,DWORD PTR es:[di+12]
+        mul     eax
+        mov     DWORD PTR ds:[si+24],eax
+        mov     DWORD PTR ds:[si+28],edx
+        ;
+        add     di,16
+        add     si,32
+        dec     bx
+        je      $L666
+        jmp     $L765
+$L666:
+        and     bp,3
+        dec     bp      ; The copied value of bx (num)
+        js      $L645
+        ;
+        mov     eax,DWORD PTR es:[di]
+        mul     eax
+        mov     DWORD PTR ds:[si],eax
+        mov     DWORD PTR ds:[si+4],edx
+        dec     bp
+        js      $L645
+        ;
+        mov     eax,DWORD PTR es:[di+4]
+        mul     eax
+        mov     DWORD PTR ds:[si+8],eax
+        mov     DWORD PTR ds:[si+12],edx
+        dec     bp
+        js      $L645
+        ;
+        mov     eax,DWORD PTR es:[di+8]
+        mul     eax
+        mov     DWORD PTR ds:[si+16],eax
+        mov     DWORD PTR ds:[si+20],edx
+$L645:
+        pop     es
+        pop     ds
+        pop     di
+        pop     si
+        pop     bx
+        pop     bp
+        ret     
+_bn_sqr_words   ENDP
+
+        PUBLIC  _bn_div64
+_bn_div64       PROC FAR
+        push    bp
+        mov     bp,sp
+        mov     edx, DWORD PTR [bp+6]
+        mov     eax, DWORD PTR [bp+10]
+        div     DWORD PTR [bp+14]
+        mov     edx,eax
+        shr     edx,16
+        pop     bp
+        ret     
+_bn_div64       ENDP
+
+        PUBLIC  _bn_add_words
+_bn_add_words   PROC FAR
+; Line 58
+        push    bp
+        push    bx
+        push    esi
+        push    di
+        push    ds
+        push    es
+        mov     bp,sp
+;       w = 28
+;       num = 26
+;       ap = 22
+;       rp = 18
+        xor     esi,esi                 ;c=0;
+        mov     si,WORD PTR [bp+22]     ; load a
+        mov     es,WORD PTR [bp+24]     ; load a
+        mov     di,WORD PTR [bp+26]     ; load b
+        mov     ds,WORD PTR [bp+28]     ; load b
+
+        mov     dx,WORD PTR [bp+30]     ; load num
+        dec     dx
+        js      $L547
+        xor     ecx,ecx
+
+$L5477:
+        xor     ebx,ebx
+        mov     eax,DWORD PTR es:[si]   ; *a
+        add     eax,ecx
+        adc     ebx,0
+        add     si,4                    ; a++
+        add     eax,DWORD PTR ds:[di]   ; + *b
+        mov     ecx,ebx
+        adc     ecx,0
+        add     di,4
+        mov     bx,WORD PTR [bp+18]
+        mov     ds,WORD PTR [bp+20]
+        mov     DWORD PTR ds:[bx],eax
+        add     bx,4
+        mov     ds,WORD PTR [bp+28]
+        mov     WORD PTR [bp+18],bx
+        dec     dx
+        js      $L547                   ; Note that we are now testing for -1
+        jmp     $L5477
+        ;
+$L547:
+        mov     eax,ecx
+        mov     edx,ecx
+        shr     edx,16
+        pop     es
+        pop     ds
+        pop     di
+        pop     esi
+        pop     bx
+        pop     bp
+        ret     
+        nop     
+_bn_add_words   ENDP
+F_TEXT  ENDS
+END
diff --git a/src/lib/libcrypto/bn/bn.err b/src/lib/libcrypto/bn/bn.err
new file mode 100644
index 0000000000..7ccc247c41
--- /dev/null
+++ b/src/lib/libcrypto/bn/bn.err
@@ -0,0 +1,27 @@
+/* Error codes for the BN functions. */
+
+/* Function codes. */
+#define BN_F_BN_BLINDING_CONVERT                         100
+#define BN_F_BN_BLINDING_INVERT                          101
+#define BN_F_BN_BLINDING_NEW                             102
+#define BN_F_BN_BLINDING_UPDATE                          103
+#define BN_F_BN_BN2DEC                                   104
+#define BN_F_BN_BN2HEX                                   105
+#define BN_F_BN_CTX_NEW                                  106
+#define BN_F_BN_DIV                                      107
+#define BN_F_BN_EXPAND2                                  108
+#define BN_F_BN_MOD_EXP_MONT                             109
+#define BN_F_BN_MOD_INVERSE                              110
+#define BN_F_BN_MOD_MUL_RECIPROCAL                       111
+#define BN_F_BN_MPI2BN                                   112
+#define BN_F_BN_NEW                                      113
+#define BN_F_BN_RAND                                     114
+
+/* Reason codes. */
+#define BN_R_BAD_RECIPROCAL                              100
+#define BN_R_CALLED_WITH_EVEN_MODULUS                    101
+#define BN_R_DIV_BY_ZERO                                 102
+#define BN_R_ENCODING_ERROR                              103
+#define BN_R_INVALID_LENGTH                              104
+#define BN_R_NOT_INITALISED                              105
+#define BN_R_NO_INVERSE                                  106
diff --git a/src/lib/libcrypto/bn/bn.org b/src/lib/libcrypto/bn/bn.org
new file mode 100644
index 0000000000..66dde285d6
--- /dev/null
+++ b/src/lib/libcrypto/bn/bn.org
@@ -0,0 +1,502 @@
+/* crypto/bn/bn.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
+ *
+ * Always modify bn.org since bn.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+#ifndef HEADER_BN_H
+#define HEADER_BN_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#undef BN_LLONG
+
+#ifdef WIN32
+#define BN_LLONG /* This comment stops Configure mutilating things */
+#endif
+
+#define RECP_MUL_MOD
+#define MONT_MUL_MOD
+
+/* This next option uses the C libraries (2 word)/(1 word) function.
+ * If it is not defined, I use my C version (which is slower).
+ * The reason for this flag is that when the particular C compiler
+ * library routine is used, and the library is linked with a different
+ * compiler, the library is missing.  This mostly happens when the
+ * library is built with gcc and then linked using nornal cc.  This would
+ * be a common occurance because gcc normally produces code that is
+ * 2 times faster than system compilers for the big number stuff.
+ * For machines with only one compiler (or shared libraries), this should
+ * be on.  Again this in only really a problem on machines
+ * using "long long's", are 32bit, and are not using my assember code. */
+#if defined(MSDOS) || defined(WINDOWS) || defined(linux)
+#define BN_DIV2W
+#endif
+
+/* Only one for the following should be defined */
+/* The prime number generation stuff may not work when
+ * EIGHT_BIT but I don't care since I've only used this mode
+ * for debuging the bignum libraries */
+#undef SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#define THIRTY_TWO_BIT
+#undef SIXTEEN_BIT
+#undef EIGHT_BIT
+
+/* assuming long is 64bit - this is the DEC Alpha
+ * unsigned long long is only 64 bits :-(, don't define
+ * BN_LLONG for the DEC Alpha */
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_ULLONG       unsigned long long
+#define BN_ULONG        unsigned long
+#define BN_LONG         long
+#define BN_BITS         128
+#define BN_BYTES        8
+#define BN_BITS2        64
+#define BN_BITS4        32
+#define BN_MASK2        (0xffffffffffffffffL)
+#define BN_MASK2l       (0xffffffffL)
+#define BN_MASK2h       (0xffffffff00000000L)
+#define BN_MASK2h1      (0xffffffff80000000L)
+#define BN_TBIT         (0x8000000000000000L)
+#define BN_DEC_CONV     (10000000000000000000L)
+#define BN_DEC_FMT1     "%lu"
+#define BN_DEC_FMT2     "%019lu"
+#define BN_DEC_NUM      19
+#endif
+
+#ifdef SIXTY_FOUR_BIT
+#undef BN_LLONG
+/* #define BN_ULLONG    unsigned long long */
+#define BN_ULONG        unsigned long long
+#define BN_LONG         long long
+#define BN_BITS         128
+#define BN_BYTES        8
+#define BN_BITS2        64
+#define BN_BITS4        32
+#define BN_MASK2        (0xffffffffffffffffLL)
+#define BN_MASK2l       (0xffffffffL)
+#define BN_MASK2h       (0xffffffff00000000LL)
+#define BN_MASK2h1      (0xffffffff80000000LL)
+#define BN_TBIT         (0x8000000000000000LL)
+#define BN_DEC_CONV     (10000000000000000000L)
+#define BN_DEC_FMT1     "%lu"
+#define BN_DEC_FMT2     "%019lu"
+#define BN_DEC_NUM      19
+#endif
+
+#ifdef THIRTY_TWO_BIT
+#ifdef WIN32
+#define BN_ULLONG       unsigned _int64
+#else
+#define BN_ULLONG       unsigned long long
+#endif
+#define BN_ULONG        unsigned long
+#define BN_LONG         long
+#define BN_BITS         64
+#define BN_BYTES        4
+#define BN_BITS2        32
+#define BN_BITS4        16
+#define BN_MASK2        (0xffffffffL)
+#define BN_MASK2l       (0xffff)
+#define BN_MASK2h1      (0xffff8000L)
+#define BN_MASK2h       (0xffff0000L)
+#define BN_TBIT         (0x80000000L)
+#define BN_DEC_CONV     (1000000000L)
+#define BN_DEC_FMT1     "%lu"
+#define BN_DEC_FMT2     "%09lu"
+#define BN_DEC_NUM      9
+#endif
+
+#ifdef SIXTEEN_BIT
+#ifndef BN_DIV2W
+#define BN_DIV2W
+#endif
+#define BN_ULLONG       unsigned long
+#define BN_ULONG        unsigned short
+#define BN_LONG         short
+#define BN_BITS         32
+#define BN_BYTES        2
+#define BN_BITS2        16
+#define BN_BITS4        8
+#define BN_MASK2        (0xffff)
+#define BN_MASK2l       (0xff)
+#define BN_MASK2h1      (0xff80)
+#define BN_MASK2h       (0xff00)
+#define BN_TBIT         (0x8000)
+#define BN_DEC_CONV     (100000)
+#define BN_DEC_FMT1     "%u"
+#define BN_DEC_FMT2     "%05u"
+#define BN_DEC_NUM      5
+#endif
+
+#ifdef EIGHT_BIT
+#ifndef BN_DIV2W
+#define BN_DIV2W
+#endif
+#define BN_ULLONG       unsigned short
+#define BN_ULONG        unsigned char
+#define BN_LONG         char
+#define BN_BITS         16
+#define BN_BYTES        1
+#define BN_BITS2        8
+#define BN_BITS4        4
+#define BN_MASK2        (0xff)
+#define BN_MASK2l       (0xf)
+#define BN_MASK2h1      (0xf8)
+#define BN_MASK2h       (0xf0)
+#define BN_TBIT         (0x80)
+#define BN_DEC_CONV     (100)
+#define BN_DEC_FMT1     "%u"
+#define BN_DEC_FMT2     "%02u"
+#define BN_DEC_NUM      2
+#endif
+
+#define BN_DEFAULT_BITS 1280
+
+#ifdef BIGNUM
+#undef BIGNUM
+#endif
+
+typedef struct bignum_st
+        {
+        BN_ULONG *d;    /* Pointer to an array of 'BN_BITS2' bit chunks. */
+        int top;        /* Index of last used d +1. */
+        /* The next are internal book keeping for bn_expand. */
+        int max;        /* Size of the d array. */
+        int neg;        /* one if the number is negative */
+        } BIGNUM;
+
+/* Used for temp variables */
+#define BN_CTX_NUM      12
+typedef struct bignum_ctx
+        {
+        int tos;
+        BIGNUM *bn[BN_CTX_NUM+1];
+        } BN_CTX;
+
+typedef struct bn_blinding_st
+        {
+        int init;
+        BIGNUM *A;
+        BIGNUM *Ai;
+        BIGNUM *mod; /* just a reference */
+        } BN_BLINDING;
+
+/* Used for montgomery multiplication */
+typedef struct bn_mont_ctx_st
+        {
+        int ri;         /* number of bits in R */
+        BIGNUM *RR;     /* used to convert to montgomery form */
+        BIGNUM *N;      /* The modulus */
+        BIGNUM *Ni;     /* The inverse of N */
+        BN_ULONG n0;    /* word form of inverse, normally only one of
+                         * Ni or n0 is defined */
+        } BN_MONT_CTX;
+
+#define BN_to_montgomery(r,a,mont,ctx)  BN_mod_mul_montgomery(\
+        r,a,(mont)->RR,(mont),ctx)
+
+#define BN_prime_checks         (5)
+
+#define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
+#define BN_is_word(a,w) (((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w)))
+#define BN_is_zero(a)   (((a)->top <= 1) && ((a)->d[0] == (BN_ULONG)0))
+#define BN_is_one(a)    (BN_is_word((a),1))
+#define BN_is_odd(a)    ((a)->d[0] & 1)
+#define BN_one(a)       (BN_set_word((a),1))
+#define BN_zero(a)      (BN_set_word((a),0))
+
+#define BN_ascii2bn(a)  BN_hex2bn(a)
+#define BN_bn2ascii(a)  BN_bn2hex(a)
+
+#define bn_fix_top(a) \
+        { \
+        BN_ULONG *fix_top_l; \
+        for (fix_top_l= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \
+                if (*(fix_top_l--)) break; \
+        }
+
+#define bn_expand(n,b) ((((b)/BN_BITS2) <= (n)->max)?\
+        (n):bn_expand2((n),(b)/BN_BITS2))
+#define bn_wexpand(n,b) (((b) <= (n)->max)?(n):bn_expand2((n),(b)))
+
+
+#ifndef NOPROTO
+BIGNUM *BN_value_one(void);
+char *  BN_options(void);
+BN_CTX *BN_CTX_new(void);
+void    BN_CTX_free(BN_CTX *c);
+int     BN_rand(BIGNUM *rnd, int bits, int top,int bottom);
+int     BN_num_bits(BIGNUM *a);
+int     BN_num_bits_word(BN_ULONG);
+BIGNUM *BN_new(void);
+void    BN_clear_free(BIGNUM *a);
+BIGNUM *BN_copy(BIGNUM *a, BIGNUM *b);
+BIGNUM *BN_bin2bn(unsigned char *s,int len,BIGNUM *ret);
+int     BN_bn2bin(BIGNUM *a, unsigned char *to);
+BIGNUM *BN_mpi2bn(unsigned char *s,int len,BIGNUM *ret);
+int     BN_bn2mpi(BIGNUM *a, unsigned char *to);
+int     BN_sub(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+void    bn_qsub(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+void    bn_qadd(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+int     BN_add(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+int     BN_mod(BIGNUM *rem, BIGNUM *m, BIGNUM *d, BN_CTX *ctx);
+int     BN_div(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BIGNUM *d, BN_CTX *ctx);
+int     BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+int     BN_sqr(BIGNUM *r, BIGNUM *a,BN_CTX *ctx);
+BN_ULONG BN_mod_word(BIGNUM *a, unsigned long w);
+BN_ULONG BN_div_word(BIGNUM *a, unsigned long w);
+int     BN_mul_word(BIGNUM *a, unsigned long w);
+int     BN_add_word(BIGNUM *a, unsigned long w);
+int     BN_sub_word(BIGNUM *a, unsigned long w);
+int     BN_set_word(BIGNUM *a, unsigned long w);
+unsigned long BN_get_word(BIGNUM *a);
+int     BN_cmp(BIGNUM *a, BIGNUM *b);
+void    BN_free(BIGNUM *a);
+int     BN_is_bit_set(BIGNUM *a, int n);
+int     BN_lshift(BIGNUM *r, BIGNUM *a, int n);
+int     BN_lshift1(BIGNUM *r, BIGNUM *a);
+int     BN_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p,BN_CTX *ctx);
+int     BN_mod_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,BN_CTX *ctx);
+int     BN_mod_exp_mont(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,BN_CTX *ctx,
+                BN_MONT_CTX *m_ctx);
+int     BN_mod_exp_recp(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,BN_CTX *ctx);
+int     BN_mod_exp_simple(BIGNUM *r, BIGNUM *a, BIGNUM *p,
+        BIGNUM *m,BN_CTX *ctx);
+int     BN_mask_bits(BIGNUM *a,int n);
+int     BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *x, BIGNUM *y, BIGNUM *m, 
+        BIGNUM *i, int nb, BN_CTX *ctx);
+int     BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, BIGNUM *m,
+        BN_CTX *ctx);
+#ifndef WIN16
+int     BN_print_fp(FILE *fp, BIGNUM *a);
+#endif
+#ifdef HEADER_BIO_H
+int     BN_print(BIO *fp, BIGNUM *a);
+#else
+int     BN_print(char *fp, BIGNUM *a);
+#endif
+int     BN_reciprocal(BIGNUM *r, BIGNUM *m, BN_CTX *ctx);
+int     BN_rshift(BIGNUM *r, BIGNUM *a, int n);
+int     BN_rshift1(BIGNUM *r, BIGNUM *a);
+void    BN_clear(BIGNUM *a);
+BIGNUM *bn_expand2(BIGNUM *b, int bits);
+BIGNUM *BN_dup(BIGNUM *a);
+int     BN_ucmp(BIGNUM *a, BIGNUM *b);
+int     BN_set_bit(BIGNUM *a, int n);
+int     BN_clear_bit(BIGNUM *a, int n);
+char *  BN_bn2hex(BIGNUM *a);
+char *  BN_bn2dec(BIGNUM *a);
+int     BN_hex2bn(BIGNUM **a,char *str);
+int     BN_dec2bn(BIGNUM **a,char *str);
+int     BN_gcd(BIGNUM *r,BIGNUM *in_a,BIGNUM *in_b,BN_CTX *ctx);
+BIGNUM *BN_mod_inverse(BIGNUM *a, BIGNUM *n,BN_CTX *ctx);
+BIGNUM *BN_generate_prime(int bits,int strong,BIGNUM *add,
+                BIGNUM *rem,void (*callback)(int,int,char *),char *cb_arg);
+int     BN_is_prime(BIGNUM *p,int nchecks,void (*callback)(int,int,char *),
+                BN_CTX *ctx,char *cb_arg);
+void    ERR_load_BN_strings(void );
+
+BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);
+BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);
+void     bn_sqr_words(BN_ULONG *rp, BN_ULONG *ap, int num);
+BN_ULONG bn_div64(BN_ULONG h, BN_ULONG l, BN_ULONG d);
+BN_ULONG bn_add_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);
+
+BN_MONT_CTX *BN_MONT_CTX_new(void );
+int BN_mod_mul_montgomery(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_MONT_CTX *mont,
+        BN_CTX *ctx);
+int BN_from_montgomery(BIGNUM *r,BIGNUM *a,BN_MONT_CTX *mont,BN_CTX *ctx);
+void BN_MONT_CTX_free(BN_MONT_CTX *mont);
+int BN_MONT_CTX_set(BN_MONT_CTX *mont,BIGNUM *modulus,BN_CTX *ctx);
+
+BN_BLINDING *BN_BLINDING_new(BIGNUM *A,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 *r, BN_CTX *ctx);
+int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
+
+#else
+
+BIGNUM *BN_value_one();
+char *  BN_options();
+BN_CTX *BN_CTX_new();
+void    BN_CTX_free();
+int     BN_rand();
+int     BN_num_bits();
+int     BN_num_bits_word();
+BIGNUM *BN_new();
+void    BN_clear_free();
+BIGNUM *BN_copy();
+BIGNUM *BN_bin2bn();
+int     BN_bn2bin();
+BIGNUM *BN_mpi2bn();
+int     BN_bn2mpi();
+int     BN_sub();
+void    bn_qsub();
+void    bn_qadd();
+int     BN_add();
+int     BN_mod();
+int     BN_div();
+int     BN_mul();
+int     BN_sqr();
+BN_ULONG BN_mod_word();
+BN_ULONG BN_div_word();
+int     BN_add_word();
+int     BN_sub_word();
+int     BN_mul_word();
+int     BN_set_word();
+unsigned long BN_get_word();
+int     BN_cmp();
+void    BN_free();
+int     BN_is_bit_set();
+int     BN_lshift();
+int     BN_lshift1();
+int     BN_exp();
+int     BN_mod_exp();
+int     BN_mod_exp_mont();
+int     BN_mod_exp_recp();
+int     BN_mod_exp_simple();
+int     BN_mask_bits();
+int     BN_mod_mul_reciprocal();
+int     BN_mod_mul();
+#ifndef WIN16
+int     BN_print_fp();
+#endif
+int     BN_print();
+int     BN_reciprocal();
+int     BN_rshift();
+int     BN_rshift1();
+void    BN_clear();
+BIGNUM *bn_expand2();
+BIGNUM *BN_dup();
+int     BN_ucmp();
+int     BN_set_bit();
+int     BN_clear_bit();
+char *  BN_bn2hex();
+char *  BN_bn2dec();
+int     BN_hex2bn();
+int     BN_dec2bn();
+int     BN_gcd();
+BIGNUM *BN_mod_inverse();
+BIGNUM *BN_generate_prime();
+int     BN_is_prime();
+void    ERR_load_BN_strings();
+
+BN_ULONG bn_mul_add_words();
+BN_ULONG bn_mul_words();
+void     bn_sqr_words();
+BN_ULONG bn_div64();
+BN_ULONG bn_add_words();
+
+int BN_mod_mul_montgomery();
+int BN_from_montgomery();
+BN_MONT_CTX *BN_MONT_CTX_new();
+void BN_MONT_CTX_free();
+int BN_MONT_CTX_set();
+
+BN_BLINDING *BN_BLINDING_new();
+void BN_BLINDING_free();
+int BN_BLINDING_update();
+int BN_BLINDING_convert();
+int BN_BLINDING_invert();
+
+#endif
+
+/* BEGIN ERROR CODES */
+/* Error codes for the BN functions. */
+
+/* Function codes. */
+#define BN_F_BN_BLINDING_CONVERT                         100
+#define BN_F_BN_BLINDING_INVERT                          101
+#define BN_F_BN_BLINDING_NEW                             102
+#define BN_F_BN_BLINDING_UPDATE                          103
+#define BN_F_BN_BN2DEC                                   104
+#define BN_F_BN_BN2HEX                                   105
+#define BN_F_BN_CTX_NEW                                  106
+#define BN_F_BN_DIV                                      107
+#define BN_F_BN_EXPAND2                                  108
+#define BN_F_BN_MOD_EXP_MONT                             109
+#define BN_F_BN_MOD_INVERSE                              110
+#define BN_F_BN_MOD_MUL_RECIPROCAL                       111
+#define BN_F_BN_MPI2BN                                   112
+#define BN_F_BN_NEW                                      113
+#define BN_F_BN_RAND                                     114
+
+/* Reason codes. */
+#define BN_R_BAD_RECIPROCAL                              100
+#define BN_R_CALLED_WITH_EVEN_MODULUS                    101
+#define BN_R_DIV_BY_ZERO                                 102
+#define BN_R_ENCODING_ERROR                              103
+#define BN_R_INVALID_LENGTH                              104
+#define BN_R_NOT_INITALISED                              105
+#define BN_R_NO_INVERSE                                  106
+ 
+#ifdef  __cplusplus
+}
+#endif
+#endif
+
diff --git a/src/lib/libcrypto/bn/bn_m.c b/src/lib/libcrypto/bn/bn_m.c
new file mode 100644
index 0000000000..5166daaeec
--- /dev/null
+++ b/src/lib/libcrypto/bn/bn_m.c
@@ -0,0 +1,169 @@
+/* crypto/bn/bn_m.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 "cryptlib.h"
+#include "bn_lcl.h"
+#include "stack.h"
+
+int limit=16;
+
+typedef struct bn_pool_st
+        {
+        int used;
+        int tos;
+        STACK *sk; 
+        } BN_POOL;
+
+BIGNUM *BN_POOL_push(bp)
+BN_POOL *bp;
+        {
+        BIGNUM *ret;
+
+        if (bp->used >= bp->tos)
+                {
+                ret=BN_new();
+                sk_push(bp->sk,(char *)ret);
+                bp->tos++;
+                bp->used++;
+                }
+        else
+                {
+                ret=(BIGNUM *)sk_value(bp->sk,bp->used);
+                bp->used++;
+                }
+        return(ret);
+        }
+
+void BN_POOL_pop(bp,num)
+BN_POOL *bp;
+int num;
+        {
+        bp->used-=num;
+        }
+
+int BN_m(r,a,b)
+BIGNUM *r,*a,*b;
+        {
+        static BN_POOL bp;
+        static init=1;
+
+        if (init)
+                {
+                bp.used=0;
+                bp.tos=0;
+                bp.sk=sk_new_null();
+                init=0;
+                }
+        return(BN_mm(r,a,b,&bp));
+        }
+
+/* r must be different to a and b */
+int BN_mm(m, A, B, bp)
+BIGNUM *m,*A,*B;
+BN_POOL *bp;
+        {
+        int i,num;
+        int an,bn;
+        BIGNUM *a,*b,*c,*d,*ac,*bd;
+
+        an=A->top;
+        bn=B->top;
+        if ((an <= limit) || (bn <= limit))
+                {
+                return(BN_mul(m,A,B));
+                }
+
+        a=BN_POOL_push(bp);
+        b=BN_POOL_push(bp);
+        c=BN_POOL_push(bp);
+        d=BN_POOL_push(bp);
+        ac=BN_POOL_push(bp);
+        bd=BN_POOL_push(bp);
+
+        num=(an <= bn)?an:bn;
+        num=1<<(BN_num_bits_word(num-1)-1);
+
+        /* Are going to now chop things into 'num' word chunks. */
+        num*=BN_BITS2;
+
+        BN_copy(a,A);
+        BN_mask_bits(a,num);
+        BN_rshift(b,A,num);
+
+        BN_copy(c,B);
+        BN_mask_bits(c,num);
+        BN_rshift(d,B,num);
+
+        BN_sub(ac ,b,a);
+        BN_sub(bd,c,d);
+        BN_mm(m,ac,bd,bp);
+        BN_mm(ac,a,c,bp);
+        BN_mm(bd,b,d,bp);
+
+        BN_add(m,m,ac);
+        BN_add(m,m,bd);
+        BN_lshift(m,m,num);
+        BN_lshift(bd,bd,num*2);
+
+        BN_add(m,m,ac);
+        BN_add(m,m,bd);
+        BN_POOL_pop(bp,6);
+        return(1);
+        }
+
diff --git a/src/lib/libcrypto/bn/bn_mulw.c b/src/lib/libcrypto/bn/bn_mulw.c
new file mode 100644
index 0000000000..abfc7e4d6c
--- /dev/null
+++ b/src/lib/libcrypto/bn/bn_mulw.c
@@ -0,0 +1,366 @@
+/* crypto/bn/bn_mulw.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 "cryptlib.h"
+#include "bn_lcl.h"
+
+#ifdef BN_LLONG 
+
+BN_ULONG bn_mul_add_words(rp,ap,num,w)
+BN_ULONG *rp,*ap;
+int num;
+BN_ULONG w;
+        {
+        BN_ULONG c1=0;
+
+        for (;;)
+                {
+                mul_add(rp[0],ap[0],w,c1);
+                if (--num == 0) break;
+                mul_add(rp[1],ap[1],w,c1);
+                if (--num == 0) break;
+                mul_add(rp[2],ap[2],w,c1);
+                if (--num == 0) break;
+                mul_add(rp[3],ap[3],w,c1);
+                if (--num == 0) break;
+                ap+=4;
+                rp+=4;
+                }
+        
+        return(c1);
+        } 
+
+BN_ULONG bn_mul_words(rp,ap,num,w)
+BN_ULONG *rp,*ap;
+int num;
+BN_ULONG w;
+        {
+        BN_ULONG c1=0;
+
+        for (;;)
+                {
+                mul(rp[0],ap[0],w,c1);
+                if (--num == 0) break;
+                mul(rp[1],ap[1],w,c1);
+                if (--num == 0) break;
+                mul(rp[2],ap[2],w,c1);
+                if (--num == 0) break;
+                mul(rp[3],ap[3],w,c1);
+                if (--num == 0) break;
+                ap+=4;
+                rp+=4;
+                }
+        return(c1);
+        } 
+
+void bn_sqr_words(r,a,n)
+BN_ULONG *r,*a;
+int n;
+        {
+        for (;;)
+                {
+                BN_ULLONG t;
+
+                t=(BN_ULLONG)(a[0])*(a[0]);
+                r[0]=Lw(t); r[1]=Hw(t);
+                if (--n == 0) break;
+
+                t=(BN_ULLONG)(a[1])*(a[1]);
+                r[2]=Lw(t); r[3]=Hw(t);
+                if (--n == 0) break;
+
+                t=(BN_ULLONG)(a[2])*(a[2]);
+                r[4]=Lw(t); r[5]=Hw(t);
+                if (--n == 0) break;
+
+                t=(BN_ULLONG)(a[3])*(a[3]);
+                r[6]=Lw(t); r[7]=Hw(t);
+                if (--n == 0) break;
+
+                a+=4;
+                r+=8;
+                }
+        }
+
+BN_ULONG bn_add_words(r,a,b,n)
+BN_ULONG *r,*a,*b;
+int n;
+        {
+        BN_ULLONG ll;
+
+        ll=0;
+        for (;;)
+                {
+                ll+= (BN_ULLONG)a[0]+b[0];
+                r[0]=(BN_ULONG)ll&BN_MASK2;
+                ll>>=BN_BITS2;
+                if (--n <= 0) break;
+
+                ll+= (BN_ULLONG)a[1]+b[1];
+                r[1]=(BN_ULONG)ll&BN_MASK2;
+                ll>>=BN_BITS2;
+                if (--n <= 0) break;
+
+                ll+= (BN_ULLONG)a[2]+b[2];
+                r[2]=(BN_ULONG)ll&BN_MASK2;
+                ll>>=BN_BITS2;
+                if (--n <= 0) break;
+
+                ll+= (BN_ULLONG)a[3]+b[3];
+                r[3]=(BN_ULONG)ll&BN_MASK2;
+                ll>>=BN_BITS2;
+                if (--n <= 0) break;
+
+                a+=4;
+                b+=4;
+                r+=4;
+                }
+        return(ll&BN_MASK2);
+        }
+
+#else
+
+BN_ULONG bn_mul_add_words(rp,ap,num,w)
+BN_ULONG *rp,*ap;
+int num;
+BN_ULONG w;
+        {
+        BN_ULONG c=0;
+        BN_ULONG bl,bh;
+
+        bl=LBITS(w);
+        bh=HBITS(w);
+
+        for (;;)
+                {
+                mul_add(rp[0],ap[0],bl,bh,c);
+                if (--num == 0) break;
+                mul_add(rp[1],ap[1],bl,bh,c);
+                if (--num == 0) break;
+                mul_add(rp[2],ap[2],bl,bh,c);
+                if (--num == 0) break;
+                mul_add(rp[3],ap[3],bl,bh,c);
+                if (--num == 0) break;
+                ap+=4;
+                rp+=4;
+                }
+        return(c);
+        } 
+
+BN_ULONG bn_mul_words(rp,ap,num,w)
+BN_ULONG *rp,*ap;
+int num;
+BN_ULONG w;
+        {
+        BN_ULONG carry=0;
+        BN_ULONG bl,bh;
+
+        bl=LBITS(w);
+        bh=HBITS(w);
+
+        for (;;)
+                {
+                mul(rp[0],ap[0],bl,bh,carry);
+                if (--num == 0) break;
+                mul(rp[1],ap[1],bl,bh,carry);
+                if (--num == 0) break;
+                mul(rp[2],ap[2],bl,bh,carry);
+                if (--num == 0) break;
+                mul(rp[3],ap[3],bl,bh,carry);
+                if (--num == 0) break;
+                ap+=4;
+                rp+=4;
+                }
+        return(carry);
+        } 
+
+void bn_sqr_words(r,a,n)
+BN_ULONG *r,*a;
+int n;
+        {
+        for (;;)
+                {
+                sqr64(r[0],r[1],a[0]);
+                if (--n == 0) break;
+
+                sqr64(r[2],r[3],a[1]);
+                if (--n == 0) break;
+
+                sqr64(r[4],r[5],a[2]);
+                if (--n == 0) break;
+
+                sqr64(r[6],r[7],a[3]);
+                if (--n == 0) break;
+
+                a+=4;
+                r+=8;
+                }
+        }
+
+BN_ULONG bn_add_words(r,a,b,n)
+BN_ULONG *r,*a,*b;
+int n;
+        {
+        BN_ULONG t1,t2;
+        int carry,i;
+
+        carry=0;
+        for (i=0; i<n; i++)
+                {
+                t1= *(a++);
+                t2= *(b++);
+                if (carry)
+                        {
+                        carry=(t2 >= ((~t1)&BN_MASK2));
+                        t2=(t1+t2+1)&BN_MASK2;
+                        }
+                else
+                        {
+                        t2=(t1+t2)&BN_MASK2;
+                        carry=(t2<t1);
+                        }
+                *(r++)=t2;
+                }
+        return(carry);
+        }
+
+#endif
+
+#if defined(BN_LLONG) && defined(BN_DIV2W)
+
+BN_ULONG bn_div64(h,l,d)
+BN_ULONG h,l,d;
+        {
+        return((BN_ULONG)(((((BN_ULLONG)h)<<BN_BITS2)|l)/(BN_ULLONG)d));
+        }
+
+#else
+
+/* Divide h-l by d and return the result. */
+/* I need to test this some more :-( */
+BN_ULONG bn_div64(h,l,d)
+BN_ULONG h,l,d;
+        {
+        BN_ULONG dh,dl,q,ret=0,th,tl,t;
+        int i,count=2;
+
+        if (d == 0) return(BN_MASK2);
+
+        i=BN_num_bits_word(d);
+        if ((i != BN_BITS2) && (h > (BN_ULONG)1<<i))
+                {
+#if !defined(NO_STDIO) && !defined(WIN16)
+                fprintf(stderr,"Division would overflow (%d)\n",i);
+#endif
+                abort();
+                }
+        i=BN_BITS2-i;
+        if (h >= d) h-=d;
+
+        if (i)
+                {
+                d<<=i;
+                h=(h<<i)|(l>>(BN_BITS2-i));
+                l<<=i;
+                }
+        dh=(d&BN_MASK2h)>>BN_BITS4;
+        dl=(d&BN_MASK2l);
+        for (;;)
+                {
+                if ((h>>BN_BITS4) == dh)
+                        q=BN_MASK2l;
+                else
+                        q=h/dh;
+
+                for (;;)
+                        {
+                        t=(h-q*dh);
+                        if ((t&BN_MASK2h) ||
+                                ((dl*q) <= (
+                                        (t<<BN_BITS4)+
+                                        ((l&BN_MASK2h)>>BN_BITS4))))
+                                break;
+                        q--;
+                        }
+                th=q*dh;
+                tl=q*dl;
+                t=(tl>>BN_BITS4);
+                tl=(tl<<BN_BITS4)&BN_MASK2h;
+                th+=t;
+
+                if (l < tl) th++;
+                l-=tl;
+                if (h < th)
+                        {
+                        h+=d;
+                        q--;
+                        }
+                h-=th;
+
+                if (--count == 0) break;
+
+                ret=q<<BN_BITS4;
+                h=((h<<BN_BITS4)|(l>>BN_BITS4))&BN_MASK2;
+                l=(l&BN_MASK2l)<<BN_BITS4;
+                }
+        ret|=q;
+        return(ret);
+        }
+#endif
+
diff --git a/src/lib/libcrypto/bn/bn_sub.c b/src/lib/libcrypto/bn/bn_sub.c
new file mode 100644
index 0000000000..bba80f8afb
--- /dev/null
+++ b/src/lib/libcrypto/bn/bn_sub.c
@@ -0,0 +1,180 @@
+/* crypto/bn/bn_sub.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 "cryptlib.h"
+#include "bn_lcl.h"
+
+/* unsigned subtraction of b from a, a must be larger than b. */
+void bn_qsub(r, a, b)
+BIGNUM *r;
+BIGNUM *a;
+BIGNUM *b;
+        {
+        int max,min;
+        register BN_ULONG t1,t2,*ap,*bp,*rp;
+        int i,carry;
+#if defined(IRIX_CC_BUG) && !defined(LINT)
+        int dummy;
+#endif
+
+        max=a->top;
+        min=b->top;
+        ap=a->d;
+        bp=b->d;
+        rp=r->d;
+
+        carry=0;
+        for (i=0; i<min; i++)
+                {
+                t1= *(ap++);
+                t2= *(bp++);
+                if (carry)
+                        {
+                        carry=(t1 <= t2);
+                        t1=(t1-t2-1)&BN_MASK2;
+                        }
+                else
+                        {
+                        carry=(t1 < t2);
+                        t1=(t1-t2)&BN_MASK2;
+                        }
+#if defined(IRIX_CC_BUG) && !defined(LINT)
+                dummy=t1;
+#endif
+                *(rp++)=t1&BN_MASK2;
+                }
+        if (carry) /* subtracted */
+                {
+                while (i < max)
+                        {
+                        i++;
+                        t1= *(ap++);
+                        t2=(t1-1)&BN_MASK2;
+                        *(rp++)=t2;
+                        if (t1 > t2) break;
+                        }
+                }
+#if 0
+        memcpy(rp,ap,sizeof(*rp)*(max-i));
+#else
+        for (; i<max; i++)
+                *(rp++)= *(ap++);
+#endif
+
+        r->top=max;
+        bn_fix_top(r);
+        }
+
+int BN_sub(r, a, b)
+BIGNUM *r;
+BIGNUM *a;
+BIGNUM *b;
+        {
+        int max,i;
+        int add=0,neg=0;
+        BIGNUM *tmp;
+
+        /*  a -  b      a-b
+         *  a - -b      a+b
+         * -a -  b      -(a+b)
+         * -a - -b      b-a
+         */
+        if (a->neg)
+                {
+                if (b->neg)
+                        { tmp=a; a=b; b=tmp; }
+                else
+                        { add=1; neg=1; }
+                }
+        else
+                {
+                if (b->neg) { add=1; neg=0; }
+                }
+
+        if (add)
+                {
+                /* As a fast max size, do a a->top | b->top */
+                i=(a->top | b->top)+1;
+                if (bn_wexpand(r,i) == NULL)
+                        return(0);
+                if (i)
+                        bn_qadd(r,a,b);
+                else
+                        bn_qadd(r,b,a);
+                r->neg=neg;
+                return(1);
+                }
+
+        /* We are actually doing a - b :-) */
+
+        max=(a->top > b->top)?a->top:b->top;
+        if (bn_wexpand(r,max) == NULL) return(0);
+        if (BN_ucmp(a,b) < 0)
+                {
+                bn_qsub(r,b,a);
+                r->neg=1;
+                }
+        else
+                {
+                bn_qsub(r,a,b);
+                r->neg=0;
+                }
+        return(1);
+        }
+
diff --git a/src/lib/libcrypto/buffer/Makefile.ssl b/src/lib/libcrypto/buffer/Makefile.ssl
new file mode 100644
index 0000000000..a5f150e523
--- /dev/null
+++ b/src/lib/libcrypto/buffer/Makefile.ssl
@@ -0,0 +1,84 @@
+#
+# SSLeay/crypto/buffer/Makefile
+#
+
+DIR=    buffer
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=buffer
+ERRC=buf_err
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= buffer.c $(ERRC).c
+LIBOBJ= buffer.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= buffer.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/buffer/buffer.err b/src/lib/libcrypto/buffer/buffer.err
new file mode 100644
index 0000000000..62b775e637
--- /dev/null
+++ b/src/lib/libcrypto/buffer/buffer.err
@@ -0,0 +1,9 @@
+/* Error codes for the BUF functions. */
+
+/* Function codes. */
+#define BUF_F_BUF_MEM_GROW                               100
+#define BUF_F_BUF_MEM_NEW                                101
+#define BUF_F_BUF_STRDUP                                 102
+#define BUF_F_PXYCLNT_READ                               103
+
+/* Reason codes. */
diff --git a/src/lib/libcrypto/cast/Makefile.ssl b/src/lib/libcrypto/cast/Makefile.ssl
new file mode 100644
index 0000000000..0143827ae5
--- /dev/null
+++ b/src/lib/libcrypto/cast/Makefile.ssl
@@ -0,0 +1,109 @@
+#
+# SSLeay/crypto/cast/Makefile
+#
+
+DIR=    cast
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CAST_ENC=c_enc.o
+# or use
+#CAST_ENC=asm/cx86-elf.o
+#CAST_ENC=asm/cx86-out.o
+#CAST_ENC=asm/cx86-sol.o
+#CAST_ENC=asm/cx86bdsi.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=casttest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c 
+LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= cast.h
+HEADER= cast_s.h cast_lcl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/cx86-elf.o: asm/cx86unix.cpp
+        $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o
+
+# solaris
+asm/cx86-sol.o: asm/cx86unix.cpp
+        $(CC) -E -DSOL asm/cx86unix.cpp | sed 's/^#.*//' > asm/cx86-sol.s
+        as -o asm/cx86-sol.o asm/cx86-sol.s
+        rm -f asm/cx86-sol.s
+
+# a.out
+asm/cx86-out.o: asm/cx86unix.cpp
+        $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o
+
+# bsdi
+asm/cx86bsdi.o: asm/cx86unix.cpp
+        $(CPP) -DBSDI asm/cx86unix.cpp | as -o asm/cx86bsdi.o
+
+asm/cx86unix.cpp:
+        (cd asm; perl cast-586.pl cpp >cx86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/cast/Makefile.uni b/src/lib/libcrypto/cast/Makefile.uni
new file mode 100644
index 0000000000..780073e75b
--- /dev/null
+++ b/src/lib/libcrypto/cast/Makefile.uni
@@ -0,0 +1,123 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+# There are 3 possible performance options, experiment :-)
+#OPTS= -DBF_PTR
+#OPTS= -DBF_PTR2
+OPTS=
+
+DIR=    cast
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+CAST_ENC=c_enc.o
+# or use
+#CAST_ENC=asm/cx86-elf.o
+#CAST_ENC=asm/cx86-out.o
+#CAST_ENC=asm/cx86-sol.o
+#CAST_ENC=asm/cx86bdsi.o
+
+CFLAGS= $(OPTS) $(INCLUDES) $(CFLAG) -DFULL_TEST
+
+GENERAL=Makefile
+TEST=casttest
+APP1=cast_spd
+APP2=castopts
+APPS=$(APP1) $(APP2)
+
+LIB=libcast.a
+LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
+LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= cast.h
+HEADER= cast_lcl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB):    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+# elf
+asm/cx86-elf.o: asm/cx86unix.cpp
+        $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o
+
+# solaris
+asm/cx86-sol.o: asm/cx86unix.cpp
+        $(CC) -E -DSOL asm/cx86unix.cpp | sed 's/^#.*//' > asm/cx86-sol.s
+        as -o asm/cx86-sol.o asm/cx86-sol.s
+        rm -f asm/cx86-sol.s
+
+# a.out
+asm/cx86-out.o: asm/cx86unix.cpp
+        $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o
+
+# bsdi
+asm/cx86bsdi.o: asm/cx86unix.cpp
+        $(CPP) -DBSDI asm/cx86unix.cpp | as -o asm/cx86bsdi.o
+
+asm/cx86unix.cpp:
+        (cd asm; perl cast-586.pl cpp >cx86unix.cpp)
+
+test:   $(TEST)
+        ./$(TEST)
+
+$(TEST): $(TEST).c $(LIB)
+        $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB)
+
+$(APP1): $(APP1).c $(LIB)
+        $(CC) -o $(APP1) $(CFLAGS) $(APP1).c $(LIB)
+
+$(APP2): $(APP2).c $(LIB)
+        $(CC) -o $(APP2) $(CFLAGS) $(APP2).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+x86-elf:
+        $(MAKE) CAST_ENC="asm/cx86-elf.o" CFLAG="-DELF $(CFLAGS)" all
+
+x86-out:
+        $(MAKE) CAST_ENC="asm/cx86-out.o" CFLAG="-DOUT $(CFLAGS)" all
+
+x86-solaris:
+        $(MAKE) CAST_ENC="asm/cx86-sol.o" CFLAG="-DSOL $(CFLAGS)" all
+
+x86-bdsi:
+        $(MAKE) CAST_ENC="asm/cx86-bdsi.o" CFLAG="-DBDSI $(CFLAGS)" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/cast/asm/c-win32.asm b/src/lib/libcrypto/cast/asm/c-win32.asm
new file mode 100644
index 0000000000..a1d8a2671a
--- /dev/null
+++ b/src/lib/libcrypto/cast/asm/c-win32.asm
@@ -0,0 +1,940 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by cast-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   cast-586.asm
+        .486
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _CAST_encrypt
+EXTERN  _CAST_S_table0:DWORD
+EXTERN  _CAST_S_table1:DWORD
+EXTERN  _CAST_S_table2:DWORD
+EXTERN  _CAST_S_table3:DWORD
+
+_CAST_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        push    esi
+        push    edi
+        ; Load the 2 words
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        xor     eax,            eax
+        ; round 0
+        mov     edx,            DWORD PTR [ebp]
+        mov     ecx,            DWORD PTR 4[ebp]
+        add     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     edi,            ecx
+        ; round 1
+        mov     edx,            DWORD PTR 8[ebp]
+        mov     ecx,            DWORD PTR 12[ebp]
+        xor     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     esi,            ecx
+        ; round 2
+        mov     edx,            DWORD PTR 16[ebp]
+        mov     ecx,            DWORD PTR 20[ebp]
+        sub     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     edi,            ecx
+        ; round 3
+        mov     edx,            DWORD PTR 24[ebp]
+        mov     ecx,            DWORD PTR 28[ebp]
+        add     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     esi,            ecx
+        ; round 4
+        mov     edx,            DWORD PTR 32[ebp]
+        mov     ecx,            DWORD PTR 36[ebp]
+        xor     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     edi,            ecx
+        ; round 5
+        mov     edx,            DWORD PTR 40[ebp]
+        mov     ecx,            DWORD PTR 44[ebp]
+        sub     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     esi,            ecx
+        ; round 6
+        mov     edx,            DWORD PTR 48[ebp]
+        mov     ecx,            DWORD PTR 52[ebp]
+        add     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     edi,            ecx
+        ; round 7
+        mov     edx,            DWORD PTR 56[ebp]
+        mov     ecx,            DWORD PTR 60[ebp]
+        xor     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     esi,            ecx
+        ; round 8
+        mov     edx,            DWORD PTR 64[ebp]
+        mov     ecx,            DWORD PTR 68[ebp]
+        sub     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     edi,            ecx
+        ; round 9
+        mov     edx,            DWORD PTR 72[ebp]
+        mov     ecx,            DWORD PTR 76[ebp]
+        add     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     esi,            ecx
+        ; round 10
+        mov     edx,            DWORD PTR 80[ebp]
+        mov     ecx,            DWORD PTR 84[ebp]
+        xor     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     edi,            ecx
+        ; round 11
+        mov     edx,            DWORD PTR 88[ebp]
+        mov     ecx,            DWORD PTR 92[ebp]
+        sub     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     esi,            ecx
+        ; round 12
+        mov     edx,            DWORD PTR 96[ebp]
+        mov     ecx,            DWORD PTR 100[ebp]
+        add     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     edi,            ecx
+        ; round 13
+        mov     edx,            DWORD PTR 104[ebp]
+        mov     ecx,            DWORD PTR 108[ebp]
+        xor     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     esi,            ecx
+        ; round 14
+        mov     edx,            DWORD PTR 112[ebp]
+        mov     ecx,            DWORD PTR 116[ebp]
+        sub     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     edi,            ecx
+        ; round 15
+        mov     edx,            DWORD PTR 120[ebp]
+        mov     ecx,            DWORD PTR 124[ebp]
+        add     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        mov     eax,            DWORD PTR 20[esp]
+        xor     esi,            ecx
+        nop
+        mov     DWORD PTR 4[eax],edi
+        mov     DWORD PTR [eax],esi
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_CAST_encrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _CAST_decrypt
+EXTERN  _CAST_S_table0:DWORD
+EXTERN  _CAST_S_table1:DWORD
+EXTERN  _CAST_S_table2:DWORD
+EXTERN  _CAST_S_table3:DWORD
+
+_CAST_decrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        push    esi
+        push    edi
+        ; Load the 2 words
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        xor     eax,            eax
+        ; round 15
+        mov     edx,            DWORD PTR 120[ebp]
+        mov     ecx,            DWORD PTR 124[ebp]
+        add     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     edi,            ecx
+        ; round 14
+        mov     edx,            DWORD PTR 112[ebp]
+        mov     ecx,            DWORD PTR 116[ebp]
+        sub     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     esi,            ecx
+        ; round 13
+        mov     edx,            DWORD PTR 104[ebp]
+        mov     ecx,            DWORD PTR 108[ebp]
+        xor     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     edi,            ecx
+        ; round 12
+        mov     edx,            DWORD PTR 96[ebp]
+        mov     ecx,            DWORD PTR 100[ebp]
+        add     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     esi,            ecx
+        ; round 11
+        mov     edx,            DWORD PTR 88[ebp]
+        mov     ecx,            DWORD PTR 92[ebp]
+        sub     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     edi,            ecx
+        ; round 10
+        mov     edx,            DWORD PTR 80[ebp]
+        mov     ecx,            DWORD PTR 84[ebp]
+        xor     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     esi,            ecx
+        ; round 9
+        mov     edx,            DWORD PTR 72[ebp]
+        mov     ecx,            DWORD PTR 76[ebp]
+        add     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     edi,            ecx
+        ; round 8
+        mov     edx,            DWORD PTR 64[ebp]
+        mov     ecx,            DWORD PTR 68[ebp]
+        sub     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     esi,            ecx
+        ; round 7
+        mov     edx,            DWORD PTR 56[ebp]
+        mov     ecx,            DWORD PTR 60[ebp]
+        xor     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     edi,            ecx
+        ; round 6
+        mov     edx,            DWORD PTR 48[ebp]
+        mov     ecx,            DWORD PTR 52[ebp]
+        add     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     esi,            ecx
+        ; round 5
+        mov     edx,            DWORD PTR 40[ebp]
+        mov     ecx,            DWORD PTR 44[ebp]
+        sub     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     edi,            ecx
+        ; round 4
+        mov     edx,            DWORD PTR 32[ebp]
+        mov     ecx,            DWORD PTR 36[ebp]
+        xor     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     esi,            ecx
+        ; round 3
+        mov     edx,            DWORD PTR 24[ebp]
+        mov     ecx,            DWORD PTR 28[ebp]
+        add     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        xor     edi,            ecx
+        ; round 2
+        mov     edx,            DWORD PTR 16[ebp]
+        mov     ecx,            DWORD PTR 20[ebp]
+        sub     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        sub     ecx,            ebx
+        xor     esi,            ecx
+        ; round 1
+        mov     edx,            DWORD PTR 8[ebp]
+        mov     ecx,            DWORD PTR 12[ebp]
+        xor     edx,            esi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        add     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        xor     ecx,            ebx
+        xor     edi,            ecx
+        ; round 0
+        mov     edx,            DWORD PTR [ebp]
+        mov     ecx,            DWORD PTR 4[ebp]
+        add     edx,            edi
+        rol     edx,            cl
+        mov     ebx,            edx
+        xor     ecx,            ecx
+        mov     cl,             dh
+        and     ebx,            255
+        shr     edx,            16
+        xor     eax,            eax
+        mov     al,             dh
+        and     edx,            255
+        mov     ecx,            DWORD PTR _CAST_S_table0[ecx*4]
+        mov     ebx,            DWORD PTR _CAST_S_table1[ebx*4]
+        xor     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table2[eax*4]
+        sub     ecx,            ebx
+        mov     ebx,            DWORD PTR _CAST_S_table3[edx*4]
+        add     ecx,            ebx
+        mov     eax,            DWORD PTR 20[esp]
+        xor     esi,            ecx
+        nop
+        mov     DWORD PTR 4[eax],edi
+        mov     DWORD PTR [eax],esi
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_CAST_decrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _CAST_cbc_encrypt
+
+_CAST_cbc_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        mov     ebp,            DWORD PTR 28[esp]
+        ; getting iv ptr from parameter 4
+        mov     ebx,            DWORD PTR 36[esp]
+        mov     esi,            DWORD PTR [ebx]
+        mov     edi,            DWORD PTR 4[ebx]
+        push    edi
+        push    esi
+        push    edi
+        push    esi
+        mov     ebx,            esp
+        mov     esi,            DWORD PTR 36[esp]
+        mov     edi,            DWORD PTR 40[esp]
+        ; getting encrypt flag from parameter 5
+        mov     ecx,            DWORD PTR 56[esp]
+        ; get and push parameter 3
+        mov     eax,            DWORD PTR 48[esp]
+        push    eax
+        push    ebx
+        cmp     ecx,            0
+        jz      $L000decrypt
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        jz      $L001encrypt_finish
+L002encrypt_loop:
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR 4[esi]
+        xor     eax,            ecx
+        xor     ebx,            edx
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _CAST_encrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L002encrypt_loop
+$L001encrypt_finish:
+        mov     ebp,            DWORD PTR 52[esp]
+        and     ebp,            7
+        jz      $L003finish
+        xor     ecx,            ecx
+        xor     edx,            edx
+        mov     ebp,            DWORD PTR $L004cbc_enc_jmp_table[ebp*4]
+        jmp      ebp
+L005ej7:
+        xor     edx,            edx
+        mov     dh,             BYTE PTR 6[esi]
+        shl     edx,            8
+L006ej6:
+        mov     dh,             BYTE PTR 5[esi]
+L007ej5:
+        mov     dl,             BYTE PTR 4[esi]
+L008ej4:
+        mov     ecx,            DWORD PTR [esi]
+        jmp     $L009ejend
+L010ej3:
+        mov     ch,             BYTE PTR 2[esi]
+        xor     ecx,            ecx
+        shl     ecx,            8
+L011ej2:
+        mov     ch,             BYTE PTR 1[esi]
+L012ej1:
+        mov     cl,             BYTE PTR [esi]
+$L009ejend:
+        xor     eax,            ecx
+        xor     ebx,            edx
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _CAST_encrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        jmp     $L003finish
+$L000decrypt:
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        jz      $L013decrypt_finish
+L014decrypt_loop:
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _CAST_decrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     ecx,            DWORD PTR 16[esp]
+        mov     edx,            DWORD PTR 20[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR [edi],ecx
+        mov     DWORD PTR 4[edi],edx
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L014decrypt_loop
+$L013decrypt_finish:
+        mov     ebp,            DWORD PTR 52[esp]
+        and     ebp,            7
+        jz      $L003finish
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        bswap   eax
+        bswap   ebx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _CAST_decrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        bswap   eax
+        bswap   ebx
+        mov     ecx,            DWORD PTR 16[esp]
+        mov     edx,            DWORD PTR 20[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+L015dj7:
+        ror     edx,            16
+        mov     BYTE PTR 6[edi],dl
+        shr     edx,            16
+L016dj6:
+        mov     BYTE PTR 5[edi],dh
+L017dj5:
+        mov     BYTE PTR 4[edi],dl
+L018dj4:
+        mov     DWORD PTR [edi],ecx
+        jmp     $L019djend
+L020dj3:
+        ror     ecx,            16
+        mov     BYTE PTR 2[edi],cl
+        shl     ecx,            16
+L021dj2:
+        mov     BYTE PTR 1[esi],ch
+L022dj1:
+        mov     BYTE PTR [esi], cl
+$L019djend:
+        jmp     $L003finish
+$L003finish:
+        mov     ecx,            DWORD PTR 60[esp]
+        add     esp,            24
+        mov     DWORD PTR [ecx],eax
+        mov     DWORD PTR 4[ecx],ebx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+$L004cbc_enc_jmp_table:
+        DD      0
+        DD      L012ej1
+        DD      L011ej2
+        DD      L010ej3
+        DD      L008ej4
+        DD      L007ej5
+        DD      L006ej6
+        DD      L005ej7
+L023cbc_dec_jmp_table:
+        DD      0
+        DD      L022dj1
+        DD      L021dj2
+        DD      L020dj3
+        DD      L018dj4
+        DD      L017dj5
+        DD      L016dj6
+        DD      L015dj7
+_CAST_cbc_encrypt ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/cast/asm/cx86unix.cpp b/src/lib/libcrypto/cast/asm/cx86unix.cpp
new file mode 100644
index 0000000000..035692a5af
--- /dev/null
+++ b/src/lib/libcrypto/cast/asm/cx86unix.cpp
@@ -0,0 +1,1010 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define CAST_S_table0 _CAST_S_table0
+#define CAST_S_table1 _CAST_S_table1
+#define CAST_S_table2 _CAST_S_table2
+#define CAST_S_table3 _CAST_S_table3
+#define CAST_encrypt _CAST_encrypt
+#define CAST_S_table0 _CAST_S_table0
+#define CAST_S_table1 _CAST_S_table1
+#define CAST_S_table2 _CAST_S_table2
+#define CAST_S_table3 _CAST_S_table3
+#define CAST_decrypt _CAST_decrypt
+#define CAST_cbc_encrypt _CAST_cbc_encrypt
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by cast-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "cast-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl CAST_encrypt
+        TYPE(CAST_encrypt,@function)
+CAST_encrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        movl    12(%esp),       %ebx
+        movl    16(%esp),       %ebp
+        pushl   %esi
+        pushl   %edi
+        /* Load the 2 words */
+        movl    (%ebx),         %edi
+        movl    4(%ebx),        %esi
+        xorl    %eax,           %eax
+        /* round 0 */
+        movl    (%ebp),         %edx
+        movl    4(%ebp),        %ecx
+        addl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 1 */
+        movl    8(%ebp),        %edx
+        movl    12(%ebp),       %ecx
+        xorl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 2 */
+        movl    16(%ebp),       %edx
+        movl    20(%ebp),       %ecx
+        subl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 3 */
+        movl    24(%ebp),       %edx
+        movl    28(%ebp),       %ecx
+        addl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 4 */
+        movl    32(%ebp),       %edx
+        movl    36(%ebp),       %ecx
+        xorl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 5 */
+        movl    40(%ebp),       %edx
+        movl    44(%ebp),       %ecx
+        subl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 6 */
+        movl    48(%ebp),       %edx
+        movl    52(%ebp),       %ecx
+        addl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 7 */
+        movl    56(%ebp),       %edx
+        movl    60(%ebp),       %ecx
+        xorl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 8 */
+        movl    64(%ebp),       %edx
+        movl    68(%ebp),       %ecx
+        subl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 9 */
+        movl    72(%ebp),       %edx
+        movl    76(%ebp),       %ecx
+        addl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 10 */
+        movl    80(%ebp),       %edx
+        movl    84(%ebp),       %ecx
+        xorl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 11 */
+        movl    88(%ebp),       %edx
+        movl    92(%ebp),       %ecx
+        subl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 12 */
+        movl    96(%ebp),       %edx
+        movl    100(%ebp),      %ecx
+        addl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 13 */
+        movl    104(%ebp),      %edx
+        movl    108(%ebp),      %ecx
+        xorl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 14 */
+        movl    112(%ebp),      %edx
+        movl    116(%ebp),      %ecx
+        subl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 15 */
+        movl    120(%ebp),      %edx
+        movl    124(%ebp),      %ecx
+        addl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    20(%esp),       %eax
+        xorl    %ecx,           %esi
+        nop
+        movl    %edi,           4(%eax)
+        movl    %esi,           (%eax)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.CAST_encrypt_end:
+        SIZE(CAST_encrypt,.CAST_encrypt_end-CAST_encrypt)
+.ident  "CAST_encrypt"
+.text
+        .align ALIGN
+.globl CAST_decrypt
+        TYPE(CAST_decrypt,@function)
+CAST_decrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        movl    12(%esp),       %ebx
+        movl    16(%esp),       %ebp
+        pushl   %esi
+        pushl   %edi
+        /* Load the 2 words */
+        movl    (%ebx),         %edi
+        movl    4(%ebx),        %esi
+        xorl    %eax,           %eax
+        /* round 15 */
+        movl    120(%ebp),      %edx
+        movl    124(%ebp),      %ecx
+        addl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 14 */
+        movl    112(%ebp),      %edx
+        movl    116(%ebp),      %ecx
+        subl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 13 */
+        movl    104(%ebp),      %edx
+        movl    108(%ebp),      %ecx
+        xorl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 12 */
+        movl    96(%ebp),       %edx
+        movl    100(%ebp),      %ecx
+        addl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 11 */
+        movl    88(%ebp),       %edx
+        movl    92(%ebp),       %ecx
+        subl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 10 */
+        movl    80(%ebp),       %edx
+        movl    84(%ebp),       %ecx
+        xorl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 9 */
+        movl    72(%ebp),       %edx
+        movl    76(%ebp),       %ecx
+        addl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 8 */
+        movl    64(%ebp),       %edx
+        movl    68(%ebp),       %ecx
+        subl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 7 */
+        movl    56(%ebp),       %edx
+        movl    60(%ebp),       %ecx
+        xorl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 6 */
+        movl    48(%ebp),       %edx
+        movl    52(%ebp),       %ecx
+        addl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 5 */
+        movl    40(%ebp),       %edx
+        movl    44(%ebp),       %ecx
+        subl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 4 */
+        movl    32(%ebp),       %edx
+        movl    36(%ebp),       %ecx
+        xorl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 3 */
+        movl    24(%ebp),       %edx
+        movl    28(%ebp),       %ecx
+        addl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 2 */
+        movl    16(%ebp),       %edx
+        movl    20(%ebp),       %ecx
+        subl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        subl    %ebx,           %ecx
+        xorl    %ecx,           %esi
+        /* round 1 */
+        movl    8(%ebp),        %edx
+        movl    12(%ebp),       %ecx
+        xorl    %esi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        addl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        xorl    %ebx,           %ecx
+        xorl    %ecx,           %edi
+        /* round 0 */
+        movl    (%ebp),         %edx
+        movl    4(%ebp),        %ecx
+        addl    %edi,           %edx
+        roll    %cl,            %edx
+        movl    %edx,           %ebx
+        xorl    %ecx,           %ecx
+        movb    %dh,            %cl
+        andl    $255,           %ebx
+        shrl    $16,            %edx
+        xorl    %eax,           %eax
+        movb    %dh,            %al
+        andl    $255,           %edx
+        movl    CAST_S_table0(,%ecx,4),%ecx
+        movl    CAST_S_table1(,%ebx,4),%ebx
+        xorl    %ebx,           %ecx
+        movl    CAST_S_table2(,%eax,4),%ebx
+        subl    %ebx,           %ecx
+        movl    CAST_S_table3(,%edx,4),%ebx
+        addl    %ebx,           %ecx
+        movl    20(%esp),       %eax
+        xorl    %ecx,           %esi
+        nop
+        movl    %edi,           4(%eax)
+        movl    %esi,           (%eax)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.CAST_decrypt_end:
+        SIZE(CAST_decrypt,.CAST_decrypt_end-CAST_decrypt)
+.ident  "CAST_decrypt"
+.text
+        .align ALIGN
+.globl CAST_cbc_encrypt
+        TYPE(CAST_cbc_encrypt,@function)
+CAST_cbc_encrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+        movl    28(%esp),       %ebp
+        /* getting iv ptr from parameter 4 */
+        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
+        /* getting encrypt flag from parameter 5 */
+        movl    56(%esp),       %ecx
+        /* get and push parameter 3 */
+        movl    48(%esp),       %eax
+        pushl   %eax
+        pushl   %ebx
+        cmpl    $0,             %ecx
+        jz      .L000decrypt
+        andl    $4294967288,    %ebp
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        jz      .L001encrypt_finish
+.L002encrypt_loop:
+        movl    (%esi),         %ecx
+        movl    4(%esi),        %edx
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    CAST_encrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        addl    $8,             %esi
+        addl    $8,             %edi
+        subl    $8,             %ebp
+        jnz     .L002encrypt_loop
+.L001encrypt_finish:
+        movl    52(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L003finish
+        xorl    %ecx,           %ecx
+        xorl    %edx,           %edx
+        movl    .L004cbc_enc_jmp_table(,%ebp,4),%ebp
+        jmp     *%ebp
+.L005ej7:
+        xorl    %edx,           %edx
+        movb    6(%esi),        %dh
+        sall    $8,             %edx
+.L006ej6:
+        movb    5(%esi),        %dh
+.L007ej5:
+        movb    4(%esi),        %dl
+.L008ej4:
+        movl    (%esi),         %ecx
+        jmp     .L009ejend
+.L010ej3:
+        movb    2(%esi),        %ch
+        xorl    %ecx,           %ecx
+        sall    $8,             %ecx
+.L011ej2:
+        movb    1(%esi),        %ch
+.L012ej1:
+        movb    (%esi),         %cl
+.L009ejend:
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    CAST_encrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        jmp     .L003finish
+.align ALIGN
+.L000decrypt:
+        andl    $4294967288,    %ebp
+        movl    16(%esp),       %eax
+        movl    20(%esp),       %ebx
+        jz      .L013decrypt_finish
+.L014decrypt_loop:
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    CAST_decrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    16(%esp),       %ecx
+        movl    20(%esp),       %edx
+        xorl    %eax,           %ecx
+        xorl    %ebx,           %edx
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %ecx,           (%edi)
+        movl    %edx,           4(%edi)
+        movl    %eax,           16(%esp)
+        movl    %ebx,           20(%esp)
+        addl    $8,             %esi
+        addl    $8,             %edi
+        subl    $8,             %ebp
+        jnz     .L014decrypt_loop
+.L013decrypt_finish:
+        movl    52(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L003finish
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    CAST_decrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+.byte 15
+.byte 200               /* bswapl  %eax */
+.byte 15
+.byte 203               /* bswapl  %ebx */
+        movl    16(%esp),       %ecx
+        movl    20(%esp),       %edx
+        xorl    %eax,           %ecx
+        xorl    %ebx,           %edx
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.L015dj7:
+        rorl    $16,            %edx
+        movb    %dl,            6(%edi)
+        shrl    $16,            %edx
+.L016dj6:
+        movb    %dh,            5(%edi)
+.L017dj5:
+        movb    %dl,            4(%edi)
+.L018dj4:
+        movl    %ecx,           (%edi)
+        jmp     .L019djend
+.L020dj3:
+        rorl    $16,            %ecx
+        movb    %cl,            2(%edi)
+        sall    $16,            %ecx
+.L021dj2:
+        movb    %ch,            1(%esi)
+.L022dj1:
+        movb    %cl,            (%esi)
+.L019djend:
+        jmp     .L003finish
+.align ALIGN
+.L003finish:
+        movl    60(%esp),       %ecx
+        addl    $24,            %esp
+        movl    %eax,           (%ecx)
+        movl    %ebx,           4(%ecx)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.align ALIGN
+.L004cbc_enc_jmp_table:
+        .long 0
+        .long .L012ej1
+        .long .L011ej2
+        .long .L010ej3
+        .long .L008ej4
+        .long .L007ej5
+        .long .L006ej6
+        .long .L005ej7
+.align ALIGN
+.L023cbc_dec_jmp_table:
+        .long 0
+        .long .L022dj1
+        .long .L021dj2
+        .long .L020dj3
+        .long .L018dj4
+        .long .L017dj5
+        .long .L016dj6
+        .long .L015dj7
+.CAST_cbc_encrypt_end:
+        SIZE(CAST_cbc_encrypt,.CAST_cbc_encrypt_end-CAST_cbc_encrypt)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/conf/Makefile.ssl b/src/lib/libcrypto/conf/Makefile.ssl
new file mode 100644
index 0000000000..00e917aa44
--- /dev/null
+++ b/src/lib/libcrypto/conf/Makefile.ssl
@@ -0,0 +1,85 @@
+#
+# SSLeay/crypto/conf/Makefile
+#
+
+DIR=    conf
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=conf
+ERRC=conf_err
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= conf.c $(ERRC).c
+
+LIBOBJ= conf.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= conf.h
+HEADER= conf_lcl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/conf/conf.c b/src/lib/libcrypto/conf/conf.c
new file mode 100644
index 0000000000..9e84300c5e
--- /dev/null
+++ b/src/lib/libcrypto/conf/conf.c
@@ -0,0 +1,727 @@
+/* crypto/conf/conf.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 <errno.h>
+#include "cryptlib.h"
+#include "stack.h"
+#include "lhash.h"
+#include "conf.h"
+#include "buffer.h"
+#include "err.h"
+
+#include "conf_lcl.h"
+
+#ifndef NOPROTO
+static void value_free_hash(CONF_VALUE *a, LHASH *conf);
+static void value_free_stack(CONF_VALUE *a,LHASH *conf);
+static unsigned long hash(CONF_VALUE *v);
+static int cmp(CONF_VALUE *a,CONF_VALUE *b);
+static char *eat_ws(char *p);
+static char *eat_alpha_numeric(char *p);
+static void clear_comments(char *p);
+static int str_copy(LHASH *conf,char *section,char **to, char *from);
+static char *scan_quote(char *p);
+static CONF_VALUE *new_section(LHASH *conf,char *section);
+static CONF_VALUE *get_section(LHASH *conf,char *section);
+#else
+static void value_free_hash();
+static void value_free_stack();
+static unsigned long hash();
+static int cmp();
+static char *eat_ws();
+static char *eat_alpha_numeric();
+static void clear_comments();
+static int str_copy();
+static char *scan_quote();
+static CONF_VALUE *new_section();
+static CONF_VALUE *get_section();
+#endif
+
+#define scan_esc(p)     ((*(++p) == '\0')?(p):(++p))
+
+char *CONF_version="CONF part of SSLeay 0.9.0b 29-Jun-1998";
+
+LHASH *CONF_load(h,file,line)
+LHASH *h;
+char *file;
+long *line;
+        {
+        LHASH *ret=NULL;
+        FILE *in=NULL;
+#define BUFSIZE 512
+        int bufnum=0,i,ii;
+        BUF_MEM *buff=NULL;
+        char *s,*p,*end;
+        int again,n,eline=0;
+        CONF_VALUE *v=NULL,*vv,*tv;
+        CONF_VALUE *sv=NULL;
+        char *section=NULL,*buf;
+        STACK *section_sk=NULL,*ts;
+        char *start,*psection,*pname;
+
+        if ((buff=BUF_MEM_new()) == NULL)
+                {
+                CONFerr(CONF_F_CONF_LOAD,ERR_R_BUF_LIB);
+                goto err;
+                }
+
+        in=fopen(file,"rb");
+        if (in == NULL)
+                {
+                SYSerr(SYS_F_FOPEN,get_last_sys_error());
+                ERR_set_error_data(BUF_strdup(file),
+                        ERR_TXT_MALLOCED|ERR_TXT_STRING);
+                CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);
+                goto err;
+                }
+
+        section=(char *)Malloc(10);
+        if (section == NULL)
+                {
+                CONFerr(CONF_F_CONF_LOAD,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        strcpy(section,"default");
+
+        if (h == NULL)
+                {
+                if ((ret=lh_new(hash,cmp)) == NULL)
+                        {
+                        CONFerr(CONF_F_CONF_LOAD,ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                }
+        else
+                ret=h;
+
+        sv=new_section(ret,section);
+        if (sv == NULL)
+                {
+                CONFerr(CONF_F_CONF_LOAD,CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
+                goto err;
+                }
+        section_sk=(STACK *)sv->value;
+
+        bufnum=0;
+        for (;;)
+                {
+                again=0;
+                if (!BUF_MEM_grow(buff,bufnum+BUFSIZE))
+                        {
+                        CONFerr(CONF_F_CONF_LOAD,ERR_R_BUF_LIB);
+                        goto err;
+                        }
+                p= &(buff->data[bufnum]);
+                *p='\0';
+                fgets(p,BUFSIZE-1,in);
+                p[BUFSIZE-1]='\0';
+                ii=i=strlen(p);
+                if (i == 0) break;
+                while (i > 0)
+                        {
+                        if ((p[i-1] != '\r') && (p[i-1] != '\n'))
+                                break;
+                        else
+                                i--;
+                        }
+                /* we removed some trailing stuff so there is a new
+                 * line on the end. */
+                if (i == ii)
+                        again=1; /* long line */
+                else
+                        {
+                        p[i]='\0';
+                        eline++; /* another input line */
+                        }
+
+                /* we now have a line with trailing \r\n removed */
+
+                /* i is the number of bytes */
+                bufnum+=i;
+
+                v=NULL;
+                /* check for line continuation */
+                if (bufnum >= 1)
+                        {
+                        /* If we have bytes and the last char '\\' and
+                         * second last char is not '\\' */
+                        p= &(buff->data[bufnum-1]);
+                        if (    IS_ESC(p[0]) &&
+                                ((bufnum <= 1) || !IS_ESC(p[-1])))
+                                {
+                                bufnum--;
+                                again=1;
+                                }
+                        }
+                if (again) continue;
+                bufnum=0;
+                buf=buff->data;
+
+                clear_comments(buf);
+                n=strlen(buf);
+                s=eat_ws(buf);
+                if (IS_EOF(*s)) continue; /* blank line */
+                if (*s == '[')
+                        {
+                        s++;
+                        start=eat_ws(s);
+                        end=eat_alpha_numeric(start);
+                        p=eat_ws(end);
+                        if (*p != ']')
+                                {
+                                CONFerr(CONF_F_CONF_LOAD,CONF_R_MISSING_CLOSE_SQUARE_BRACKET);
+                                goto err;
+                                }
+                        *end='\0';
+                        if (!str_copy(ret,NULL,&section,start)) goto err;
+                        if ((sv=get_section(ret,section)) == NULL)
+                                sv=new_section(ret,section);
+                        if (sv == NULL)
+                                {
+                                CONFerr(CONF_F_CONF_LOAD,CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
+                                goto err;
+                                }
+                        section_sk=(STACK *)sv->value;
+                        continue;
+                        }
+                else
+                        {
+                        pname=s;
+                        psection=NULL;
+                        end=eat_alpha_numeric(s);
+                        if ((end[0] == ':') && (end[1] == ':'))
+                                {
+                                *end='\0';
+                                end+=2;
+                                psection=pname;
+                                pname=end;
+                                end=eat_alpha_numeric(end);
+                                }
+                        p=eat_ws(end);
+                        if (*p != '=')
+                                {
+                                CONFerr(CONF_F_CONF_LOAD,CONF_R_MISSING_EQUAL_SIGN);
+                                goto err;
+                                }
+                        *end='\0';
+                        p++;
+                        start=eat_ws(p);
+                        while (!IS_EOF(*p))
+                                p++;
+                        p--;
+                        while ((p != start) && (IS_WS(*p)))
+                                p--;
+                        p++;
+                        *p='\0';
+
+                        if ((v=(CONF_VALUE *)Malloc(sizeof(CONF_VALUE))) == NULL)
+                                {
+                                CONFerr(CONF_F_CONF_LOAD,ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        if (psection == NULL) psection=section;
+                        v->name=(char *)Malloc(strlen(pname)+1);
+                        v->value=NULL;
+                        if (v->name == NULL)
+                                {
+                                CONFerr(CONF_F_CONF_LOAD,ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        strcpy(v->name,pname);
+                        if (!str_copy(ret,psection,&(v->value),start)) goto err;
+
+                        if (strcmp(psection,section) != 0)
+                                {
+                                if ((tv=get_section(ret,psection))
+                                        == NULL)
+                                        tv=new_section(ret,psection);
+                                if (tv == NULL)
+                                        {
+                                        CONFerr(CONF_F_CONF_LOAD,CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
+                                        goto err;
+                                        }
+                                ts=(STACK *)tv->value;
+                                }
+                        else
+                                {
+                                tv=sv;
+                                ts=section_sk;
+                                }
+                        v->section=tv->section; 
+                        if (!sk_push(ts,(char *)v))
+                                {
+                                CONFerr(CONF_F_CONF_LOAD,ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        vv=(CONF_VALUE *)lh_insert(ret,(char *)v);
+                        if (vv != NULL)
+                                {
+                                sk_delete_ptr(ts,(char *)vv);
+                                Free(vv->name);
+                                Free(vv->value);
+                                Free(vv);
+                                }
+                        v=NULL;
+                        }
+                }
+        if (buff != NULL) BUF_MEM_free(buff);
+        if (section != NULL) Free(section);
+        if (in != NULL) fclose(in);
+        return(ret);
+err:
+        if (buff != NULL) BUF_MEM_free(buff);
+        if (section != NULL) Free(section);
+        if (line != NULL) *line=eline;
+        if (in != NULL) fclose(in);
+        if ((h != ret) && (ret != NULL)) CONF_free(ret);
+        if (v != NULL)
+                {
+                if (v->name != NULL) Free(v->name);
+                if (v->value != NULL) Free(v->value);
+                if (v != NULL) Free(v);
+                }
+        return(NULL);
+        }
+                
+char *CONF_get_string(conf,section,name)
+LHASH *conf;
+char *section;
+char *name;
+        {
+        CONF_VALUE *v,vv;
+        char *p;
+
+        if (name == NULL) return(NULL);
+        if (conf != NULL)
+                {
+                if (section != NULL)
+                        {
+                        vv.name=name;
+                        vv.section=section;
+                        v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv);
+                        if (v != NULL) return(v->value);
+                        if (strcmp(section,"ENV") == 0)
+                                {
+                                p=Getenv(name);
+                                if (p != NULL) return(p);
+                                }
+                        }
+                vv.section="default";
+                vv.name=name;
+                v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv);
+                if (v != NULL)
+                        return(v->value);
+                else
+                        return(NULL);
+                }
+        else
+                return(Getenv(name));
+        }
+
+static CONF_VALUE *get_section(conf,section)
+LHASH *conf;
+char *section;
+        {
+        CONF_VALUE *v,vv;
+
+        if ((conf == NULL) || (section == NULL)) return(NULL);
+        vv.name=NULL;
+        vv.section=section;
+        v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv);
+        return(v);
+        }
+
+STACK *CONF_get_section(conf,section)
+LHASH *conf;
+char *section;
+        {
+        CONF_VALUE *v;
+
+        v=get_section(conf,section);
+        if (v != NULL)
+                return((STACK *)v->value);
+        else
+                return(NULL);
+        }
+
+long CONF_get_number(conf,section,name)
+LHASH *conf;
+char *section;
+char *name;
+        {
+        char *str;
+        long ret=0;
+
+        str=CONF_get_string(conf,section,name);
+        if (str == NULL) return(0);
+        for (;;)
+                {
+                if (IS_NUMER(*str))
+                        ret=ret*10+(*str -'0');
+                else
+                        return(ret);
+                str++;
+                }
+        }
+
+void CONF_free(conf)
+LHASH *conf;
+        {
+        if (conf == NULL) return;
+
+        conf->down_load=0;      /* evil thing to make sure the 'Free()'
+                                 * works as expected */
+        lh_doall_arg(conf,(void (*)())value_free_hash,(char *)conf);
+
+        /* We now have only 'section' entries in the hash table.
+         * Due to problems with */
+
+        lh_doall_arg(conf,(void (*)())value_free_stack,(char *)conf);
+        lh_free(conf);
+        }
+
+static void value_free_hash(a,conf)
+CONF_VALUE *a;
+LHASH *conf;
+        {
+        if (a->name != NULL)
+                {
+                a=(CONF_VALUE *)lh_delete(conf,(char *)a);
+                }
+        }
+
+static void value_free_stack(a,conf)
+CONF_VALUE *a;
+LHASH *conf;
+        {
+        CONF_VALUE *vv;
+        STACK *sk;
+        int i;
+
+        if (a->name != NULL) return;
+
+        sk=(STACK *)a->value;
+        for (i=sk_num(sk)-1; i>=0; i--)
+                {
+                vv=(CONF_VALUE *)sk_value(sk,i);
+                Free(vv->value);
+                Free(vv->name);
+                Free(vv);
+                }
+        if (sk != NULL) sk_free(sk);
+        Free(a->section);
+        Free(a);
+        }
+
+static void clear_comments(p)
+char *p;
+        {
+        char *to;
+
+        to=p;
+        for (;;)
+                {
+                if (IS_COMMENT(*p))
+                        {
+                        *p='\0';
+                        return;
+                        }
+                if (IS_QUOTE(*p))
+                        {
+                        p=scan_quote(p);
+                        continue;
+                        }
+                if (IS_ESC(*p))
+                        {
+                        p=scan_esc(p);
+                        continue;
+                        }
+                if (IS_EOF(*p))
+                        return;
+                else
+                        p++;
+                }
+        }
+
+static int str_copy(conf,section,pto,from)
+LHASH *conf;
+char *section;
+char **pto,*from;
+        {
+        int q,r,rr=0,to=0,len=0;
+        char *s,*e,*rp,*p,*rrp,*np,*cp,v;
+        BUF_MEM *buf;
+
+        if ((buf=BUF_MEM_new()) == NULL) return(0);
+
+        len=strlen(from)+1;
+        if (!BUF_MEM_grow(buf,len)) goto err;
+
+        for (;;)
+                {
+                if (IS_QUOTE(*from))
+                        {
+                        q= *from;
+                        from++;
+                        while ((*from != '\0') && (*from != q))
+                                {
+                                if (*from == '\\')
+                                        {
+                                        from++;
+                                        if (*from == '\0') break;
+                                        }
+                                buf->data[to++]= *(from++);
+                                }
+                        }
+                else if (*from == '\\')
+                        {
+                        from++;
+                        v= *(from++);
+                        if (v == '\0') break;
+                        else if (v == 'r') v='\r';
+                        else if (v == 'n') v='\n';
+                        else if (v == 'b') v='\b';
+                        else if (v == 't') v='\t';
+                        buf->data[to++]= v;
+                        }
+                else if (*from == '\0')
+                        break;
+                else if (*from == '$')
+                        {
+                        /* try to expand it */
+                        rrp=NULL;
+                        s= &(from[1]);
+                        if (*s == '{')
+                                q='}';
+                        else if (*s == '(')
+                                q=')';
+                        else q=0;
+
+                        if (q) s++;
+                        cp=section;
+                        e=np=s;
+                        while (IS_ALPHA_NUMERIC(*e))
+                                e++;
+                        if ((e[0] == ':') && (e[1] == ':'))
+                                {
+                                cp=np;
+                                rrp=e;
+                                rr= *e;
+                                *rrp='\0';
+                                e+=2;
+                                np=e;
+                                while (IS_ALPHA_NUMERIC(*e))
+                                        e++;
+                                }
+                        r= *e;
+                        *e='\0';
+                        rp=e;
+                        if (q)
+                                {
+                                if (r != q)
+                                        {
+                                        CONFerr(CONF_F_STR_COPY,CONF_R_NO_CLOSE_BRACE);
+                                        goto err;
+                                        }
+                                e++;
+                                }
+                        /* So at this point we have
+                         * ns which is the start of the name string which is
+                         *   '\0' terminated. 
+                         * cs which is the start of the section string which is
+                         *   '\0' terminated.
+                         * e is the 'next point after'.
+                         * r and s are the chars replaced by the '\0'
+                         * rp and sp is where 'r' and 's' came from.
+                         */
+                        p=CONF_get_string(conf,cp,np);
+                        if (rrp != NULL) *rrp=rr;
+                        *rp=r;
+                        if (p == NULL)
+                                {
+                                CONFerr(CONF_F_STR_COPY,CONF_R_VARIABLE_HAS_NO_VALUE);
+                                goto err;
+                                }
+                        BUF_MEM_grow(buf,(strlen(p)+len-(e-from)));
+                        while (*p)
+                                buf->data[to++]= *(p++);
+                        from=e;
+                        }
+                else
+                        buf->data[to++]= *(from++);
+                }
+        buf->data[to]='\0';
+        if (*pto != NULL) Free(*pto);
+        *pto=buf->data;
+        Free(buf);
+        return(1);
+err:
+        if (buf != NULL) BUF_MEM_free(buf);
+        return(0);
+        }
+
+static char *eat_ws(p)
+char *p;
+        {
+        while (IS_WS(*p) && (!IS_EOF(*p)))
+                p++;
+        return(p);
+        }
+
+static char *eat_alpha_numeric(p)
+char *p;
+        {
+        for (;;)
+                {
+                if (IS_ESC(*p))
+                        {
+                        p=scan_esc(p);
+                        continue;
+                        }
+                if (!IS_ALPHA_NUMERIC_PUNCT(*p))
+                        return(p);
+                p++;
+                }
+        }
+
+static unsigned long hash(v)
+CONF_VALUE *v;
+        {
+        return((lh_strhash(v->section)<<2)^lh_strhash(v->name));
+        }
+
+static int cmp(a,b)
+CONF_VALUE *a,*b;
+        {
+        int i;
+
+        if (a->section != b->section)
+                {
+                i=strcmp(a->section,b->section);
+                if (i) return(i);
+                }
+
+        if ((a->name != NULL) && (b->name != NULL))
+                {
+                i=strcmp(a->name,b->name);
+                return(i);
+                }
+        else if (a->name == b->name)
+                return(0);
+        else
+                return((a->name == NULL)?-1:1);
+        }
+
+static char *scan_quote(p)
+char *p;
+        {
+        int q= *p;
+
+        p++;
+        while (!(IS_EOF(*p)) && (*p != q))
+                {
+                if (IS_ESC(*p))
+                        {
+                        p++;
+                        if (IS_EOF(*p)) return(p);
+                        }
+                p++;
+                }
+        if (*p == q) p++;
+        return(p);
+        }
+
+static CONF_VALUE *new_section(conf,section)
+LHASH *conf;
+char *section;
+        {
+        STACK *sk=NULL;
+        int ok=0,i;
+        CONF_VALUE *v=NULL,*vv;
+
+        if ((sk=sk_new_null()) == NULL)
+                goto err;
+        if ((v=(CONF_VALUE *)Malloc(sizeof(CONF_VALUE))) == NULL)
+                goto err;
+        i=strlen(section)+1;
+        if ((v->section=(char *)Malloc(i)) == NULL)
+                goto err;
+
+        memcpy(v->section,section,i);
+        v->name=NULL;
+        v->value=(char *)sk;
+        
+        vv=(CONF_VALUE *)lh_insert(conf,(char *)v);
+        if (vv != NULL)
+                {
+#if !defined(NO_STDIO) && !defined(WIN16)
+                fprintf(stderr,"internal fault\n");
+#endif
+                abort();
+                }
+        ok=1;
+err:
+        if (!ok)
+                {
+                if (sk != NULL) sk_free(sk);
+                if (v != NULL) Free(v);
+                v=NULL;
+                }
+        return(v);
+        }
diff --git a/src/lib/libcrypto/conf/conf.err b/src/lib/libcrypto/conf/conf.err
new file mode 100644
index 0000000000..933d3d692a
--- /dev/null
+++ b/src/lib/libcrypto/conf/conf.err
@@ -0,0 +1,12 @@
+/* Error codes for the CONF functions. */
+
+/* Function codes. */
+#define CONF_F_CONF_LOAD                                 100
+#define CONF_F_STR_COPY                                  101
+
+/* Reason codes. */
+#define CONF_R_MISSING_CLOSE_SQUARE_BRACKET              100
+#define CONF_R_MISSING_EQUAL_SIGN                        101
+#define CONF_R_NO_CLOSE_BRACE                            102
+#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION              103
+#define CONF_R_VARIABLE_HAS_NO_VALUE                     104
diff --git a/src/lib/libcrypto/conf/conf_lcl.h b/src/lib/libcrypto/conf/conf_lcl.h
new file mode 100644
index 0000000000..4e5644ed79
--- /dev/null
+++ b/src/lib/libcrypto/conf/conf_lcl.h
@@ -0,0 +1,102 @@
+/* crypto/conf/conf_lcl.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.]
+ */
+
+#define CONF_NUMBER             1
+#define CONF_UPPER              2
+#define CONF_LOWER              4
+#define CONF_UNDER              256
+#define CONF_PUNCTUATION        512
+#define CONF_WS                 16
+#define CONF_ESC                32
+#define CONF_QUOTE              64
+#define CONF_COMMENT            128
+#define CONF_EOF                8
+#define CONF_ALPHA              (CONF_UPPER|CONF_LOWER)
+#define CONF_ALPHA_NUMERIC      (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
+#define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \
+                                        CONF_PUNCTUATION)
+
+#define IS_COMMENT(a)           (CONF_COMMENT&(CONF_type[(a)&0x7f]))
+#define IS_EOF(a)               ((a) == '\0')
+#define IS_ESC(a)               ((a) == '\\')
+#define IS_NUMER(a)             (CONF_type[(a)&0x7f]&CONF_NUMBER)
+#define IS_WS(a)                (CONF_type[(a)&0x7f]&CONF_WS)
+#define IS_ALPHA_NUMERIC(a)     (CONF_type[(a)&0x7f]&CONF_ALPHA_NUMERIC)
+#define IS_ALPHA_NUMERIC_PUNCT(a) \
+                                (CONF_type[(a)&0x7f]&CONF_ALPHA_NUMERIC_PUNCT)
+#define IS_QUOTE(a)             (CONF_type[(a)&0x7f]&CONF_QUOTE)
+
+static unsigned short CONF_type[128]={
+        0x008,0x000,0x000,0x000,0x000,0x000,0x000,0x000,
+        0x000,0x010,0x010,0x000,0x000,0x010,0x000,0x000,
+        0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,
+        0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,
+        0x010,0x200,0x040,0x080,0x000,0x200,0x200,0x040,
+        0x000,0x000,0x200,0x200,0x200,0x200,0x200,0x200,
+        0x001,0x001,0x001,0x001,0x001,0x001,0x001,0x001,
+        0x001,0x001,0x000,0x200,0x000,0x000,0x000,0x200,
+        0x200,0x002,0x002,0x002,0x002,0x002,0x002,0x002,
+        0x002,0x002,0x002,0x002,0x002,0x002,0x002,0x002,
+        0x002,0x002,0x002,0x002,0x002,0x002,0x002,0x002,
+        0x002,0x002,0x002,0x000,0x020,0x000,0x200,0x100,
+        0x040,0x004,0x004,0x004,0x004,0x004,0x004,0x004,
+        0x004,0x004,0x004,0x004,0x004,0x004,0x004,0x004,
+        0x004,0x004,0x004,0x004,0x004,0x004,0x004,0x004,
+        0x004,0x004,0x004,0x000,0x200,0x000,0x200,0x000,
+        };
+
diff --git a/src/lib/libcrypto/cryptall.h b/src/lib/libcrypto/cryptall.h
new file mode 100644
index 0000000000..65a46452a8
--- /dev/null
+++ b/src/lib/libcrypto/cryptall.h
@@ -0,0 +1,110 @@
+/* crypto/cryptall.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_CRYPTOALL_H
+#define HEADER_CRYPTOALL_H
+
+#include "buffer.h"
+#include "stack.h"
+#include "lhash.h"
+
+#include "err.h"
+
+#ifdef NO_MD2
+#include <md2.h>
+#else
+#include "md2.h"
+#endif
+#ifdef NO_MD5
+#include <md5.h>
+#else
+#include "md5.h"
+#endif
+#include "sha.h"
+
+#ifdef NO_DES
+#include <des.h>
+#else
+#include "des.h"
+#endif
+#include "rc2.h"
+#include "rc4.h"
+#include "idea.h"
+
+#include "bn.h"
+#include "dh.h"
+#include "rsa.h"
+#include "dsa.h"
+
+#include "rand.h"
+#include "conf.h"
+#include "txt_db.h"
+
+#include "err.h"
+#include "evp.h"
+
+#include "meth.h"
+#include "x509.h"
+#include "pkcs7.h"
+#include "pem.h"
+#include "asn1.h"
+#include "objects.h"
+
+#include "crypto.h"
+
+#endif
diff --git a/src/lib/libcrypto/crypto.c b/src/lib/libcrypto/crypto.c
new file mode 100644
index 0000000000..366e25c939
--- /dev/null
+++ b/src/lib/libcrypto/crypto.c
@@ -0,0 +1,575 @@
+/* crypto/crypto.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 you are happy to use the assmbler version of bn/bn_mulw.c, define
+ * BN_ASM */
+#ifndef BN_ASM
+#undef BN_ASM
+#define X86_ASM
+#endif
+
+#ifndef DES_ASM
+#undef DES_ASM
+#endif
+
+#ifndef BF_ASM
+#undef BF_ASM
+#endif
+
+/* The following defines are only to break the compiles into chunks.
+ * If you wish to not compile some sections, use the 'NO_XXX' macros
+ */
+#ifndef CRYPTO_SUBSET
+/* Define all subset symbols. */
+#define CRYPTO_LIB_SUBSET
+#define CRYPTO_ASN1_SUBSET
+#define CRYPTO_BN_SUBSET
+#define CRYPTO_BUFFER_SUBSET
+#define CRYPTO_BIO_SUBSET
+#define CRYPTO_CONF_SUBSET
+#define CRYPTO_DES_SUBSET
+#define CRYPTO_DH_SUBSET
+#define CRYPTO_DSA_SUBSET
+#define CRYPTO_ERROR_SUBSET
+#define CRYPTO_EVP_SUBSET
+#define CRYPTO_IDEA_SUBSET
+#define CRYPTO_LHASH_SUBSET
+#define CRYPTO_MD_SUBSET
+#define CRYPTO_MDC2_SUBSET
+#define CRYPTO_METH_SUBSET
+#define CRYPTO_OBJECTS_SUBSET
+#define CRYPTO_PEM_SUBSET
+#define CRYPTO_RAND_SUBSET
+#define CRYPTO_RC_SUBSET
+#define CRYPTO_BLOWFISH_SUBSET
+#define CRYPTO_CAST_SUBSET
+#define CRYPTO_RSA_SUBSET
+#define CRYPTO_SHA_SUBSET
+#define CRYPTO_HMAC_SUBSET
+#define CRYPTO_SHA1_SUBSET
+#define CRYPTO_STACK_SUBSET
+#define CRYPTO_TXT_DB_SUBSET
+#define CRYPTO_X509_SUBSET
+#define CRYPTO_PKCS7_SUBSET
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define USE_SOCKETS
+#include "../e_os.h"
+
+#include "buffer.h"
+#include "bio.h"
+#include "stack.h"
+#include "lhash.h"
+
+#include "err.h"
+
+#include "bn.h"
+#include "evp.h"
+
+#include "rand.h"
+#include "conf.h"
+#include "txt_db.h"
+
+#include "x509.h"
+#include "pkcs7.h"
+#include "pem.h"
+#include "asn1.h"
+#include "objects.h"
+
+#ifdef CRYPTO_LIB_SUBSET
+#include "cryptlib.c"
+#include "mem.c"
+#include "cversion.c"
+#endif
+
+#ifdef CRYPTO_ASN1_SUBSET
+#include "asn1/a_meth.c"
+#include "asn1/a_bitstr.c"
+#include "asn1/a_d2i_fp.c"
+#include "asn1/a_dup.c"
+#include "asn1/a_hdr.c"
+#include "asn1/a_i2d_fp.c"
+#include "asn1/a_int.c"
+#include "asn1/a_bool.c"
+#include "asn1/a_bytes.c"
+#include "asn1/a_object.c"
+#include "asn1/a_octet.c"
+#include "asn1/a_print.c"
+#include "asn1/a_set.c"
+#include "asn1/a_sign.c"
+#include "asn1/a_type.c"
+#include "asn1/a_utctm.c"
+#include "asn1/a_verify.c"
+#include "asn1/a_digest.c"
+#include "asn1/asn1_err.c"
+#include "asn1/asn1_lib.c"
+#include "asn1/asn1_par.c"
+#ifndef NO_DH
+#include "asn1/d2i_dhp.c"
+#include "asn1/i2d_dhp.c"
+#endif
+#ifndef NO_DSA
+#include "asn1/d2i_dsap.c"
+#include "asn1/i2d_dsap.c"
+#include "asn1/d2i_s_pr.c"
+#include "asn1/i2d_s_pr.c"
+#include "asn1/d2i_s_pu.c"
+#include "asn1/i2d_s_pu.c"
+#endif
+#ifndef NO_RSA
+#include "asn1/d2i_r_pr.c"
+#include "asn1/i2d_r_pr.c"
+#include "asn1/d2i_r_pu.c"
+#include "asn1/i2d_r_pu.c"
+#include "asn1/n_pkey.c"
+#endif
+#include "asn1/d2i_pr.c"
+#include "asn1/d2i_pu.c"
+#include "asn1/i2d_pr.c"
+#include "asn1/i2d_pu.c"
+#include "asn1/f_int.c"
+#include "asn1/f_string.c"
+#include "asn1/p7_dgst.c"
+#include "asn1/p7_enc.c"
+#include "asn1/p7_enc_c.c"
+#include "asn1/p7_evp.c"
+#include "asn1/p7_i_s.c"
+#include "asn1/p7_lib.c"
+#include "asn1/p7_recip.c"
+#include "asn1/p7_s_e.c"
+#include "asn1/p7_signd.c"
+#include "asn1/p7_signi.c"
+#include "asn1/t_pkey.c"
+#include "asn1/t_req.c"
+#include "asn1/t_x509.c"
+#include "asn1/x_algor.c"
+#include "asn1/x_attrib.c"
+#include "asn1/x_exten.c"
+#include "asn1/x_cinf.c"
+#include "asn1/x_crl.c"
+#include "asn1/x_info.c"
+#include "asn1/x_name.c"
+#include "asn1/x_pkey.c"
+#include "asn1/x_pubkey.c"
+#include "asn1/x_req.c"
+#include "asn1/x_sig.c"
+#include "asn1/x_spki.c"
+#include "asn1/x_val.c"
+#include "asn1/x_x509.c"
+#endif
+
+#ifdef CRYPTO_BN_SUBSET
+#include "bn/bn_add.c"
+#include "bn/bn_div.c"
+#include "bn/bn_exp.c"
+#include "bn/bn_mont.c"
+#include "bn/bn_recp.c"
+#include "bn/bn_gcd.c"
+#include "bn/bn_lib.c"
+#include "bn/bn_mod.c"
+#include "bn/bn_mul.c"
+#ifndef BN_ASM
+#include "bn/bn_mulw.c"
+#endif
+#include "bn/bn_prime.c"
+#include "bn/bn_rand.c"
+#include "bn/bn_shift.c"
+#include "bn/bn_sqr.c"
+#include "bn/bn_sub.c"
+#include "bn/bn_word.c"
+#include "bn/bn_print.c"
+#include "bn/bn_err.c"
+#include "bn/bn_blind.c"
+#endif
+
+#ifdef CRYPTO_BIO_SUBSET
+#include "bio/bf_buff.c"
+#include "bio/bf_null.c"
+#include "bio/bf_nbio.c"
+#include "bio/bio_cb.c"
+#include "bio/bio_lib.c"
+#include "bio/bss_fd.c"
+#include "bio/bss_file.c"
+#include "bio/bss_mem.c"
+#include "bio/bss_null.c"
+#ifdef VMS
+#include "bio/bss_rtcp.c"
+#endif
+#include "bio/bss_sock.c"
+#include "bio/bss_conn.c"
+#include "bio/bss_acpt.c"
+#include "bio/b_sock.c"
+#include "bio/b_print.c"
+#include "bio/b_dump.c"
+#include "bio/bio_err.c"
+#endif
+
+#ifdef CRYPTO_BUFFER_SUBSET
+#include "buffer/buf_err.c"
+#include "buffer/buffer.c"
+#endif
+
+#ifdef CRYPTO_CONF_SUBSET
+#include "conf/conf.c"
+#include "conf/conf_err.c"
+#endif
+
+#ifdef CRYPTO_DES_SUBSET
+#include "des/read_pwd.c"
+#ifndef NO_DES
+#ifndef DES_ASM
+#include "des/fcrypt_b.c"
+#include "des/des_enc.c"
+#endif
+#include "des/cbc_cksm.c"
+#include "des/xcbc_enc.c"
+#include "des/cbc_enc.c"
+#include "des/cfb64ede.c"
+#include "des/cfb64enc.c"
+#include "des/cfb_enc.c"
+#include "des/ecb3_enc.c"
+#include "des/ecb_enc.c"
+#include "des/enc_read.c"
+#include "des/enc_writ.c"
+#include "des/fcrypt.c"
+#include "des/ofb64ede.c"
+#include "des/ofb64enc.c"
+#include "des/ofb_enc.c"
+#include "des/pcbc_enc.c"
+#include "des/qud_cksm.c"
+#include "des/rand_key.c"
+#include "des/read2pwd.c"
+#include "des/rpc_enc.c"
+#include "des/set_key.c"
+#include "des/str2key.c"
+#include "des/supp.c"
+#endif
+#endif
+
+#ifdef CRYPTO_DH_SUBSET
+#ifndef NO_DH
+#include "dh/dh_check.c"
+#include "dh/dh_err.c"
+#include "dh/dh_gen.c"
+#include "dh/dh_key.c"
+#include "dh/dh_lib.c"
+#endif
+#endif
+
+#ifdef CRYPTO_DSA_SUBSET
+#ifndef NO_DSA
+#include "dsa/dsa_gen.c"
+#include "dsa/dsa_key.c"
+#include "dsa/dsa_lib.c"
+#include "dsa/dsa_sign.c"
+#include "dsa/dsa_vrf.c"
+#include "dsa/dsa_err.c"
+#endif
+#endif
+
+#ifdef CRYPTO_ERROR_SUBSET
+#include "err/err.c"
+#include "err/err_all.c"
+#include "err/err_prn.c"
+#endif
+
+#ifdef CRYPTO_EVP_SUBSET
+#include "evp/bio_md.c"
+#include "evp/bio_b64.c"
+#include "evp/bio_enc.c"
+#include "evp/c_all.c"
+#include "evp/digest.c"
+#ifndef NO_DES
+#include "evp/e_cbc_3d.c"
+#include "evp/e_cfb_3d.c"
+#include "evp/e_ecb_3d.c"
+#include "evp/e_ofb_3d.c"
+#include "evp/e_cbc_d.c"
+#include "evp/e_cfb_d.c"
+#include "evp/e_xcbc_d.c"
+#include "evp/e_ecb_d.c"
+#include "evp/e_ofb_d.c"
+#endif
+#ifndef NO_IDEA
+#include "evp/e_cbc_i.c"
+#include "evp/e_cfb_i.c"
+#include "evp/e_ecb_i.c"
+#include "evp/e_ofb_i.c"
+#endif
+#ifndef NO_RC2
+#include "evp/e_cbc_r2.c"
+#include "evp/e_cfb_r2.c"
+#include "evp/e_ecb_r2.c"
+#include "evp/e_ofb_r2.c"
+#endif
+#ifndef NO_BLOWFISH
+#include "evp/e_cbc_bf.c"
+#include "evp/e_cfb_bf.c"
+#include "evp/e_ecb_bf.c"
+#include "evp/e_ofb_bf.c"
+#endif
+#ifndef NO_CAST
+#include "evp/e_cbc_c.c"
+#include "evp/e_cfb_c.c"
+#include "evp/e_ecb_c.c"
+#include "evp/e_ofb_c.c"
+#endif
+#ifndef NO_RC4
+#include "evp/e_rc4.c"
+#endif
+#include "rc5/rc5_enc.c"
+#include "rc5/rc5cfb64.c"
+#include "rc5/rc5_ecb.c"
+#include "rc5/rc5_skey.c"
+#include "rc5/rc5ofb64.c"
+#include "ripemd/rmd160.c"
+#include "ripemd/rmd_dgst.c"
+#include "ripemd/rmd_one.c"
+#include "evp/evp_lib.c"
+
+#include "evp/names.c"
+#include "evp/e_null.c"
+#include "evp/encode.c"
+#include "evp/evp_enc.c"
+#include "evp/evp_err.c"
+#include "evp/evp_key.c"
+#include "evp/m_null.c"
+#include "evp/p_lib.c"
+#ifndef NO_RSA
+#include "evp/p_open.c"
+#include "evp/p_seal.c"
+#endif
+#include "evp/p_sign.c"
+#include "evp/p_verify.c"
+#endif
+
+#ifdef CRYPTO_IDEA_SUBSET
+#ifndef NO_IDEA
+#include "idea/i_cbc.c"
+#include "idea/i_cfb64.c"
+#include "idea/i_ecb.c"
+#include "idea/i_ofb64.c"
+#include "idea/i_skey.c"
+#endif
+#endif
+
+#ifdef CRYPTO_BLOWFISH_SUBSET
+#ifndef NO_BLOWFISH
+#include "bf/bf_cfb64.c"
+#include "bf/bf_ecb.c"
+#ifndef BF_ASM
+#include "bf/bf_enc.c"
+#endif
+#include "bf/bf_ofb64.c"
+#include "bf/bf_skey.c"
+#endif
+#endif
+
+#ifdef CRYPTO_CAST_SUBSET
+#ifndef NO_CAST
+#include "cast/c_cfb64.c"
+#include "cast/c_ecb.c"
+#ifndef CAST_ASM
+#include "cast/c_enc.c"
+#endif
+#include "cast/c_ofb64.c"
+#include "cast/c_skey.c"
+#endif
+#endif
+
+#ifdef CRYPTO_LHASH_SUBSET
+#include "lhash/lh_stats.c"
+#include "lhash/lhash.c"
+#endif
+
+#ifdef CRYPTO_MD_SUBSET
+#ifndef NO_MD2
+#include "md2/md2_dgst.c"
+#include "md2/md2_one.c"
+#include "evp/m_md2.c"
+#endif
+#ifndef NO_MD5
+#include "md5/md5_dgst.c"
+#include "md5/md5_one.c"
+#include "evp/m_md5.c"
+#endif
+#endif
+
+#ifdef CRYPTO_MDC2_SUBSET
+#ifndef NO_MDC2
+#include "mdc2/mdc2dgst.c"
+#include "mdc2/mdc2_one.c"
+#include "evp/m_mdc2.c"
+#endif
+#endif
+
+#ifdef CRYPTO_OBJECTS_SUBSET
+#include "objects/obj_dat.c"
+#include "objects/obj_err.c"
+#include "objects/obj_lib.c"
+#endif
+
+#ifdef CRYPTO_PEM_SUBSET
+#include "pem/pem_err.c"
+#include "pem/pem_info.c"
+#include "pem/pem_lib.c"
+#include "pem/pem_all.c"
+#ifndef NO_RSA
+#include "pem/pem_seal.c"
+#include "pem/pem_sign.c"
+#endif
+#endif
+
+#ifdef CRYPTO_RAND_SUBSET
+#include "rand/md_rand.c"
+#include "rand/randfile.c"
+#endif
+
+#ifdef CRYPTO_RC_SUBSET
+#ifndef NO_RC2
+#include "rc2/rc2_cbc.c"
+#include "rc2/rc2_ecb.c"
+#include "rc2/rc2_skey.c"
+#include "rc2/rc2cfb64.c"
+#include "rc2/rc2ofb64.c"
+#endif
+#ifndef NO_RC4
+#include "rc4/rc4_skey.c"
+#ifndef RC4_ASM
+#include "rc4/rc4_enc.c"
+#endif
+#endif
+#endif
+
+#ifdef CRYPTO_HMAC_SUBSET
+#include "hmac/hmac.c"
+#endif
+
+#ifdef CRYPTO_RSA_SUBSET
+#ifndef NO_RSA
+#include "rsa/rsa_eay.c"
+#include "rsa/rsa_err.c"
+#include "rsa/rsa_gen.c"
+#include "rsa/rsa_lib.c"
+#include "rsa/rsa_sign.c"
+#include "rsa/rsa_saos.c"
+#endif
+#endif
+
+#ifdef CRYPTO_SHA1_SUBSET
+#ifndef NO_SHA1
+#include "sha/sha1_one.c"
+#include "sha/sha1dgst.c"
+#include "evp/m_dss1.c"
+#include "evp/m_sha1.c"
+#endif
+#endif
+
+#ifdef CRYPTO_SHA_SUBSET
+#ifndef NO_SHA
+#include "evp/m_dss.c"
+#include "sha/sha_dgst.c"
+#include "sha/sha_one.c"
+#include "evp/m_sha.c"
+#endif
+#endif
+
+#ifdef CRYPTO_STACK_SUBSET
+#include "stack/stack.c"
+#endif
+
+#ifdef CRYPTO_TXT_DB_SUBSET
+#include "txt_db/txt_db.c"
+#endif
+
+#ifdef CRYPTO_X509_SUBSET
+#include "x509/x509_cmp.c"
+#include "x509/x509_d2.c"
+#include "x509/x509_def.c"
+#include "x509/x509_err.c"
+#include "x509/x509_ext.c"
+#include "x509/x509_lu.c"
+#include "x509/x509_obj.c"
+#include "x509/x509_r2x.c"
+#include "x509/x509_req.c"
+#include "x509/x509_set.c"
+#include "x509/x509_v3.c"
+#include "x509/x509_vfy.c"
+#include "x509/x509name.c"
+#include "x509/x509pack.c"
+#include "x509/x509rset.c"
+#include "x509/x509type.c"
+#include "x509/x_all.c"
+#include "x509/x509_txt.c"
+#include "x509/by_dir.c"
+#include "x509/by_file.c"
+#include "x509/v3_net.c"
+#include "x509/v3_x509.c"
+#endif
+
+
+#ifdef CRYPTO_PKCS7_SUBSET /* I have an explicit removal of 7 lines */
+#include "pkcs7/pk7_lib.c"
+#include "pkcs7/pkcs7err.c"
+#include "pkcs7/pk7_doit.c"
+#endif /* CRYPTO_PKCS7_SUBSET */
+
diff --git a/src/lib/libcrypto/crypto.err b/src/lib/libcrypto/crypto.err
new file mode 100644
index 0000000000..4ea3385e73
--- /dev/null
+++ b/src/lib/libcrypto/crypto.err
@@ -0,0 +1,8 @@
+/* Error codes for the CRYPTO functions. */
+
+/* Function codes. */
+#define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX                 100
+#define CRYPTO_F_CRYPTO_GET_NEW_LOCKID                   101
+#define CRYPTO_F_CRYPTO_SET_EX_DATA                      102
+
+/* Reason codes. */
diff --git a/src/lib/libcrypto/date.h b/src/lib/libcrypto/date.h
new file mode 100644
index 0000000000..dbb71bd1b7
--- /dev/null
+++ b/src/lib/libcrypto/date.h
@@ -0,0 +1 @@
+#define DATE    "Sun Jul 12 21:04:32 MDT 1998"
diff --git a/src/lib/libcrypto/des/DES.pod b/src/lib/libcrypto/des/DES.pod
new file mode 100644
index 0000000000..8a739e7ca0
--- /dev/null
+++ b/src/lib/libcrypto/des/DES.pod
@@ -0,0 +1,16 @@
+crypt   <=      crypt(buf,salt)
+key     <=      set_odd_parity(key)
+int     <=      is_weak_key(key)
+keysched<=      set_key(key)
+key     <=      ecb_encrypt(string8,ks,enc)
+key     <=      ecb3_encrypt(input,ks1,ks2,enc)
+string  <=      cbc_encrypt(input,ks,ivec,enc)                  => ivec 
+string  <=      cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,enc)     => ivec1&ivec2 
+ck1,ck2 <=      cbc_cksum(input,ks,ivec)                        => ivec
+string  <=      pcbc_encrypt(input,ks,ivec,enc)                 => ivec 
+string  <=      ofb_encrypt(input,numbits,ks,ivec)              => ivec
+string  <=      cfb_encrypt(input,numbits,ks,ivec,enc)          => ivec
+key     <=      random_key()
+key     <=      string_to_key(string)
+key1,key2<=     string_to_2keys(string)
+
diff --git a/src/lib/libcrypto/des/FILES b/src/lib/libcrypto/des/FILES
new file mode 100644
index 0000000000..4c7ea2de7a
--- /dev/null
+++ b/src/lib/libcrypto/des/FILES
@@ -0,0 +1,96 @@
+/* General stuff */
+COPYRIGHT       - Copyright info.
+MODES.DES       - A description of the features of the different modes of DES.
+FILES           - This file.
+INSTALL         - How to make things compile.
+Imakefile       - For use with kerberos.
+README          - What this package is.
+VERSION         - Which version this is and what was changed.
+KERBEROS        - Kerberos version 4 notes.
+Makefile.PL     - An old makefile to build with perl5, not current.
+Makefile.ssl    - The SSLeay makefile
+Makefile.uni    - The normal unix makefile.
+GNUmakefile     - The makefile for use with glibc.
+makefile.bc     - A Borland C makefile
+times           - Some outputs from 'speed' on some machines.
+vms.com         - For use when compiling under VMS
+
+/* My SunOS des(1) replacement */
+des.c           - des(1) source code.
+des.man         - des(1) manual.
+
+/* Testing and timing programs. */
+destest.c       - Source for libdes.a test program.
+speed.c         - Source for libdes.a timing program.
+rpw.c           - Source for libdes.a testing password reading routines.
+
+/* libdes.a source code */
+des_crypt.man   - libdes.a manual page.
+des.h           - Public libdes.a header file.
+ecb_enc.c       - des_ecb_encrypt() source, this contains the basic DES code.
+ecb3_enc.c      - des_ecb3_encrypt() source.
+cbc_ckm.c       - des_cbc_cksum() source.
+cbc_enc.c       - des_cbc_encrypt() source.
+ncbc_enc.c      - des_cbc_encrypt() that is 'normal' in that it copies
+                  the new iv values back in the passed iv vector.
+ede_enc.c       - des_ede3_cbc_encrypt() cbc mode des using triple DES.
+cbc3_enc.c      - des_3cbc_encrypt() source, don't use this function.
+cfb_enc.c       - des_cfb_encrypt() source.
+cfb64enc.c      - des_cfb64_encrypt() cfb in 64 bit mode but setup to be
+                  used as a stream cipher.
+cfb64ede.c      - des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be
+                  used as a stream cipher and using triple DES.
+ofb_enc.c       - des_cfb_encrypt() source.
+ofb64_enc.c     - des_ofb_encrypt() ofb in 64 bit mode but setup to be
+                  used as a stream cipher.
+ofb64ede.c      - des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be
+                  used as a stream cipher and using triple DES.
+enc_read.c      - des_enc_read() source.
+enc_writ.c      - des_enc_write() source.
+pcbc_enc.c      - des_pcbc_encrypt() source.
+qud_cksm.c      - quad_cksum() source.
+rand_key.c      - des_random_key() source.
+read_pwd.c      - Source for des_read_password() plus related functions.
+set_key.c       - Source for des_set_key().
+str2key.c       - Covert a string of any length into a key.
+fcrypt.c        - A small, fast version of crypt(3).
+des_locl.h      - Internal libdes.a header file.
+podd.h          - Odd parity tables - used in des_set_key().
+sk.h            - Lookup tables used in des_set_key().
+spr.h           - What is left of the S tables - used in ecb_encrypt().
+des_ver.h       - header file for the external definition of the
+                  version string.
+des.doc         - SSLeay documentation for the library.
+
+/* The perl scripts - you can ignore these files they are only
+ * included for the curious */
+des.pl          - des in perl anyone? des_set_key and des_ecb_encrypt
+                  both done in a perl library.
+testdes.pl      - Testing program for des.pl
+doIP            - Perl script used to develop IP xor/shift code.
+doPC1           - Perl script used to develop PC1 xor/shift code.
+doPC2           - Generates sk.h.
+PC1             - Output of doPC1 should be the same as output from PC1.
+PC2             - used in development of doPC2.
+shifts.pl       - Perl library used by my perl scripts.
+
+/* I started making a perl5 dynamic library for libdes
+ * but did not fully finish, these files are part of that effort. */
+DES.pm
+DES.pod
+DES.xs
+t
+typemap
+
+/* The following are for use with sun RPC implementaions. */
+rpc_des.h
+rpc_enc.c
+
+/* The following are contibuted by Mark Murray <mark@grondar.za>.  They
+ * are not normally built into libdes due to machine specific routines
+ * contained in them.  They are for use in the most recent incarnation of
+ * export kerberos v 4 (eBones). */
+supp.c
+new_rkey.c
+
+
diff --git a/src/lib/libcrypto/des/MODES.DES b/src/lib/libcrypto/des/MODES.DES
new file mode 100644
index 0000000000..0cbc44f51d
--- /dev/null
+++ b/src/lib/libcrypto/des/MODES.DES
@@ -0,0 +1,84 @@
+Modes of DES
+Quite a bit of the following information has been taken from
+        AS 2805.5.2
+        Australian Standard
+        Electronic funds transfer - Requirements for interfaces,
+        Part 5.2: Modes of operation for an n-bit block cipher algorithm
+        Appendix A
+
+There are several different modes in which DES can be used, they are
+as follows.
+
+Electronic Codebook Mode (ECB) (des_ecb_encrypt())
+- 64 bits are enciphered at a time.
+- The order of the blocks can be rearranged without detection.
+- The same plaintext block always produces the same ciphertext block
+  (for the same key) making it vulnerable to a 'dictionary attack'.
+- An error will only affect one ciphertext block.
+
+Cipher Block Chaining Mode (CBC) (des_cbc_encrypt())
+- a multiple of 64 bits are enciphered at a time.
+- The CBC mode produces the same ciphertext whenever the same
+  plaintext is encrypted using the same key and starting variable.
+- The chaining operation makes the ciphertext blocks dependent on the
+  current and all preceding plaintext blocks and therefore blocks can not
+  be rearranged.
+- The use of different starting variables prevents the same plaintext
+  enciphering to the same ciphertext.
+- An error will affect the current and the following ciphertext blocks.
+
+Cipher Feedback Mode (CFB) (des_cfb_encrypt())
+- a number of bits (j) <= 64 are enciphered at a time.
+- The CFB mode produces the same ciphertext whenever the same
+  plaintext is encrypted using the same key and starting variable.
+- The chaining operation makes the ciphertext variables dependent on the
+  current and all preceding variables and therefore j-bit variables are
+  chained together and con not be rearranged.
+- The use of different starting variables prevents the same plaintext
+  enciphering to the same ciphertext.
+- The strength of the CFB mode depends on the size of k (maximal if
+  j == k).  In my implementation this is always the case.
+- Selection of a small value for j will require more cycles through
+  the encipherment algorithm per unit of plaintext and thus cause
+  greater processing overheads.
+- Only multiples of j bits can be enciphered.
+- An error will affect the current and the following ciphertext variables.
+
+Output Feedback Mode (OFB) (des_ofb_encrypt())
+- a number of bits (j) <= 64 are enciphered at a time.
+- The OFB mode produces the same ciphertext whenever the same
+  plaintext enciphered using the same key and starting variable.  More
+  over, in the OFB mode the same key stream is produced when the same
+  key and start variable are used.  Consequently, for security reasons
+  a specific start variable should be used only once for a given key.
+- The absence of chaining makes the OFB more vulnerable to specific attacks.
+- The use of different start variables values prevents the same
+  plaintext enciphering to the same ciphertext, by producing different
+  key streams.
+- Selection of a small value for j will require more cycles through
+  the encipherment algorithm per unit of plaintext and thus cause
+  greater processing overheads.
+- Only multiples of j bits can be enciphered.
+- OFB mode of operation does not extend ciphertext errors in the
+  resultant plaintext output.  Every bit error in the ciphertext causes
+  only one bit to be in error in the deciphered plaintext.
+- OFB mode is not self-synchronising.  If the two operation of
+  encipherment and decipherment get out of synchronism, the system needs
+  to be re-initialised.
+- Each re-initialisation should use a value of the start variable
+different from the start variable values used before with the same
+key.  The reason for this is that an identical bit stream would be
+produced each time from the same parameters.  This would be
+susceptible to a 'known plaintext' attack.
+
+Triple ECB Mode (des_ecb3_encrypt())
+- Encrypt with key1, decrypt with key2 and encrypt with key1 again.
+- As for ECB encryption but increases the effective key length to 112 bits.
+- If both keys are the same it is equivalent to encrypting once with
+  just one key.
+
+Triple CBC Mode (des_3cbc_encrypt())
+- Encrypt with key1, decrypt with key2 and encrypt with key1 again.
+- As for CBC encryption but increases the effective key length to 112 bits.
+- If both keys are the same it is equivalent to encrypting once with
+  just one key.
diff --git a/src/lib/libcrypto/des/Makefile.PL b/src/lib/libcrypto/des/Makefile.PL
new file mode 100644
index 0000000000..b54a24387c
--- /dev/null
+++ b/src/lib/libcrypto/des/Makefile.PL
@@ -0,0 +1,14 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile being created.
+&writeMakefile(
+        'potential_libs' => '',   # e.g., '-lm' 
+        'INC' => '',     # e.g., '-I/usr/include/other' 
+        'DISTNAME' => 'DES',
+        'VERSION' => '0.1',
+        'DEFINE' => '-DPERL5',
+        'OBJECT' => 'DES.o cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \
+        rand_key.o set_key.o str2key.o \
+        enc_read.o enc_writ.o fcrypt.o cfb_enc.o \
+        ecb3_enc.o ofb_enc.o cbc3_enc.o des_enc.o',
+        );
diff --git a/src/lib/libcrypto/des/Makefile.lit b/src/lib/libcrypto/des/Makefile.lit
new file mode 100644
index 0000000000..c09f6969da
--- /dev/null
+++ b/src/lib/libcrypto/des/Makefile.lit
@@ -0,0 +1,250 @@
+# You must select the correct terminal control system to be used to
+# turn character echo off when reading passwords.  There a 5 systems
+# SGTTY   - the old BSD system
+# TERMIO  - most system V boxes
+# TERMIOS - SGI (ala IRIX).
+# VMS     - the DEC operating system
+# MSDOS   - we all know what it is :-)
+# read_pwd.c makes a reasonable guess at what is correct.
+
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+# If you are on a DEC Alpha, edit des.h and change the DES_LONG
+# define to 'unsigned int'.  I have seen this give a %20 speedup.
+
+OPTS0= -DLIBDES_LIT -DRAND -DTERMIO #-DNOCONST
+
+# Version 1.94 has changed the strings_to_key function so that it is
+# now compatible with MITs when the string is longer than 8 characters.
+# If you wish to keep the old version, uncomment the following line.
+# This will affect the -E/-D options on des(1).
+#OPTS1= -DOLD_STR_TO_KEY
+
+# There are 4 possible performance options
+# -DDES_PTR
+# -DDES_RISC1
+# -DDES_RISC2 (only one of DES_RISC1 and DES_RISC2)
+# -DDES_UNROLL
+# after the initial build, run 'des_opts' to see which options are best
+# for your platform.  There are some listed in options.txt
+#OPTS2= -DDES_PTR 
+#OPTS3= -DDES_RISC1 # or DES_RISC2
+#OPTS4= -DDES_UNROLL
+
+OPTS= $(OPTS0) $(OPTS1) $(OPTS2) $(OPTS3) $(OPTS4)
+
+MAKE=make -f Makefile
+#CC=cc
+#CFLAG= -O
+
+CC=gcc
+#CFLAG= -O4 -funroll-loops -fomit-frame-pointer
+CFLAG= -O3 -fomit-frame-pointer
+
+CFLAGS=$(OPTS) $(CFLAG)
+CPP=$(CC) -E
+AS=as
+
+# Assember version of des_encrypt*().
+DES_ENC=des_enc.o fcrypt_b.o            # normal C version
+#DES_ENC=asm/dx86-elf.o asm/yx86-elf.o  # elf format x86
+#DES_ENC=asm/dx86-out.o asm/yx86-out.o  # a.out format x86
+#DES_ENC=asm/dx86-sol.o asm/yx86-sol.o  # solaris format x86 
+#DES_ENC=asm/dx86bsdi.o asm/yx86basi.o  # bsdi format x86 
+
+LIBDIR=/usr/local/lib
+BINDIR=/usr/local/bin
+INCDIR=/usr/local/include
+MANDIR=/usr/local/man
+MAN1=1
+MAN3=3
+SHELL=/bin/sh
+OBJ_LIT=cbc_enc.o ecb_enc.o $(DES_ENC) fcrypt.o set_key.o
+OBJ_FULL=cbc_cksm.o $(OBJ_LIT) pcbc_enc.o \
+        xcbc_enc.o qud_cksm.o \
+        cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o \
+        enc_read.o enc_writ.o ofb64ede.o ofb64enc.o ofb_enc.o  \
+        rand_key.o read_pwd.o read2pwd.o rpc_enc.o  str2key.o supp.o
+
+GENERAL_LIT=COPYRIGHT INSTALL README VERSION Makefile des_crypt.man \
+        des.doc options.txt asm
+GENERAL_FULL=$(GENERAL_LIT) FILES Imakefile times vms.com KERBEROS MODES.DES \
+        des.man DES.pm DES.pod DES.xs Makefile.PL dess.cpp des3s.cpp \
+        Makefile.uni typemap t Makefile.ssl makefile.bc Makefile.lit \
+        des.org des_locl.org
+TESTING_LIT=    destest speed des_opts
+TESTING_FULL=   rpw $(TESTING_LIT)
+TESTING_SRC_LIT=destest.c speed.c des_opts.c
+TESTING_SRC_FULL=rpw.c $(TESTING_SRC_LIT)
+HEADERS_LIT=des_ver.h des.h des_locl.h podd.h sk.h spr.h
+HEADERS_FULL= $(HEADERS_LIT) rpc_des.h
+LIBDES_LIT=cbc_enc.c ecb_enc.c fcrypt.c set_key.c des_enc.c fcrypt_b.c
+LIBDES_FULL= cbc_cksm.c pcbc_enc.c qud_cksm.c \
+        cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c \
+        enc_read.c enc_writ.c ofb64ede.c ofb64enc.c ofb_enc.c  \
+        rand_key.c rpc_enc.c  str2key.c  supp.c \
+        xcbc_enc.c $(LIBDES_LIT) read_pwd.c read2pwd.c
+
+PERL=   des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl
+
+OBJ=    $(OBJ_LIT)
+GENERAL=$(GENERAL_LIT)
+TESTING=$(TESTING_LIT)
+TESTING_SRC=$(TESTING_SRC_LIT)
+HEADERS=$(HEADERS_LIT)
+LIBDES= $(LIBDES_LIT)
+
+ALL=    $(GENERAL) $(TESTING_SRC) $(LIBDES) $(PERL) $(HEADERS)
+
+DLIB=   libdes.a
+
+all: $(DLIB) $(TESTING)
+
+cc:
+        $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all
+
+gcc:
+        $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all
+
+x86-elf:
+        $(MAKE) DES_ENC='asm/dx86-elf.o asm/yx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all
+
+x86-out:
+        $(MAKE) DES_ENC='asm/dx86-out.o asm/yx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all
+
+x86-solaris:
+        $(MAKE) DES_ENC='asm/dx86-sol.o asm/yx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all
+
+x86-bsdi:
+        $(MAKE) DES_ENC='asm/dx86bsdi.o asm/yx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all
+
+# elf
+asm/dx86-elf.o: asm/dx86unix.cpp
+        $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o
+
+asm/yx86-elf.o: asm/yx86unix.cpp
+        $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o
+
+# solaris
+asm/dx86-sol.o: asm/dx86unix.cpp
+        $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
+        as -o asm/dx86-sol.o asm/dx86-sol.s
+        rm -f asm/dx86-sol.s
+
+asm/yx86-sol.o: asm/yx86unix.cpp
+        $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
+        as -o asm/yx86-sol.o asm/yx86-sol.s
+        rm -f asm/yx86-sol.s
+
+# a.out
+asm/dx86-out.o: asm/dx86unix.cpp
+        $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o
+
+asm/yx86-out.o: asm/yx86unix.cpp
+        $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o
+
+# bsdi
+asm/dx86bsdi.o: asm/dx86unix.cpp
+        $(CPP) -DBSDI asm/dx86unix.cpp | $(AS) -o asm/dx86bsdi.o
+
+asm/yx86bsdi.o: asm/yx86unix.cpp
+        $(CPP) -DBSDI asm/yx86unix.cpp | $(AS) -o asm/yx86bsdi.o
+
+asm/dx86unix.cpp:
+        (cd asm; perl des-586.pl cpp >dx86unix.cpp)
+
+asm/yx86unix.cpp:
+        (cd asm; perl crypt586.pl cpp >yx86unix.cpp)
+
+test:   all
+        ./destest
+
+$(DLIB): $(OBJ)
+        /bin/rm -f $(DLIB)
+        ar cr $(DLIB) $(OBJ)
+        -if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \
+        else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \
+        else exit 0; fi; fi
+
+des_opts: des_opts.o $(DLIB)
+        $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB)
+
+destest: destest.o $(DLIB)
+        $(CC) $(CFLAGS) -o destest destest.o $(DLIB)
+
+rpw: rpw.o $(DLIB)
+        $(CC) $(CFLAGS) -o rpw rpw.o $(DLIB)
+
+speed: speed.o $(DLIB)
+        $(CC) $(CFLAGS) -o speed speed.o $(DLIB)
+
+des: des.o $(DLIB)
+        $(CC) $(CFLAGS) -o des des.o $(DLIB)
+
+tags:
+        ctags $(TESTING_SRC) $(LIBDES)
+
+tar_lit:
+        /bin/mv Makefile Makefile.tmp
+        /bin/cp Makefile.lit Makefile
+        tar chf libdes-l.tar $(LIBDES_LIT) $(HEADERS_LIT) \
+                $(GENERAL_LIT) $(TESTING_SRC_LIT)
+        /bin/rm -f Makefile
+        /bin/mv Makefile.tmp Makefile
+
+tar:
+        tar chf libdes.tar $(ALL)
+
+shar:
+        shar $(ALL) >libdes.shar
+
+depend:
+        makedepend $(LIBDES) $(TESTING_SRC)
+
+clean:
+        /bin/rm -f *.o tags core $(TESTING) $(DLIB) .nfs* *.old *.bak asm/*.o 
+
+dclean:
+        sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new
+        mv -f Makefile.new Makefile
+
+# Eric is probably going to choke when he next looks at this --tjh
+install:
+        if test $(INSTALLTOP); then \
+            echo SSL style install; \
+            cp $(DLIB) $(INSTALLTOP)/lib; \
+            if test -s /bin/ranlib; then \
+                /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \
+            else \
+                if test -s /usr/bin/ranlib; then \
+                /usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \
+            fi; fi; \
+            chmod 644 $(INSTALLTOP)/lib/$(DLIB); \
+            cp des.h $(INSTALLTOP)/include; \
+            chmod 644 $(INSTALLTOP)/include/des.h; \
+        else \
+            echo Standalone install; \
+            cp $(DLIB) $(LIBDIR)/$(DLIB); \
+            if test -s /bin/ranlib; then \
+              /bin/ranlib $(LIBDIR)/$(DLIB); \
+            else \
+              if test -s /usr/bin/ranlib; then \
+                /usr/bin/ranlib $(LIBDIR)/$(DLIB); \
+              fi; \
+            fi; \
+            chmod 644 $(LIBDIR)/$(DLIB); \
+            cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
+            chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
+            cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
+            chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
+            cp des.h $(INCDIR)/des.h; \
+            chmod 644 $(INCDIR)/des.h; \
+        fi
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/des/Makefile.ssl b/src/lib/libcrypto/des/Makefile.ssl
new file mode 100644
index 0000000000..78b5189ee3
--- /dev/null
+++ b/src/lib/libcrypto/des/Makefile.ssl
@@ -0,0 +1,140 @@
+#
+# SSLeay/crypto/des/Makefile
+#
+
+DIR=    des
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+DES_ENC=        des_enc.o fcrypt_b.o
+# or use
+#DES_ENC=       dx86-elf.o yx86-elf.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile des.org des_locl.org
+TEST=destest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
+        ecb3_enc.c ecb_enc.c  enc_read.c enc_writ.c \
+        fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
+        qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
+        des_enc.c fcrypt_b.c read2pwd.c \
+        fcrypt.c xcbc_enc.c \
+        str2key.c  cfb64ede.c ofb64ede.c supp.c
+
+LIBOBJ= set_key.o  ecb_enc.o  cbc_enc.o \
+        ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o  ofb64ede.o \
+        enc_read.o enc_writ.o ofb64enc.o \
+        ofb_enc.o  str2key.o  pcbc_enc.o qud_cksm.o rand_key.o \
+        ${DES_ENC} read2pwd.o \
+        fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o  cbc_cksm.o supp.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= des.h
+HEADER= des_locl.h rpc_des.h podd.h sk.h spr.h des_ver.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/dx86-elf.o: asm/dx86unix.cpp
+        $(CPP) -DELF asm/dx86unix.cpp | as -o asm/dx86-elf.o
+
+asm/yx86-elf.o: asm/yx86unix.cpp
+        $(CPP) -DELF asm/yx86unix.cpp | as -o asm/yx86-elf.o
+
+# solaris
+asm/dx86-sol.o: asm/dx86unix.cpp
+        $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
+        as -o asm/dx86-sol.o asm/dx86-sol.s
+        rm -f asm/dx86-sol.s
+
+asm/yx86-sol.o: asm/yx86unix.cpp
+        $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
+        as -o asm/yx86-sol.o asm/yx86-sol.s
+        rm -f asm/yx86-sol.s
+
+# a.out
+asm/dx86-out.o: asm/dx86unix.cpp
+        $(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o
+
+asm/yx86-out.o: asm/yx86unix.cpp
+        $(CPP) -DOUT asm/yx86unix.cpp | as -o asm/yx86-out.o
+
+# bsdi
+asm/dx86bsdi.o: asm/dx86unix.cpp
+        $(CPP) -DBSDI asm/dx86unix.cpp | as -o asm/dx86bsdi.o
+
+asm/yx86bsdi.o: asm/yx86unix.cpp
+        $(CPP) -DBSDI asm/yx86unix.cpp | as -o asm/yx86bsdi.o
+
+asm/dx86unix.cpp:
+        (cd asm; perl des-586.pl cpp >dx86unix.cpp)
+
+asm/yx86unix.cpp:
+        (cd asm; perl crypt586.pl cpp >yx86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile
+        /bin/rm -f des.doc
+        /bin/rm -fr asm/perlasm
+        $(TOP)/util/point.sh ../../perlasm asm/perlasm
+        $(TOP)/util/point.sh ../../doc/des.doc des.doc
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install: installs
+
+installs:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/des/Makefile.uni b/src/lib/libcrypto/des/Makefile.uni
new file mode 100644
index 0000000000..8f1759748a
--- /dev/null
+++ b/src/lib/libcrypto/des/Makefile.uni
@@ -0,0 +1,263 @@
+# You must select the correct terminal control system to be used to
+# turn character echo off when reading passwords.  There a 5 systems
+# SGTTY   - the old BSD system
+# TERMIO  - most system V boxes
+# TERMIOS - SGI (ala IRIX).
+# VMS     - the DEC operating system
+# MSDOS   - we all know what it is :-)
+# read_pwd.c makes a reasonable guess at what is correct.
+
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+# If you are on a DEC Alpha, edit des.h and change the DES_LONG
+# define to 'unsigned int'.  I have seen this give a %20 speedup.
+
+OPTS0= -DRAND -DTERMIO #-DNOCONST
+
+# Version 1.94 has changed the strings_to_key function so that it is
+# now compatible with MITs when the string is longer than 8 characters.
+# If you wish to keep the old version, uncomment the following line.
+# This will affect the -E/-D options on des(1).
+#OPTS1= -DOLD_STR_TO_KEY
+
+# There are 4 possible performance options
+# -DDES_PTR
+# -DDES_RISC1
+# -DDES_RISC2 (only one of DES_RISC1 and DES_RISC2)
+# -DDES_UNROLL
+# after the initial build, run 'des_opts' to see which options are best
+# for your platform.  There are some listed in options.txt
+#OPTS2= -DDES_PTR 
+#OPTS3= -DDES_RISC1 # or DES_RISC2
+#OPTS4= -DDES_UNROLL
+
+OPTS= $(OPTS0) $(OPTS1) $(OPTS2) $(OPTS3) $(OPTS4)
+
+MAKE=make -f Makefile
+#CC=cc
+#CFLAG= -O
+
+CC=gcc
+#CFLAG= -O4 -funroll-loops -fomit-frame-pointer
+CFLAG= -O3 -fomit-frame-pointer
+
+CFLAGS=$(OPTS) $(CFLAG)
+CPP=$(CC) -E
+AS=as
+
+# Assember version of des_encrypt*().
+DES_ENC=des_enc.o fcrypt_b.o            # normal C version
+#DES_ENC=asm/dx86-elf.o asm/yx86-elf.o  # elf format x86
+#DES_ENC=asm/dx86-out.o asm/yx86-out.o  # a.out format x86
+#DES_ENC=asm/dx86-sol.o asm/yx86-sol.o  # solaris format x86 
+#DES_ENC=asm/dx86bsdi.o asm/yx86basi.o  # bsdi format x86 
+
+LIBDIR=/usr/local/lib
+BINDIR=/usr/local/bin
+INCDIR=/usr/local/include
+MANDIR=/usr/local/man
+MAN1=1
+MAN3=3
+SHELL=/bin/sh
+OBJ_LIT=cbc_enc.o ecb_enc.o $(DES_ENC) fcrypt.o set_key.o
+OBJ_FULL=cbc_cksm.o $(OBJ_LIT) pcbc_enc.o \
+        xcbc_enc.o qud_cksm.o cbc3_enc.o \
+        cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o \
+        enc_read.o enc_writ.o ofb64ede.o ofb64enc.o ofb_enc.o  \
+        rand_key.o read_pwd.o read2pwd.o rpc_enc.o  str2key.o supp.o
+
+GENERAL_LIT=COPYRIGHT INSTALL README VERSION Makefile des_crypt.man \
+        des.doc options.txt asm
+GENERAL_FULL=$(GENERAL_LIT) FILES Imakefile times vms.com KERBEROS MODES.DES \
+        des.man DES.pm DES.pod DES.xs Makefile.PL dess.cpp des3s.cpp \
+        Makefile.uni typemap t Makefile.ssl makefile.bc Makefile.lit \
+        des.org des_locl.org
+TESTING_LIT=    destest speed des_opts
+TESTING_FULL=   rpw des $(TESTING_LIT)
+TESTING_SRC_LIT=destest.c speed.c des_opts.c
+TESTING_SRC_FULL=rpw.c des.c $(TESTING_SRC_LIT)
+HEADERS_LIT=des_ver.h des.h des_locl.h podd.h sk.h spr.h
+HEADERS_FULL= $(HEADERS_LIT) rpc_des.h
+LIBDES_LIT=cbc_enc.c ecb_enc.c fcrypt.c set_key.c des_enc.c fcrypt_b.c
+LIBDES_FULL= cbc_cksm.c pcbc_enc.c qud_cksm.c cbc3_enc.c \
+        cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c \
+        enc_read.c enc_writ.c ofb64ede.c ofb64enc.c ofb_enc.c  \
+        rand_key.c rpc_enc.c  str2key.c  supp.c \
+        xcbc_enc.c $(LIBDES_LIT) read_pwd.c read2pwd.c
+
+PERL=   des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl
+
+OBJ=    $(OBJ_FULL)
+GENERAL=$(GENERAL_FULL)
+TESTING=$(TESTING_FULL)
+TESTING_SRC=$(TESTING_SRC_FULL)
+HEADERS=$(HEADERS_FULL)
+LIBDES= $(LIBDES_FULL)
+
+ALL=    $(GENERAL) $(TESTING_SRC) $(LIBDES) $(PERL) $(HEADERS)
+
+DLIB=   libdes.a
+
+all: $(DLIB) $(TESTING)
+
+cc:
+        $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all
+
+gcc:
+        $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all
+
+x86-elf:
+        $(MAKE) DES_ENC='asm/dx86-elf.o asm/yx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all
+
+x86-out:
+        $(MAKE) DES_ENC='asm/dx86-out.o asm/yx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all
+
+x86-solaris:
+        $(MAKE) DES_ENC='asm/dx86-sol.o asm/yx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all
+
+x86-bsdi:
+        $(MAKE) DES_ENC='asm/dx86bsdi.o asm/yx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all
+
+# elf
+asm/dx86-elf.o: asm/dx86unix.cpp
+        $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o
+
+asm/yx86-elf.o: asm/yx86unix.cpp
+        $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o
+
+# solaris
+asm/dx86-sol.o: asm/dx86unix.cpp
+        $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s
+        as -o asm/dx86-sol.o asm/dx86-sol.s
+        rm -f asm/dx86-sol.s
+
+asm/yx86-sol.o: asm/yx86unix.cpp
+        $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s
+        as -o asm/yx86-sol.o asm/yx86-sol.s
+        rm -f asm/yx86-sol.s
+
+# a.out
+asm/dx86-out.o: asm/dx86unix.cpp
+        $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o
+
+asm/yx86-out.o: asm/yx86unix.cpp
+        $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o
+
+# bsdi
+asm/dx86bsdi.o: asm/dx86unix.cpp
+        $(CPP) -DBSDI asm/dx86unix.cpp | $(AS) -o asm/dx86bsdi.o
+
+asm/yx86bsdi.o: asm/yx86unix.cpp
+        $(CPP) -DBSDI asm/yx86unix.cpp | $(AS) -o asm/yx86bsdi.o
+
+asm/dx86unix.cpp:
+        (cd asm; perl des-586.pl cpp >dx86unix.cpp)
+
+asm/yx86unix.cpp:
+        (cd asm; perl crypt586.pl cpp >yx86unix.cpp)
+
+test:   all
+        ./destest
+
+$(DLIB): $(OBJ)
+        /bin/rm -f $(DLIB)
+        ar cr $(DLIB) $(OBJ)
+        -if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \
+        else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \
+        else exit 0; fi; fi
+
+des_opts: des_opts.o $(DLIB)
+        $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB)
+
+destest: destest.o $(DLIB)
+        $(CC) $(CFLAGS) -o destest destest.o $(DLIB)
+
+rpw: rpw.o $(DLIB)
+        $(CC) $(CFLAGS) -o rpw rpw.o $(DLIB)
+
+speed: speed.o $(DLIB)
+        $(CC) $(CFLAGS) -o speed speed.o $(DLIB)
+
+des: des.o $(DLIB)
+        $(CC) $(CFLAGS) -o des des.o $(DLIB)
+
+tags:
+        ctags $(TESTING_SRC) $(LIBDES)
+
+tar_lit:
+        /bin/mv Makefile Makefile.tmp
+        /bin/cp Makefile.lit Makefile
+        for i in $(HEADERS_LIT) $(LIBDES_LIT) $(GENERAL_LIT) $(TESTING_SRC_LIT) ;\
+        do \
+                n="$$n des/$$i"; \
+        done; \
+        ( cd .. ; tar chf - $$n )| gzip > libdes-l.tgz
+        /bin/rm -f Makefile
+        /bin/mv Makefile.tmp Makefile
+
+tar:
+        mv Makefile Makefile.tmp
+        /bin/cp Makefile.uni Makefile
+        for i in $(ALL) ;\
+        do \
+                n="$$n des/$$i"; \
+        done; \
+        ( cd .. ; tar chf - $$n )| gzip > libdes.tgz
+        /bin/rm -f Makefile
+        /bin/mv Makefile.tmp Makefile
+
+shar:
+        shar $(ALL) >libdes.shar
+
+depend:
+        makedepend $(LIBDES) $(TESTING_SRC)
+
+clean:
+        /bin/rm -f *.o tags core $(TESTING) $(DLIB) .nfs* *.old *.bak asm/*.o 
+
+dclean:
+        sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new
+        mv -f Makefile.new Makefile
+
+# Eric is probably going to choke when he next looks at this --tjh
+install: des
+        if test $(INSTALLTOP); then \
+            echo SSL style install; \
+            cp $(DLIB) $(INSTALLTOP)/lib; \
+            if test -s /bin/ranlib; then \
+                /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \
+            else \
+                if test -s /usr/bin/ranlib; then \
+                /usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \
+            fi; fi; \
+            chmod 644 $(INSTALLTOP)/lib/$(DLIB); \
+            cp des.h $(INSTALLTOP)/include; \
+            chmod 644 $(INSTALLTOP)/include/des.h; \
+        else \
+            echo Standalone install; \
+            cp $(DLIB) $(LIBDIR)/$(DLIB); \
+            if test -s /bin/ranlib; then \
+              /bin/ranlib $(LIBDIR)/$(DLIB); \
+            else \
+              if test -s /usr/bin/ranlib; then \
+                /usr/bin/ranlib $(LIBDIR)/$(DLIB); \
+              fi; \
+            fi; \
+            chmod 644 $(LIBDIR)/$(DLIB); \
+            cp des $(BINDIR)/des; \
+            chmod 711 $(BINDIR)/des; \
+            cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
+            chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
+            cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
+            chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
+            cp des.h $(INCDIR)/des.h; \
+            chmod 644 $(INCDIR)/des.h; \
+        fi
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/des/PC1 b/src/lib/libcrypto/des/PC1
new file mode 100644
index 0000000000..efb8348b72
--- /dev/null
+++ b/src/lib/libcrypto/des/PC1
@@ -0,0 +1,28 @@
+#!/usr/local/bin/perl
+
+@PC1=(  57,49,41,33,25,17, 9,
+         1,58,50,42,34,26,18,
+        10, 2,59,51,43,35,27,
+        19,11, 3,60,52,44,36,
+        "-","-","-","-",
+        63,55,47,39,31,23,15,
+         7,62,54,46,38,30,22,
+        14, 6,61,53,45,37,29,
+        21,13, 5,28,20,12, 4,
+        "-","-","-","-",
+        );
+
+foreach (@PC1)
+        {
+        if ($_ ne "-")
+                {
+                $_--;
+                $_=int($_/8)*8+7-($_%8);
+                printf "%2d  ",$_;
+                }
+        else
+                { print "--  "; }
+        print "\n" if (((++$i) % 8) == 0);
+        print "\n" if ((($i) % 32) == 0);
+        }
+
diff --git a/src/lib/libcrypto/des/PC2 b/src/lib/libcrypto/des/PC2
new file mode 100644
index 0000000000..2d560270ec
--- /dev/null
+++ b/src/lib/libcrypto/des/PC2
@@ -0,0 +1,57 @@
+#!/usr/local/bin/perl
+
+@PC2_C=(14,17,11,24, 1, 5,
+         3,28,15, 6,21,10,
+        23,19,12, 4,26, 8,
+        16, 7,27,20,13, 2,
+        );
+
+@PC2_D=(41,52,31,37,47,55,
+        30,40,51,45,33,48,
+        44,49,39,56,34,53,
+        46,42,50,36,29,32,
+        );
+
+foreach (@PC2_C) {
+        if ($_ ne "-")
+                {
+                $_--;
+                printf "%2d  ",$_; }
+        else { print "--  "; }
+        $C{$_}=1;
+        print "\n" if (((++$i) % 8) == 0);
+        }
+$i=0;
+print "\n";
+foreach (@PC2_D) {
+        if ($_ ne "-")
+                {
+                $_-=29;
+                printf "%2d  ",$_; }
+        else { print "--  "; }
+        $D{$_}=1;
+        print "\n" if (((++$i) % 8) == 0); }
+
+print "\n";
+foreach $i (0 .. 27)
+        {
+        $_=$C{$i};
+        if ($_ ne "-") {printf "%2d ",$_;}
+        else { print "--  "; }
+        print "\n" if (((++$i) % 8) == 0);
+        }
+print "\n";
+
+print "\n";
+foreach $i (0 .. 27)
+        {
+        $_=$D{$i};
+        if ($_ ne "-") {printf "%2d  ",$_;}
+        else { print "--  "; }
+        print "\n" if (((++$i) % 8) == 0);
+        }
+print "\n";
+sub numsort
+        {
+        $a-$b;
+        }
diff --git a/src/lib/libcrypto/des/asm/d-win32.asm b/src/lib/libcrypto/des/asm/d-win32.asm
new file mode 100644
index 0000000000..9e3dc9cd87
--- /dev/null
+++ b/src/lib/libcrypto/des/asm/d-win32.asm
@@ -0,0 +1,3132 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by des-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   des-586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _des_encrypt
+EXTRN   _des_SPtrans:DWORD
+_des_encrypt PROC NEAR
+        push    esi
+        push    edi
+        ; 
+        ; Load the 2 words
+        mov     esi,            DWORD PTR 12[esp]
+        xor     ecx,            ecx
+        push    ebx
+        push    ebp
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 28[esp]
+        mov     edi,            DWORD PTR 4[esi]
+        ; 
+        ; IP
+        rol     eax,            4
+        mov     esi,            eax
+        xor     eax,            edi
+        and     eax,            0f0f0f0f0h
+        xor     esi,            eax
+        xor     edi,            eax
+        ; 
+        rol     edi,            20
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            0fff0000fh
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     eax,            14
+        mov     edi,            eax
+        xor     eax,            esi
+        and     eax,            033333333h
+        xor     edi,            eax
+        xor     esi,            eax
+        ; 
+        rol     esi,            22
+        mov     eax,            esi
+        xor     esi,            edi
+        and     esi,            003fc03fch
+        xor     eax,            esi
+        xor     edi,            esi
+        ; 
+        rol     eax,            9
+        mov     esi,            eax
+        xor     eax,            edi
+        and     eax,            0aaaaaaaah
+        xor     esi,            eax
+        xor     edi,            eax
+        ; 
+        rol     edi,            1
+        mov     ebp,            DWORD PTR 24[esp]
+        cmp     ebx,            0
+        je      $L000start_decrypt
+        ; 
+        ; Round 0
+        mov     eax,            DWORD PTR [ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 4[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 1
+        mov     eax,            DWORD PTR 8[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 12[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 2
+        mov     eax,            DWORD PTR 16[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 20[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 3
+        mov     eax,            DWORD PTR 24[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 28[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 4
+        mov     eax,            DWORD PTR 32[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 36[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 5
+        mov     eax,            DWORD PTR 40[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 44[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 6
+        mov     eax,            DWORD PTR 48[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 52[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 7
+        mov     eax,            DWORD PTR 56[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 60[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 8
+        mov     eax,            DWORD PTR 64[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 68[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 9
+        mov     eax,            DWORD PTR 72[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 76[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 10
+        mov     eax,            DWORD PTR 80[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 84[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 11
+        mov     eax,            DWORD PTR 88[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 92[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 12
+        mov     eax,            DWORD PTR 96[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 100[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 13
+        mov     eax,            DWORD PTR 104[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 108[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 14
+        mov     eax,            DWORD PTR 112[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 116[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 15
+        mov     eax,            DWORD PTR 120[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 124[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        jmp     $L001end
+$L000start_decrypt:
+        ; 
+        ; Round 15
+        mov     eax,            DWORD PTR 120[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 124[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 14
+        mov     eax,            DWORD PTR 112[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 116[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 13
+        mov     eax,            DWORD PTR 104[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 108[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 12
+        mov     eax,            DWORD PTR 96[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 100[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 11
+        mov     eax,            DWORD PTR 88[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 92[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 10
+        mov     eax,            DWORD PTR 80[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 84[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 9
+        mov     eax,            DWORD PTR 72[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 76[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 8
+        mov     eax,            DWORD PTR 64[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 68[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 7
+        mov     eax,            DWORD PTR 56[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 60[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 6
+        mov     eax,            DWORD PTR 48[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 52[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 5
+        mov     eax,            DWORD PTR 40[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 44[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 4
+        mov     eax,            DWORD PTR 32[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 36[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 3
+        mov     eax,            DWORD PTR 24[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 28[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 2
+        mov     eax,            DWORD PTR 16[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 20[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 1
+        mov     eax,            DWORD PTR 8[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 12[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 0
+        mov     eax,            DWORD PTR [ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 4[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+$L001end:
+        ; 
+        ; FP
+        mov     edx,            DWORD PTR 20[esp]
+        ror     esi,            1
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            0aaaaaaaah
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     eax,            23
+        mov     edi,            eax
+        xor     eax,            esi
+        and     eax,            003fc03fch
+        xor     edi,            eax
+        xor     esi,            eax
+        ; 
+        rol     edi,            10
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            033333333h
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     esi,            18
+        mov     edi,            esi
+        xor     esi,            eax
+        and     esi,            0fff0000fh
+        xor     edi,            esi
+        xor     eax,            esi
+        ; 
+        rol     edi,            12
+        mov     esi,            edi
+        xor     edi,            eax
+        and     edi,            0f0f0f0f0h
+        xor     esi,            edi
+        xor     eax,            edi
+        ; 
+        ror     eax,            4
+        mov     DWORD PTR [edx],eax
+        mov     DWORD PTR 4[edx],esi
+        pop     ebp
+        pop     ebx
+        pop     edi
+        pop     esi
+        ret
+_des_encrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _des_encrypt2
+EXTRN   _des_SPtrans:DWORD
+_des_encrypt2 PROC NEAR
+        push    esi
+        push    edi
+        ; 
+        ; Load the 2 words
+        mov     eax,            DWORD PTR 12[esp]
+        xor     ecx,            ecx
+        push    ebx
+        push    ebp
+        mov     esi,            DWORD PTR [eax]
+        mov     ebx,            DWORD PTR 28[esp]
+        rol     esi,            3
+        mov     edi,            DWORD PTR 4[eax]
+        rol     edi,            3
+        mov     ebp,            DWORD PTR 24[esp]
+        cmp     ebx,            0
+        je      $L002start_decrypt
+        ; 
+        ; Round 0
+        mov     eax,            DWORD PTR [ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 4[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 1
+        mov     eax,            DWORD PTR 8[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 12[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 2
+        mov     eax,            DWORD PTR 16[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 20[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 3
+        mov     eax,            DWORD PTR 24[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 28[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 4
+        mov     eax,            DWORD PTR 32[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 36[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 5
+        mov     eax,            DWORD PTR 40[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 44[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 6
+        mov     eax,            DWORD PTR 48[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 52[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 7
+        mov     eax,            DWORD PTR 56[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 60[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 8
+        mov     eax,            DWORD PTR 64[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 68[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 9
+        mov     eax,            DWORD PTR 72[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 76[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 10
+        mov     eax,            DWORD PTR 80[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 84[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 11
+        mov     eax,            DWORD PTR 88[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 92[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 12
+        mov     eax,            DWORD PTR 96[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 100[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 13
+        mov     eax,            DWORD PTR 104[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 108[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 14
+        mov     eax,            DWORD PTR 112[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 116[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 15
+        mov     eax,            DWORD PTR 120[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 124[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        jmp     $L003end
+$L002start_decrypt:
+        ; 
+        ; Round 15
+        mov     eax,            DWORD PTR 120[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 124[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 14
+        mov     eax,            DWORD PTR 112[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 116[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 13
+        mov     eax,            DWORD PTR 104[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 108[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 12
+        mov     eax,            DWORD PTR 96[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 100[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 11
+        mov     eax,            DWORD PTR 88[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 92[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 10
+        mov     eax,            DWORD PTR 80[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 84[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 9
+        mov     eax,            DWORD PTR 72[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 76[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 8
+        mov     eax,            DWORD PTR 64[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 68[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 7
+        mov     eax,            DWORD PTR 56[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 60[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 6
+        mov     eax,            DWORD PTR 48[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 52[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 5
+        mov     eax,            DWORD PTR 40[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 44[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 4
+        mov     eax,            DWORD PTR 32[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 36[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 3
+        mov     eax,            DWORD PTR 24[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 28[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 2
+        mov     eax,            DWORD PTR 16[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 20[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 1
+        mov     eax,            DWORD PTR 8[ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 12[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 0
+        mov     eax,            DWORD PTR [ebp]
+        xor     ebx,            ebx
+        mov     edx,            DWORD PTR 4[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        and     eax,            0fcfcfcfch
+        and     edx,            0cfcfcfcfh
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+$L003end:
+        ; 
+        ; Fixup
+        ror     edi,            3
+        mov     eax,            DWORD PTR 20[esp]
+        ror     esi,            3
+        mov     DWORD PTR [eax],edi
+        mov     DWORD PTR 4[eax],esi
+        pop     ebp
+        pop     ebx
+        pop     edi
+        pop     esi
+        ret
+_des_encrypt2 ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _des_encrypt3
+
+_des_encrypt3 PROC NEAR
+        push    ebx
+        mov     ebx,            DWORD PTR 8[esp]
+        push    ebp
+        push    esi
+        push    edi
+        ; 
+        ; Load the data words
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        sub     esp,            12
+        ; 
+        ; IP
+        rol     edi,            4
+        mov     edx,            edi
+        xor     edi,            esi
+        and     edi,            0f0f0f0f0h
+        xor     edx,            edi
+        xor     esi,            edi
+        ; 
+        rol     esi,            20
+        mov     edi,            esi
+        xor     esi,            edx
+        and     esi,            0fff0000fh
+        xor     edi,            esi
+        xor     edx,            esi
+        ; 
+        rol     edi,            14
+        mov     esi,            edi
+        xor     edi,            edx
+        and     edi,            033333333h
+        xor     esi,            edi
+        xor     edx,            edi
+        ; 
+        rol     edx,            22
+        mov     edi,            edx
+        xor     edx,            esi
+        and     edx,            003fc03fch
+        xor     edi,            edx
+        xor     esi,            edx
+        ; 
+        rol     edi,            9
+        mov     edx,            edi
+        xor     edi,            esi
+        and     edi,            0aaaaaaaah
+        xor     edx,            edi
+        xor     esi,            edi
+        ; 
+        ror     edx,            3
+        ror     esi,            2
+        mov     DWORD PTR 4[ebx],esi
+        mov     eax,            DWORD PTR 36[esp]
+        mov     DWORD PTR [ebx],edx
+        mov     edi,            DWORD PTR 40[esp]
+        mov     esi,            DWORD PTR 44[esp]
+        mov     DWORD PTR 8[esp],1
+        mov     DWORD PTR 4[esp],eax
+        mov     DWORD PTR [esp],ebx
+        call    _des_encrypt2
+        mov     DWORD PTR 8[esp],0
+        mov     DWORD PTR 4[esp],edi
+        mov     DWORD PTR [esp],ebx
+        call    _des_encrypt2
+        mov     DWORD PTR 8[esp],1
+        mov     DWORD PTR 4[esp],esi
+        mov     DWORD PTR [esp],ebx
+        call    _des_encrypt2
+        add     esp,            12
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        ; 
+        ; FP
+        rol     esi,            2
+        rol     edi,            3
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            0aaaaaaaah
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     eax,            23
+        mov     edi,            eax
+        xor     eax,            esi
+        and     eax,            003fc03fch
+        xor     edi,            eax
+        xor     esi,            eax
+        ; 
+        rol     edi,            10
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            033333333h
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     esi,            18
+        mov     edi,            esi
+        xor     esi,            eax
+        and     esi,            0fff0000fh
+        xor     edi,            esi
+        xor     eax,            esi
+        ; 
+        rol     edi,            12
+        mov     esi,            edi
+        xor     edi,            eax
+        and     edi,            0f0f0f0f0h
+        xor     esi,            edi
+        xor     eax,            edi
+        ; 
+        ror     eax,            4
+        mov     DWORD PTR [ebx],eax
+        mov     DWORD PTR 4[ebx],esi
+        pop     edi
+        pop     esi
+        pop     ebp
+        pop     ebx
+        ret
+_des_encrypt3 ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _des_decrypt3
+
+_des_decrypt3 PROC NEAR
+        push    ebx
+        mov     ebx,            DWORD PTR 8[esp]
+        push    ebp
+        push    esi
+        push    edi
+        ; 
+        ; Load the data words
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        sub     esp,            12
+        ; 
+        ; IP
+        rol     edi,            4
+        mov     edx,            edi
+        xor     edi,            esi
+        and     edi,            0f0f0f0f0h
+        xor     edx,            edi
+        xor     esi,            edi
+        ; 
+        rol     esi,            20
+        mov     edi,            esi
+        xor     esi,            edx
+        and     esi,            0fff0000fh
+        xor     edi,            esi
+        xor     edx,            esi
+        ; 
+        rol     edi,            14
+        mov     esi,            edi
+        xor     edi,            edx
+        and     edi,            033333333h
+        xor     esi,            edi
+        xor     edx,            edi
+        ; 
+        rol     edx,            22
+        mov     edi,            edx
+        xor     edx,            esi
+        and     edx,            003fc03fch
+        xor     edi,            edx
+        xor     esi,            edx
+        ; 
+        rol     edi,            9
+        mov     edx,            edi
+        xor     edi,            esi
+        and     edi,            0aaaaaaaah
+        xor     edx,            edi
+        xor     esi,            edi
+        ; 
+        ror     edx,            3
+        ror     esi,            2
+        mov     DWORD PTR 4[ebx],esi
+        mov     esi,            DWORD PTR 36[esp]
+        mov     DWORD PTR [ebx],edx
+        mov     edi,            DWORD PTR 40[esp]
+        mov     eax,            DWORD PTR 44[esp]
+        mov     DWORD PTR 8[esp],0
+        mov     DWORD PTR 4[esp],eax
+        mov     DWORD PTR [esp],ebx
+        call    _des_encrypt2
+        mov     DWORD PTR 8[esp],1
+        mov     DWORD PTR 4[esp],edi
+        mov     DWORD PTR [esp],ebx
+        call    _des_encrypt2
+        mov     DWORD PTR 8[esp],0
+        mov     DWORD PTR 4[esp],esi
+        mov     DWORD PTR [esp],ebx
+        call    _des_encrypt2
+        add     esp,            12
+        mov     edi,            DWORD PTR [ebx]
+        mov     esi,            DWORD PTR 4[ebx]
+        ; 
+        ; FP
+        rol     esi,            2
+        rol     edi,            3
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            0aaaaaaaah
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     eax,            23
+        mov     edi,            eax
+        xor     eax,            esi
+        and     eax,            003fc03fch
+        xor     edi,            eax
+        xor     esi,            eax
+        ; 
+        rol     edi,            10
+        mov     eax,            edi
+        xor     edi,            esi
+        and     edi,            033333333h
+        xor     eax,            edi
+        xor     esi,            edi
+        ; 
+        rol     esi,            18
+        mov     edi,            esi
+        xor     esi,            eax
+        and     esi,            0fff0000fh
+        xor     edi,            esi
+        xor     eax,            esi
+        ; 
+        rol     edi,            12
+        mov     esi,            edi
+        xor     edi,            eax
+        and     edi,            0f0f0f0f0h
+        xor     esi,            edi
+        xor     eax,            edi
+        ; 
+        ror     eax,            4
+        mov     DWORD PTR [ebx],eax
+        mov     DWORD PTR 4[ebx],esi
+        pop     edi
+        pop     esi
+        pop     ebp
+        pop     ebx
+        ret
+_des_decrypt3 ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _des_ncbc_encrypt
+
+_des_ncbc_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        mov     ebp,            DWORD PTR 28[esp]
+        ; getting iv ptr from parameter 4
+        mov     ebx,            DWORD PTR 36[esp]
+        mov     esi,            DWORD PTR [ebx]
+        mov     edi,            DWORD PTR 4[ebx]
+        push    edi
+        push    esi
+        push    edi
+        push    esi
+        mov     ebx,            esp
+        mov     esi,            DWORD PTR 36[esp]
+        mov     edi,            DWORD PTR 40[esp]
+        ; getting encrypt flag from parameter 5
+        mov     ecx,            DWORD PTR 56[esp]
+        ; get and push parameter 5
+        push    ecx
+        ; get and push parameter 3
+        mov     eax,            DWORD PTR 52[esp]
+        push    eax
+        push    ebx
+        cmp     ecx,            0
+        jz      $L004decrypt
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 12[esp]
+        mov     ebx,            DWORD PTR 16[esp]
+        jz      $L005encrypt_finish
+L006encrypt_loop:
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR 4[esi]
+        xor     eax,            ecx
+        xor     ebx,            edx
+        mov     DWORD PTR 12[esp],eax
+        mov     DWORD PTR 16[esp],ebx
+        call    _des_encrypt
+        mov     eax,            DWORD PTR 12[esp]
+        mov     ebx,            DWORD PTR 16[esp]
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L006encrypt_loop
+$L005encrypt_finish:
+        mov     ebp,            DWORD PTR 56[esp]
+        and     ebp,            7
+        jz      $L007finish
+        xor     ecx,            ecx
+        xor     edx,            edx
+        mov     ebp,            DWORD PTR $L008cbc_enc_jmp_table[ebp*4]
+        jmp      ebp
+L009ej7:
+        mov     dh,             BYTE PTR 6[esi]
+        shl     edx,            8
+L010ej6:
+        mov     dh,             BYTE PTR 5[esi]
+L011ej5:
+        mov     dl,             BYTE PTR 4[esi]
+L012ej4:
+        mov     ecx,            DWORD PTR [esi]
+        jmp     $L013ejend
+L014ej3:
+        mov     ch,             BYTE PTR 2[esi]
+        shl     ecx,            8
+L015ej2:
+        mov     ch,             BYTE PTR 1[esi]
+L016ej1:
+        mov     cl,             BYTE PTR [esi]
+$L013ejend:
+        xor     eax,            ecx
+        xor     ebx,            edx
+        mov     DWORD PTR 12[esp],eax
+        mov     DWORD PTR 16[esp],ebx
+        call    _des_encrypt
+        mov     eax,            DWORD PTR 12[esp]
+        mov     ebx,            DWORD PTR 16[esp]
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        jmp     $L007finish
+$L004decrypt:
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 20[esp]
+        mov     ebx,            DWORD PTR 24[esp]
+        jz      $L017decrypt_finish
+L018decrypt_loop:
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 12[esp],eax
+        mov     DWORD PTR 16[esp],ebx
+        call    _des_encrypt
+        mov     eax,            DWORD PTR 12[esp]
+        mov     ebx,            DWORD PTR 16[esp]
+        mov     ecx,            DWORD PTR 20[esp]
+        mov     edx,            DWORD PTR 24[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR [edi],ecx
+        mov     DWORD PTR 4[edi],edx
+        mov     DWORD PTR 20[esp],eax
+        mov     DWORD PTR 24[esp],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L018decrypt_loop
+$L017decrypt_finish:
+        mov     ebp,            DWORD PTR 56[esp]
+        and     ebp,            7
+        jz      $L007finish
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 12[esp],eax
+        mov     DWORD PTR 16[esp],ebx
+        call    _des_encrypt
+        mov     eax,            DWORD PTR 12[esp]
+        mov     ebx,            DWORD PTR 16[esp]
+        mov     ecx,            DWORD PTR 20[esp]
+        mov     edx,            DWORD PTR 24[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+L019dj7:
+        ror     edx,            16
+        mov     BYTE PTR 6[edi],dl
+        shr     edx,            16
+L020dj6:
+        mov     BYTE PTR 5[edi],dh
+L021dj5:
+        mov     BYTE PTR 4[edi],dl
+L022dj4:
+        mov     DWORD PTR [edi],ecx
+        jmp     $L023djend
+L024dj3:
+        ror     ecx,            16
+        mov     BYTE PTR 2[edi],cl
+        shl     ecx,            16
+L025dj2:
+        mov     BYTE PTR 1[esi],ch
+L026dj1:
+        mov     BYTE PTR [esi], cl
+$L023djend:
+        jmp     $L007finish
+$L007finish:
+        mov     ecx,            DWORD PTR 64[esp]
+        add     esp,            28
+        mov     DWORD PTR [ecx],eax
+        mov     DWORD PTR 4[ecx],ebx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+$L008cbc_enc_jmp_table:
+        DD      0
+        DD      L016ej1
+        DD      L015ej2
+        DD      L014ej3
+        DD      L012ej4
+        DD      L011ej5
+        DD      L010ej6
+        DD      L009ej7
+L027cbc_dec_jmp_table:
+        DD      0
+        DD      L026dj1
+        DD      L025dj2
+        DD      L024dj3
+        DD      L022dj4
+        DD      L021dj5
+        DD      L020dj6
+        DD      L019dj7
+_des_ncbc_encrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _des_ede3_cbc_encrypt
+
+_des_ede3_cbc_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        mov     ebp,            DWORD PTR 28[esp]
+        ; getting iv ptr from parameter 6
+        mov     ebx,            DWORD PTR 44[esp]
+        mov     esi,            DWORD PTR [ebx]
+        mov     edi,            DWORD PTR 4[ebx]
+        push    edi
+        push    esi
+        push    edi
+        push    esi
+        mov     ebx,            esp
+        mov     esi,            DWORD PTR 36[esp]
+        mov     edi,            DWORD PTR 40[esp]
+        ; getting encrypt flag from parameter 7
+        mov     ecx,            DWORD PTR 64[esp]
+        ; get and push parameter 5
+        mov     eax,            DWORD PTR 56[esp]
+        push    eax
+        ; get and push parameter 4
+        mov     eax,            DWORD PTR 56[esp]
+        push    eax
+        ; get and push parameter 3
+        mov     eax,            DWORD PTR 56[esp]
+        push    eax
+        push    ebx
+        cmp     ecx,            0
+        jz      $L028decrypt
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        jz      $L029encrypt_finish
+L030encrypt_loop:
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR 4[esi]
+        xor     eax,            ecx
+        xor     ebx,            edx
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        call    _des_encrypt3
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L030encrypt_loop
+$L029encrypt_finish:
+        mov     ebp,            DWORD PTR 60[esp]
+        and     ebp,            7
+        jz      $L031finish
+        xor     ecx,            ecx
+        xor     edx,            edx
+        mov     ebp,            DWORD PTR $L032cbc_enc_jmp_table[ebp*4]
+        jmp      ebp
+L033ej7:
+        mov     dh,             BYTE PTR 6[esi]
+        shl     edx,            8
+L034ej6:
+        mov     dh,             BYTE PTR 5[esi]
+L035ej5:
+        mov     dl,             BYTE PTR 4[esi]
+L036ej4:
+        mov     ecx,            DWORD PTR [esi]
+        jmp     $L037ejend
+L038ej3:
+        mov     ch,             BYTE PTR 2[esi]
+        shl     ecx,            8
+L039ej2:
+        mov     ch,             BYTE PTR 1[esi]
+L040ej1:
+        mov     cl,             BYTE PTR [esi]
+$L037ejend:
+        xor     eax,            ecx
+        xor     ebx,            edx
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        call    _des_encrypt3
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        jmp     $L031finish
+$L028decrypt:
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 24[esp]
+        mov     ebx,            DWORD PTR 28[esp]
+        jz      $L041decrypt_finish
+L042decrypt_loop:
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        call    _des_decrypt3
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        mov     ecx,            DWORD PTR 24[esp]
+        mov     edx,            DWORD PTR 28[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR [edi],ecx
+        mov     DWORD PTR 4[edi],edx
+        mov     DWORD PTR 24[esp],eax
+        mov     DWORD PTR 28[esp],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L042decrypt_loop
+$L041decrypt_finish:
+        mov     ebp,            DWORD PTR 60[esp]
+        and     ebp,            7
+        jz      $L031finish
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        call    _des_decrypt3
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        mov     ecx,            DWORD PTR 24[esp]
+        mov     edx,            DWORD PTR 28[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+L043dj7:
+        ror     edx,            16
+        mov     BYTE PTR 6[edi],dl
+        shr     edx,            16
+L044dj6:
+        mov     BYTE PTR 5[edi],dh
+L045dj5:
+        mov     BYTE PTR 4[edi],dl
+L046dj4:
+        mov     DWORD PTR [edi],ecx
+        jmp     $L047djend
+L048dj3:
+        ror     ecx,            16
+        mov     BYTE PTR 2[edi],cl
+        shl     ecx,            16
+L049dj2:
+        mov     BYTE PTR 1[esi],ch
+L050dj1:
+        mov     BYTE PTR [esi], cl
+$L047djend:
+        jmp     $L031finish
+$L031finish:
+        mov     ecx,            DWORD PTR 76[esp]
+        add     esp,            32
+        mov     DWORD PTR [ecx],eax
+        mov     DWORD PTR 4[ecx],ebx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+$L032cbc_enc_jmp_table:
+        DD      0
+        DD      L040ej1
+        DD      L039ej2
+        DD      L038ej3
+        DD      L036ej4
+        DD      L035ej5
+        DD      L034ej6
+        DD      L033ej7
+L051cbc_dec_jmp_table:
+        DD      0
+        DD      L050dj1
+        DD      L049dj2
+        DD      L048dj3
+        DD      L046dj4
+        DD      L045dj5
+        DD      L044dj6
+        DD      L043dj7
+_des_ede3_cbc_encrypt ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/des/asm/dx86unix.cpp b/src/lib/libcrypto/des/asm/dx86unix.cpp
new file mode 100644
index 0000000000..6fca9afa16
--- /dev/null
+++ b/src/lib/libcrypto/des/asm/dx86unix.cpp
@@ -0,0 +1,3202 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define des_SPtrans _des_SPtrans
+#define des_encrypt _des_encrypt
+#define des_encrypt2 _des_encrypt2
+#define des_encrypt3 _des_encrypt3
+#define des_decrypt3 _des_decrypt3
+#define des_ncbc_encrypt _des_ncbc_encrypt
+#define des_ede3_cbc_encrypt _des_ede3_cbc_encrypt
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by des-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "des-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl des_encrypt
+        TYPE(des_encrypt,@function)
+des_encrypt:
+        pushl   %esi
+        pushl   %edi
+
+        /* Load the 2 words */
+        movl    12(%esp),       %esi
+        xorl    %ecx,           %ecx
+        pushl   %ebx
+        pushl   %ebp
+        movl    (%esi),         %eax
+        movl    28(%esp),       %ebx
+        movl    4(%esi),        %edi
+
+        /* IP */
+        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               /* roll $1 %edi */
+        movl    24(%esp),       %ebp
+        cmpl    $0,             %ebx
+        je      .L000start_decrypt
+
+        /* Round 0 */
+        movl    (%ebp),         %eax
+        xorl    %ebx,           %ebx
+        movl    4(%ebp),        %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 1 */
+        movl    8(%ebp),        %eax
+        xorl    %ebx,           %ebx
+        movl    12(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 2 */
+        movl    16(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    20(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 3 */
+        movl    24(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    28(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 4 */
+        movl    32(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    36(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 5 */
+        movl    40(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    44(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 6 */
+        movl    48(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    52(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 7 */
+        movl    56(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    60(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 8 */
+        movl    64(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    68(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 9 */
+        movl    72(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    76(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 10 */
+        movl    80(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    84(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 11 */
+        movl    88(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    92(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 12 */
+        movl    96(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    100(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 13 */
+        movl    104(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    108(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 14 */
+        movl    112(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    116(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 15 */
+        movl    120(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    124(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+        jmp     .L001end
+.L000start_decrypt:
+
+        /* Round 15 */
+        movl    120(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    124(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 14 */
+        movl    112(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    116(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 13 */
+        movl    104(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    108(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 12 */
+        movl    96(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    100(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 11 */
+        movl    88(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    92(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 10 */
+        movl    80(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    84(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 9 */
+        movl    72(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    76(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 8 */
+        movl    64(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    68(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 7 */
+        movl    56(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    60(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 6 */
+        movl    48(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    52(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 5 */
+        movl    40(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    44(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 4 */
+        movl    32(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    36(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 3 */
+        movl    24(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    28(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 2 */
+        movl    16(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    20(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 1 */
+        movl    8(%ebp),        %eax
+        xorl    %ebx,           %ebx
+        movl    12(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 0 */
+        movl    (%ebp),         %eax
+        xorl    %ebx,           %ebx
+        movl    4(%ebp),        %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+.L001end:
+
+        /* FP */
+        movl    20(%esp),       %edx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        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
+.des_encrypt_end:
+        SIZE(des_encrypt,.des_encrypt_end-des_encrypt)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.globl des_encrypt2
+        TYPE(des_encrypt2,@function)
+des_encrypt2:
+        pushl   %esi
+        pushl   %edi
+
+        /* Load the 2 words */
+        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
+        movl    24(%esp),       %ebp
+        cmpl    $0,             %ebx
+        je      .L002start_decrypt
+
+        /* Round 0 */
+        movl    (%ebp),         %eax
+        xorl    %ebx,           %ebx
+        movl    4(%ebp),        %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 1 */
+        movl    8(%ebp),        %eax
+        xorl    %ebx,           %ebx
+        movl    12(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 2 */
+        movl    16(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    20(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 3 */
+        movl    24(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    28(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 4 */
+        movl    32(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    36(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 5 */
+        movl    40(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    44(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 6 */
+        movl    48(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    52(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 7 */
+        movl    56(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    60(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 8 */
+        movl    64(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    68(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 9 */
+        movl    72(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    76(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 10 */
+        movl    80(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    84(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 11 */
+        movl    88(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    92(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 12 */
+        movl    96(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    100(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 13 */
+        movl    104(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    108(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 14 */
+        movl    112(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    116(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 15 */
+        movl    120(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    124(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+        jmp     .L003end
+.L002start_decrypt:
+
+        /* Round 15 */
+        movl    120(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    124(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 14 */
+        movl    112(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    116(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 13 */
+        movl    104(%ebp),      %eax
+        xorl    %ebx,           %ebx
+        movl    108(%ebp),      %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 12 */
+        movl    96(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    100(%ebp),      %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 11 */
+        movl    88(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    92(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 10 */
+        movl    80(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    84(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 9 */
+        movl    72(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    76(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 8 */
+        movl    64(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    68(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 7 */
+        movl    56(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    60(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 6 */
+        movl    48(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    52(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 5 */
+        movl    40(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    44(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 4 */
+        movl    32(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    36(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 3 */
+        movl    24(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    28(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 2 */
+        movl    16(%ebp),       %eax
+        xorl    %ebx,           %ebx
+        movl    20(%ebp),       %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 1 */
+        movl    8(%ebp),        %eax
+        xorl    %ebx,           %ebx
+        movl    12(%ebp),       %edx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 0 */
+        movl    (%ebp),         %eax
+        xorl    %ebx,           %ebx
+        movl    4(%ebp),        %edx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        andl    $0xcfcfcfcf,    %edx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+.L003end:
+
+        /* Fixup */
+        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
+.des_encrypt2_end:
+        SIZE(des_encrypt2,.des_encrypt2_end-des_encrypt2)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.globl des_encrypt3
+        TYPE(des_encrypt3,@function)
+des_encrypt3:
+        pushl   %ebx
+        movl    8(%esp),        %ebx
+        pushl   %ebp
+        pushl   %esi
+        pushl   %edi
+
+        /* Load the data words */
+        movl    (%ebx),         %edi
+        movl    4(%ebx),        %esi
+        subl    $12,            %esp
+
+        /* IP */
+        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
+
+        /* FP */
+        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
+.des_encrypt3_end:
+        SIZE(des_encrypt3,.des_encrypt3_end-des_encrypt3)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.globl des_decrypt3
+        TYPE(des_decrypt3,@function)
+des_decrypt3:
+        pushl   %ebx
+        movl    8(%esp),        %ebx
+        pushl   %ebp
+        pushl   %esi
+        pushl   %edi
+
+        /* Load the data words */
+        movl    (%ebx),         %edi
+        movl    4(%ebx),        %esi
+        subl    $12,            %esp
+
+        /* IP */
+        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
+
+        /* FP */
+        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
+.des_decrypt3_end:
+        SIZE(des_decrypt3,.des_decrypt3_end-des_decrypt3)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.globl des_ncbc_encrypt
+        TYPE(des_ncbc_encrypt,@function)
+des_ncbc_encrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+        movl    28(%esp),       %ebp
+        /* getting iv ptr from parameter 4 */
+        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
+        /* getting encrypt flag from parameter 5 */
+        movl    56(%esp),       %ecx
+        /* get and push parameter 5 */
+        pushl   %ecx
+        /* get and push parameter 3 */
+        movl    52(%esp),       %eax
+        pushl   %eax
+        pushl   %ebx
+        cmpl    $0,             %ecx
+        jz      .L004decrypt
+        andl    $4294967288,    %ebp
+        movl    12(%esp),       %eax
+        movl    16(%esp),       %ebx
+        jz      .L005encrypt_finish
+.L006encrypt_loop:
+        movl    (%esi),         %ecx
+        movl    4(%esi),        %edx
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+        movl    %eax,           12(%esp)
+        movl    %ebx,           16(%esp)
+        call    des_encrypt
+        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     .L006encrypt_loop
+.L005encrypt_finish:
+        movl    56(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L007finish
+        xorl    %ecx,           %ecx
+        xorl    %edx,           %edx
+        movl    .L008cbc_enc_jmp_table(,%ebp,4),%ebp
+        jmp     *%ebp
+.L009ej7:
+        movb    6(%esi),        %dh
+        sall    $8,             %edx
+.L010ej6:
+        movb    5(%esi),        %dh
+.L011ej5:
+        movb    4(%esi),        %dl
+.L012ej4:
+        movl    (%esi),         %ecx
+        jmp     .L013ejend
+.L014ej3:
+        movb    2(%esi),        %ch
+        sall    $8,             %ecx
+.L015ej2:
+        movb    1(%esi),        %ch
+.L016ej1:
+        movb    (%esi),         %cl
+.L013ejend:
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+        movl    %eax,           12(%esp)
+        movl    %ebx,           16(%esp)
+        call    des_encrypt
+        movl    12(%esp),       %eax
+        movl    16(%esp),       %ebx
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        jmp     .L007finish
+.align ALIGN
+.L004decrypt:
+        andl    $4294967288,    %ebp
+        movl    20(%esp),       %eax
+        movl    24(%esp),       %ebx
+        jz      .L017decrypt_finish
+.L018decrypt_loop:
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %eax,           12(%esp)
+        movl    %ebx,           16(%esp)
+        call    des_encrypt
+        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     .L018decrypt_loop
+.L017decrypt_finish:
+        movl    56(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L007finish
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %eax,           12(%esp)
+        movl    %ebx,           16(%esp)
+        call    des_encrypt
+        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
+.L019dj7:
+        rorl    $16,            %edx
+        movb    %dl,            6(%edi)
+        shrl    $16,            %edx
+.L020dj6:
+        movb    %dh,            5(%edi)
+.L021dj5:
+        movb    %dl,            4(%edi)
+.L022dj4:
+        movl    %ecx,           (%edi)
+        jmp     .L023djend
+.L024dj3:
+        rorl    $16,            %ecx
+        movb    %cl,            2(%edi)
+        sall    $16,            %ecx
+.L025dj2:
+        movb    %ch,            1(%esi)
+.L026dj1:
+        movb    %cl,            (%esi)
+.L023djend:
+        jmp     .L007finish
+.align ALIGN
+.L007finish:
+        movl    64(%esp),       %ecx
+        addl    $28,            %esp
+        movl    %eax,           (%ecx)
+        movl    %ebx,           4(%ecx)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.align ALIGN
+.L008cbc_enc_jmp_table:
+        .long 0
+        .long .L016ej1
+        .long .L015ej2
+        .long .L014ej3
+        .long .L012ej4
+        .long .L011ej5
+        .long .L010ej6
+        .long .L009ej7
+.align ALIGN
+.L027cbc_dec_jmp_table:
+        .long 0
+        .long .L026dj1
+        .long .L025dj2
+        .long .L024dj3
+        .long .L022dj4
+        .long .L021dj5
+        .long .L020dj6
+        .long .L019dj7
+.des_ncbc_encrypt_end:
+        SIZE(des_ncbc_encrypt,.des_ncbc_encrypt_end-des_ncbc_encrypt)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.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
+        /* getting iv ptr from parameter 6 */
+        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
+        /* getting encrypt flag from parameter 7 */
+        movl    64(%esp),       %ecx
+        /* get and push parameter 5 */
+        movl    56(%esp),       %eax
+        pushl   %eax
+        /* get and push parameter 4 */
+        movl    56(%esp),       %eax
+        pushl   %eax
+        /* get and push parameter 3 */
+        movl    56(%esp),       %eax
+        pushl   %eax
+        pushl   %ebx
+        cmpl    $0,             %ecx
+        jz      .L028decrypt
+        andl    $4294967288,    %ebp
+        movl    16(%esp),       %eax
+        movl    20(%esp),       %ebx
+        jz      .L029encrypt_finish
+.L030encrypt_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     .L030encrypt_loop
+.L029encrypt_finish:
+        movl    60(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L031finish
+        xorl    %ecx,           %ecx
+        xorl    %edx,           %edx
+        movl    .L032cbc_enc_jmp_table(,%ebp,4),%ebp
+        jmp     *%ebp
+.L033ej7:
+        movb    6(%esi),        %dh
+        sall    $8,             %edx
+.L034ej6:
+        movb    5(%esi),        %dh
+.L035ej5:
+        movb    4(%esi),        %dl
+.L036ej4:
+        movl    (%esi),         %ecx
+        jmp     .L037ejend
+.L038ej3:
+        movb    2(%esi),        %ch
+        sall    $8,             %ecx
+.L039ej2:
+        movb    1(%esi),        %ch
+.L040ej1:
+        movb    (%esi),         %cl
+.L037ejend:
+        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     .L031finish
+.align ALIGN
+.L028decrypt:
+        andl    $4294967288,    %ebp
+        movl    24(%esp),       %eax
+        movl    28(%esp),       %ebx
+        jz      .L041decrypt_finish
+.L042decrypt_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     .L042decrypt_loop
+.L041decrypt_finish:
+        movl    60(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L031finish
+        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
+.L043dj7:
+        rorl    $16,            %edx
+        movb    %dl,            6(%edi)
+        shrl    $16,            %edx
+.L044dj6:
+        movb    %dh,            5(%edi)
+.L045dj5:
+        movb    %dl,            4(%edi)
+.L046dj4:
+        movl    %ecx,           (%edi)
+        jmp     .L047djend
+.L048dj3:
+        rorl    $16,            %ecx
+        movb    %cl,            2(%edi)
+        sall    $16,            %ecx
+.L049dj2:
+        movb    %ch,            1(%esi)
+.L050dj1:
+        movb    %cl,            (%esi)
+.L047djend:
+        jmp     .L031finish
+.align ALIGN
+.L031finish:
+        movl    76(%esp),       %ecx
+        addl    $32,            %esp
+        movl    %eax,           (%ecx)
+        movl    %ebx,           4(%ecx)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.align ALIGN
+.L032cbc_enc_jmp_table:
+        .long 0
+        .long .L040ej1
+        .long .L039ej2
+        .long .L038ej3
+        .long .L036ej4
+        .long .L035ej5
+        .long .L034ej6
+        .long .L033ej7
+.align ALIGN
+.L051cbc_dec_jmp_table:
+        .long 0
+        .long .L050dj1
+        .long .L049dj2
+        .long .L048dj3
+        .long .L046dj4
+        .long .L045dj5
+        .long .L044dj6
+        .long .L043dj7
+.des_ede3_cbc_encrypt_end:
+        SIZE(des_ede3_cbc_encrypt,.des_ede3_cbc_encrypt_end-des_ede3_cbc_encrypt)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/des/asm/y-win32.asm b/src/lib/libcrypto/des/asm/y-win32.asm
new file mode 100644
index 0000000000..af5c102422
--- /dev/null
+++ b/src/lib/libcrypto/des/asm/y-win32.asm
@@ -0,0 +1,929 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by crypt586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   crypt586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _fcrypt_body
+EXTRN   _des_SPtrans:DWORD
+_fcrypt_body PROC NEAR
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        ; 
+        ; Load the 2 words
+        xor     edi,            edi
+        xor     esi,            esi
+        mov     ebp,            DWORD PTR 24[esp]
+        push    25
+L000start:
+        ; 
+        ; Round 0
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR [ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 4[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 1
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 8[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 12[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 2
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 16[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 20[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 3
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 24[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 28[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 4
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 32[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 36[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 5
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 40[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 44[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 6
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 48[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 52[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 7
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 56[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 60[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 8
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 64[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 68[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 9
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 72[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 76[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 10
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 80[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 84[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 11
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 88[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 92[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 12
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 96[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 100[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 13
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 104[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 108[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        ; 
+        ; Round 14
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            esi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            esi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 112[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 116[ebp]
+        xor     eax,            esi
+        xor     edx,            esi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     edi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     edi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     edi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     edi,            ebx
+        ; 
+        ; Round 15
+        mov     eax,            DWORD PTR 32[esp]
+        mov     edx,            edi
+        shr     edx,            16
+        mov     ecx,            DWORD PTR 36[esp]
+        xor     edx,            edi
+        and     eax,            edx
+        and     edx,            ecx
+        mov     ebx,            eax
+        shl     ebx,            16
+        mov     ecx,            edx
+        shl     ecx,            16
+        xor     eax,            ebx
+        xor     edx,            ecx
+        mov     ebx,            DWORD PTR 120[ebp]
+        xor     eax,            ebx
+        mov     ecx,            DWORD PTR 124[ebp]
+        xor     eax,            edi
+        xor     edx,            edi
+        xor     edx,            ecx
+        and     eax,            0fcfcfcfch
+        xor     ebx,            ebx
+        and     edx,            0cfcfcfcfh
+        xor     ecx,            ecx
+        mov     bl,             al
+        mov     cl,             ah
+        ror     edx,            4
+        mov     ebp,            DWORD PTR _des_SPtrans[ebx]
+        mov     bl,             dl
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR _des_SPtrans[0200h+ecx]
+        xor     esi,            ebp
+        mov     cl,             dh
+        shr     eax,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0100h+ebx]
+        xor     esi,            ebp
+        mov     bl,             ah
+        shr     edx,            16
+        mov     ebp,            DWORD PTR _des_SPtrans[0300h+ecx]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        mov     cl,             dh
+        and     eax,            0ffh
+        and     edx,            0ffh
+        mov     ebx,            DWORD PTR _des_SPtrans[0600h+ebx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0700h+ecx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0400h+eax]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR _des_SPtrans[0500h+edx]
+        xor     esi,            ebx
+        mov     ebx,            DWORD PTR [esp]
+        mov     eax,            edi
+        dec     ebx
+        mov     edi,            esi
+        mov     esi,            eax
+        mov     DWORD PTR [esp],ebx
+        jnz     L000start
+        ; 
+        ; FP
+        mov     edx,            DWORD PTR 24[esp]
+        ror     edi,            1
+        mov     eax,            esi
+        xor     esi,            edi
+        and     esi,            0aaaaaaaah
+        xor     eax,            esi
+        xor     edi,            esi
+        ; 
+        rol     eax,            23
+        mov     esi,            eax
+        xor     eax,            edi
+        and     eax,            003fc03fch
+        xor     esi,            eax
+        xor     edi,            eax
+        ; 
+        rol     esi,            10
+        mov     eax,            esi
+        xor     esi,            edi
+        and     esi,            033333333h
+        xor     eax,            esi
+        xor     edi,            esi
+        ; 
+        rol     edi,            18
+        mov     esi,            edi
+        xor     edi,            eax
+        and     edi,            0fff0000fh
+        xor     esi,            edi
+        xor     eax,            edi
+        ; 
+        rol     esi,            12
+        mov     edi,            esi
+        xor     esi,            eax
+        and     esi,            0f0f0f0f0h
+        xor     edi,            esi
+        xor     eax,            esi
+        ; 
+        ror     eax,            4
+        mov     DWORD PTR [edx],eax
+        mov     DWORD PTR 4[edx],edi
+        pop     ecx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_fcrypt_body ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/des/asm/yx86unix.cpp b/src/lib/libcrypto/des/asm/yx86unix.cpp
new file mode 100644
index 0000000000..8719e38607
--- /dev/null
+++ b/src/lib/libcrypto/des/asm/yx86unix.cpp
@@ -0,0 +1,976 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define des_SPtrans _des_SPtrans
+#define fcrypt_body _fcrypt_body
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by crypt586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "crypt586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl fcrypt_body
+        TYPE(fcrypt_body,@function)
+fcrypt_body:
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+
+
+        /* Load the 2 words */
+        xorl    %edi,           %edi
+        xorl    %esi,           %esi
+        movl    24(%esp),       %ebp
+        pushl   $25
+.L000start:
+
+        /* Round 0 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    (%ebp),         %ebx
+        xorl    %ebx,           %eax
+        movl    4(%ebp),        %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 1 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    8(%ebp),        %ebx
+        xorl    %ebx,           %eax
+        movl    12(%ebp),       %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 2 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    16(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    20(%ebp),       %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 3 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    24(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    28(%ebp),       %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 4 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    32(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    36(%ebp),       %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 5 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    40(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    44(%ebp),       %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 6 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    48(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    52(%ebp),       %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 7 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    56(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    60(%ebp),       %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 8 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    64(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    68(%ebp),       %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 9 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    72(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    76(%ebp),       %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 10 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    80(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    84(%ebp),       %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 11 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    88(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    92(%ebp),       %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 12 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    96(%ebp),       %ebx
+        xorl    %ebx,           %eax
+        movl    100(%ebp),      %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 13 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    104(%ebp),      %ebx
+        xorl    %ebx,           %eax
+        movl    108(%ebp),      %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+
+        /* Round 14 */
+        movl    32(%esp),       %eax
+        movl    %esi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %esi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    112(%ebp),      %ebx
+        xorl    %ebx,           %eax
+        movl    116(%ebp),      %ecx
+        xorl    %esi,           %eax
+        xorl    %esi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %edi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %edi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %edi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %edi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %edi
+
+        /* Round 15 */
+        movl    32(%esp),       %eax
+        movl    %edi,           %edx
+        shrl    $16,            %edx
+        movl    36(%esp),       %ecx
+        xorl    %edi,           %edx
+        andl    %edx,           %eax
+        andl    %ecx,           %edx
+        movl    %eax,           %ebx
+        sall    $16,            %ebx
+        movl    %edx,           %ecx
+        sall    $16,            %ecx
+        xorl    %ebx,           %eax
+        xorl    %ecx,           %edx
+        movl    120(%ebp),      %ebx
+        xorl    %ebx,           %eax
+        movl    124(%ebp),      %ecx
+        xorl    %edi,           %eax
+        xorl    %edi,           %edx
+        xorl    %ecx,           %edx
+        andl    $0xfcfcfcfc,    %eax
+        xorl    %ebx,           %ebx
+        andl    $0xcfcfcfcf,    %edx
+        xorl    %ecx,           %ecx
+        movb    %al,            %bl
+        movb    %ah,            %cl
+        rorl    $4,             %edx
+        movl          des_SPtrans(%ebx),%ebp
+        movb    %dl,            %bl
+        xorl    %ebp,           %esi
+        movl    0x200+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movb    %dh,            %cl
+        shrl    $16,            %eax
+        movl    0x100+des_SPtrans(%ebx),%ebp
+        xorl    %ebp,           %esi
+        movb    %ah,            %bl
+        shrl    $16,            %edx
+        movl    0x300+des_SPtrans(%ecx),%ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        movb    %dh,            %cl
+        andl    $0xff,          %eax
+        andl    $0xff,          %edx
+        movl    0x600+des_SPtrans(%ebx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x700+des_SPtrans(%ecx),%ebx
+        xorl    %ebx,           %esi
+        movl    0x400+des_SPtrans(%eax),%ebx
+        xorl    %ebx,           %esi
+        movl    0x500+des_SPtrans(%edx),%ebx
+        xorl    %ebx,           %esi
+        movl    (%esp),         %ebx
+        movl    %edi,           %eax
+        decl    %ebx
+        movl    %esi,           %edi
+        movl    %eax,           %esi
+        movl    %ebx,           (%esp)
+        jnz     .L000start
+
+        /* FP */
+        movl    24(%esp),       %edx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        movl    %esi,           %eax
+        xorl    %edi,           %esi
+        andl    $0xaaaaaaaa,    %esi
+        xorl    %esi,           %eax
+        xorl    %esi,           %edi
+
+        roll    $23,            %eax
+        movl    %eax,           %esi
+        xorl    %edi,           %eax
+        andl    $0x03fc03fc,    %eax
+        xorl    %eax,           %esi
+        xorl    %eax,           %edi
+
+        roll    $10,            %esi
+        movl    %esi,           %eax
+        xorl    %edi,           %esi
+        andl    $0x33333333,    %esi
+        xorl    %esi,           %eax
+        xorl    %esi,           %edi
+
+        roll    $18,            %edi
+        movl    %edi,           %esi
+        xorl    %eax,           %edi
+        andl    $0xfff0000f,    %edi
+        xorl    %edi,           %esi
+        xorl    %edi,           %eax
+
+        roll    $12,            %esi
+        movl    %esi,           %edi
+        xorl    %eax,           %esi
+        andl    $0xf0f0f0f0,    %esi
+        xorl    %esi,           %edi
+        xorl    %esi,           %eax
+
+        rorl    $4,             %eax
+        movl    %eax,           (%edx)
+        movl    %edi,           4(%edx)
+        popl    %ecx
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.fcrypt_body_end:
+        SIZE(fcrypt_body,.fcrypt_body_end-fcrypt_body)
+.ident  "fcrypt_body"
diff --git a/src/lib/libcrypto/des/des.man b/src/lib/libcrypto/des/des.man
new file mode 100644
index 0000000000..7e06a1851a
--- /dev/null
+++ b/src/lib/libcrypto/des/des.man
@@ -0,0 +1,186 @@
+.TH DES 1 
+.SH NAME
+des - encrypt or decrypt data using Data Encryption Standard
+.SH SYNOPSIS
+.B des
+(
+.B \-e
+|
+.B \-E
+) | (
+.B \-d
+|
+.B \-D
+) | (
+.B \-\fR[\fPcC\fR][\fPckname\fR]\fP
+) |
+[
+.B \-b3hfs
+] [
+.B \-k
+.I key
+]
+] [
+.B \-u\fR[\fIuuname\fR]
+[
+.I input-file
+[
+.I output-file
+] ]
+.SH DESCRIPTION
+.B des
+encrypts and decrypts data using the
+Data Encryption Standard algorithm.
+One of
+.B \-e, \-E
+(for encrypt) or
+.B \-d, \-D
+(for decrypt) must be specified.
+It is also possible to use
+.B \-c
+or
+.B \-C
+in conjunction or instead of the a encrypt/decrypt option to generate
+a 16 character hexadecimal checksum, generated via the
+.I des_cbc_cksum.
+.LP
+Two standard encryption modes are supported by the
+.B des
+program, Cipher Block Chaining (the default) and Electronic Code Book
+(specified with
+.B \-b
+).
+.LP
+The key used for the DES
+algorithm is obtained by prompting the user unless the
+.B `\-k
+.I key'
+option is given.
+If the key is an argument to the
+.B des
+command, it is potentially visible to users executing
+.BR ps (1)
+or a derivative.  To minimise this possibility,
+.B des
+takes care to destroy the key argument immediately upon entry.
+If your shell keeps a history file be careful to make sure it is not
+world readable.
+.LP
+Since this program attempts to maintain compatability with sunOS's
+des(1) command, there are 2 different methods used to convert the user
+supplied key to a des key.
+Whenever and one or more of
+.B \-E, \-D, \-C
+or
+.B \-3
+options are used, the key conversion procedure will not be compatible
+with the sunOS des(1) version but will use all the user supplied
+character to generate the des key.
+.B des
+command reads from standard input unless
+.I input-file
+is specified and writes to standard output unless
+.I output-file
+is given.
+.SH OPTIONS
+.TP
+.B \-b
+Select ECB
+(eight bytes at a time) encryption mode.
+.TP
+.B \-3
+Encrypt using triple encryption.
+By default triple cbc encryption is used but if the
+.B \-b
+option is used then triple ecb encryption is performed.
+If the key is less than 8 characters long, the flag has no effect.
+.TP
+.B \-e
+Encrypt data using an 8 byte key in a manner compatible with sunOS
+des(1).
+.TP
+.B \-E
+Encrypt data using a key of nearly unlimited length (1024 bytes).
+This will product a more secure encryption.
+.TP
+.B \-d
+Decrypt data that was encrypted with the \-e option.
+.TP
+.B \-D
+Decrypt data that was encrypted with the \-E option.
+.TP
+.B \-c
+Generate a 16 character hexadecimal cbc checksum and output this to
+stderr.
+If a filename was specified after the
+.B \-c
+option, the checksum is output to that file.
+The checksum is generated using a key generated in a sunOS compatible
+manner.
+.TP
+.B \-C
+A cbc checksum is generated in the same manner as described for the
+.B \-c
+option but the DES key is generated in the same manner as used for the
+.B \-E
+and
+.B \-D
+options
+.TP
+.B \-f
+Does nothing - allowed for compatibility with sunOS des(1) command.
+.TP
+.B \-s
+Does nothing - allowed for compatibility with sunOS des(1) command.
+.TP
+.B "\-k \fIkey\fP"
+Use the encryption 
+.I key
+specified.
+.TP
+.B "\-h"
+The
+.I key
+is assumed to be a 16 character hexadecimal number.
+If the
+.B "\-3"
+option is used the key is assumed to be a 32 character hexadecimal
+number.
+.TP
+.B \-u
+This flag is used to read and write uuencoded files.  If decrypting,
+the input file is assumed to contain uuencoded, DES encrypted data.
+If encrypting, the characters following the -u are used as the name of
+the uuencoded file to embed in the begin line of the uuencoded
+output.  If there is no name specified after the -u, the name text.des
+will be embedded in the header.
+.SH SEE ALSO
+.B ps (1)
+.B des_crypt(3)
+.SH BUGS
+.LP
+The problem with using the
+.B -e
+option is the short key length.
+It would be better to use a real 56-bit key rather than an
+ASCII-based 56-bit pattern.  Knowing that the key was derived from ASCII
+radically reduces the time necessary for a brute-force cryptographic attack.
+My attempt to remove this problem is to add an alternative text-key to
+DES-key function.  This alternative function (accessed via
+.B -E, -D, -S
+and
+.B -3
+)
+uses DES to help generate the key.
+.LP
+Be carefully when using the -u option.  Doing des -ud <filename> will
+not decrypt filename (the -u option will gobble the d option).
+.LP
+The VMS operating system operates in a world where files are always a
+multiple of 512 bytes.  This causes problems when encrypted data is
+send from unix to VMS since a 88 byte file will suddenly be padded
+with 424 null bytes.  To get around this problem, use the -u option
+to uuencode the data before it is send to the VMS system.
+.SH AUTHOR
+.LP
+Eric Young (eay@cryptsoft.com)
diff --git a/src/lib/libcrypto/des/des.org b/src/lib/libcrypto/des/des.org
new file mode 100644
index 0000000000..a4cf5c8770
--- /dev/null
+++ b/src/lib/libcrypto/des/des.org
@@ -0,0 +1,301 @@
+/* crypto/des/des.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
+ *
+ * Always modify des.org since des.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+#ifndef HEADER_DES_H
+#define HEADER_DES_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+
+/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+ * %20 speed up (longs are 8 bytes, int's are 4). */
+#ifndef DES_LONG
+#define DES_LONG unsigned long
+#endif
+
+typedef unsigned char des_cblock[8];
+typedef struct des_ks_struct
+        {
+        union   {
+                des_cblock _;
+                /* make sure things are correct size on machines with
+                 * 8 byte longs */
+                DES_LONG pad[2];
+                } ks;
+#undef _
+#define _       ks._
+        } des_key_schedule[16];
+
+#define DES_KEY_SZ      (sizeof(des_cblock))
+#define DES_SCHEDULE_SZ (sizeof(des_key_schedule))
+
+#define DES_ENCRYPT     1
+#define DES_DECRYPT     0
+
+#define DES_CBC_MODE    0
+#define DES_PCBC_MODE   1
+
+#define des_ecb2_encrypt(i,o,k1,k2,e) \
+        des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
+
+#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
+        des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
+
+#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
+        des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
+
+#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
+        des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
+
+#define C_Block des_cblock
+#define Key_schedule des_key_schedule
+#ifdef KERBEROS
+#define ENCRYPT DES_ENCRYPT
+#define DECRYPT DES_DECRYPT
+#endif
+#define KEY_SZ DES_KEY_SZ
+#define string_to_key des_string_to_key
+#define read_pw_string des_read_pw_string
+#define random_key des_random_key
+#define pcbc_encrypt des_pcbc_encrypt
+#define set_key des_set_key
+#define key_sched des_key_sched
+#define ecb_encrypt des_ecb_encrypt
+#define cbc_encrypt des_cbc_encrypt
+#define ncbc_encrypt des_ncbc_encrypt
+#define xcbc_encrypt des_xcbc_encrypt
+#define cbc_cksum des_cbc_cksum
+#define quad_cksum des_quad_cksum
+
+/* For compatibility with the MIT lib - eay 20/05/92 */
+typedef des_key_schedule bit_64;
+#define des_fixup_key_parity des_set_odd_parity
+#define des_check_key_parity check_parity
+
+extern int des_check_key;       /* defaults to false */
+extern int des_rw_mode;         /* defaults to DES_PCBC_MODE */
+
+/* The next line is used to disable full ANSI prototypes, if your
+ * compiler has problems with the prototypes, make sure this line always
+ * evaluates to true :-) */
+#if defined(MSDOS) || defined(__STDC__)
+#undef NOPROTO
+#endif
+#ifndef NOPROTO
+char *des_options(void);
+void des_ecb3_encrypt(des_cblock *input,des_cblock *output,
+        des_key_schedule ks1,des_key_schedule ks2,
+        des_key_schedule ks3, int enc);
+DES_LONG des_cbc_cksum(des_cblock *input,des_cblock *output,
+        long length,des_key_schedule schedule,des_cblock *ivec);
+void des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
+        des_key_schedule schedule,des_cblock *ivec,int enc);
+void des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
+        des_key_schedule schedule,des_cblock *ivec,int enc);
+void des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+        des_key_schedule schedule,des_cblock *ivec,
+        des_cblock *inw,des_cblock *outw,int enc);
+void des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
+        long length,des_key_schedule schedule,des_cblock *ivec,int enc);
+void des_ecb_encrypt(des_cblock *input,des_cblock *output,
+        des_key_schedule ks,int enc);
+void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
+void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
+void des_encrypt3(DES_LONG *data, des_key_schedule ks1,
+        des_key_schedule ks2, des_key_schedule ks3);
+void des_decrypt3(DES_LONG *data, des_key_schedule ks1,
+        des_key_schedule ks2, des_key_schedule ks3);
+void des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
+        long length, des_key_schedule ks1, des_key_schedule ks2, 
+        des_key_schedule ks3, des_cblock *ivec, int enc);
+void des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
+        long length, des_key_schedule ks1, des_key_schedule ks2,
+        des_key_schedule ks3, des_cblock *ivec, int *num, int enc);
+void des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
+        long length, des_key_schedule ks1, des_key_schedule ks2,
+        des_key_schedule ks3, des_cblock *ivec, int *num);
+
+void des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
+        des_cblock (*out_white));
+
+int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
+        des_cblock *iv);
+int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
+        des_cblock *iv);
+char *des_fcrypt(const char *buf,const char *salt, char *ret);
+#ifdef PERL5
+char *des_crypt(const char *buf,const char *salt);
+#else
+/* some stupid compilers complain because I have declared char instead
+ * of const char */
+#ifdef HEADER_DES_LOCL_H
+char *crypt(const char *buf,const char *salt);
+#else
+char *crypt();
+#endif
+#endif
+void des_ofb_encrypt(unsigned char *in,unsigned char *out,
+        int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
+void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
+        des_key_schedule schedule,des_cblock *ivec,int enc);
+DES_LONG des_quad_cksum(des_cblock *input,des_cblock *output,
+        long length,int out_count,des_cblock *seed);
+void des_random_seed(des_cblock key);
+void des_random_key(des_cblock ret);
+int des_read_password(des_cblock *key,char *prompt,int verify);
+int des_read_2passwords(des_cblock *key1,des_cblock *key2,
+        char *prompt,int verify);
+int des_read_pw_string(char *buf,int length,char *prompt,int verify);
+void des_set_odd_parity(des_cblock *key);
+int des_is_weak_key(des_cblock *key);
+int des_set_key(des_cblock *key,des_key_schedule schedule);
+int des_key_sched(des_cblock *key,des_key_schedule schedule);
+void des_string_to_key(char *str,des_cblock *key);
+void des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
+void des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+        des_key_schedule schedule, des_cblock *ivec, int *num, int enc);
+void des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
+        des_key_schedule schedule, des_cblock *ivec, int *num);
+int des_read_pw(char *buf, char *buff, int size, char *prompt, int verify);
+
+/* Extra functions from Mark Murray <mark@grondar.za> */
+void des_cblock_print_file(des_cblock *cb, FILE *fp);
+/* The following functions are not in the normal unix build or the
+ * SSLeay build.  When using the SSLeay build, use RAND_seed()
+ * and RAND_bytes() instead. */
+int des_new_random_key(des_cblock *key);
+void des_init_random_number_generator(des_cblock *key);
+void des_set_random_generator_seed(des_cblock *key);
+void des_set_sequence_number(des_cblock new_sequence_number);
+void des_generate_random_block(des_cblock *block);
+
+#else
+
+char *des_options();
+void des_ecb3_encrypt();
+DES_LONG des_cbc_cksum();
+void des_cbc_encrypt();
+void des_ncbc_encrypt();
+void des_xcbc_encrypt();
+void des_cfb_encrypt();
+void des_ede3_cfb64_encrypt();
+void des_ede3_ofb64_encrypt();
+void des_ecb_encrypt();
+void des_encrypt();
+void des_encrypt2();
+void des_encrypt3();
+void des_decrypt3();
+void des_ede3_cbc_encrypt();
+int des_enc_read();
+int des_enc_write();
+char *des_fcrypt();
+#ifdef PERL5
+char *des_crypt();
+#else
+char *crypt();
+#endif
+void des_ofb_encrypt();
+void des_pcbc_encrypt();
+DES_LONG des_quad_cksum();
+void des_random_seed();
+void des_random_key();
+int des_read_password();
+int des_read_2passwords();
+int des_read_pw_string();
+void des_set_odd_parity();
+int des_is_weak_key();
+int des_set_key();
+int des_key_sched();
+void des_string_to_key();
+void des_string_to_2keys();
+void des_cfb64_encrypt();
+void des_ofb64_encrypt();
+int des_read_pw();
+void des_xwhite_in2out();
+
+/* Extra functions from Mark Murray <mark@grondar.za> */
+void des_cblock_print_file();
+/* The following functions are not in the normal unix build or the
+ * SSLeay build.  When using the SSLeay build, use RAND_seed()
+ * and RAND_bytes() instead. */
+#ifdef FreeBSD
+int des_new_random_key();
+void des_init_random_number_generator();
+void des_set_random_generator_seed();
+void des_set_sequence_number();
+void des_generate_random_block();
+#endif
+
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/lib/libcrypto/des/des.pl b/src/lib/libcrypto/des/des.pl
new file mode 100644
index 0000000000..935eacb504
--- /dev/null
+++ b/src/lib/libcrypto/des/des.pl
@@ -0,0 +1,552 @@
+#!/usr/bin/perl
+# des.pl - eric young 22/11/1991 eay@cryptsoft.com
+#
+# Copyright (C) 1993 Eric Young
+#
+# 11 April 1996 - patched to circumvent Perl 5 (through 5.002) problem
+#                 with sign-extension on right shift operations.
+#                 Ed Kubaitis - ejk@uiuc.edu
+#
+# eay - 92/08/31 - I think I have fixed all problems for 64bit
+# versions of perl but I could be wrong since I have not tested it yet :-).
+#
+# This is an implementation of DES in perl.
+# The two routines (des_set_key and des_ecb_encrypt)
+# take 8 byte objects as arguments.
+#
+# des_set_key takes an 8 byte string as a key and returns a key schedule
+# for use in calls to des_ecb_encrypt.
+# des_ecb_encrypt takes three arguments, the first is a key schedule
+# (make sure to pass it by reference with the *), the second is 1
+# to encrypt, 0 to decrypt.  The third argument is an 8 byte object
+# to encrypt.  The function returns an 8 byte object that has been
+# DES encrypted.
+#
+# example:
+# require 'des.pl'
+#
+# $key =pack("C8",0x12,0x23,0x45,0x67,0x89,0xab,0xcd,0xef);
+# @ks=  &des_set_key($key);
+#
+# $outbytes= &des_ecb_encrypt(*ks,1,$data);
+# @enc =unpack("C8",$outbytes);
+#
+                 
+package des;
+
+eval("use integer;") if (int($]) > 4);
+
+# The following 8 arrays are used in des_set_key
+@skb0=(
+# for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 
+0x00000000,0x00000010,0x20000000,0x20000010,
+0x00010000,0x00010010,0x20010000,0x20010010,
+0x00000800,0x00000810,0x20000800,0x20000810,
+0x00010800,0x00010810,0x20010800,0x20010810,
+0x00000020,0x00000030,0x20000020,0x20000030,
+0x00010020,0x00010030,0x20010020,0x20010030,
+0x00000820,0x00000830,0x20000820,0x20000830,
+0x00010820,0x00010830,0x20010820,0x20010830,
+0x00080000,0x00080010,0x20080000,0x20080010,
+0x00090000,0x00090010,0x20090000,0x20090010,
+0x00080800,0x00080810,0x20080800,0x20080810,
+0x00090800,0x00090810,0x20090800,0x20090810,
+0x00080020,0x00080030,0x20080020,0x20080030,
+0x00090020,0x00090030,0x20090020,0x20090030,
+0x00080820,0x00080830,0x20080820,0x20080830,
+0x00090820,0x00090830,0x20090820,0x20090830,
+);
+@skb1=(
+# for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 
+0x00000000,0x02000000,0x00002000,0x02002000,
+0x00200000,0x02200000,0x00202000,0x02202000,
+0x00000004,0x02000004,0x00002004,0x02002004,
+0x00200004,0x02200004,0x00202004,0x02202004,
+0x00000400,0x02000400,0x00002400,0x02002400,
+0x00200400,0x02200400,0x00202400,0x02202400,
+0x00000404,0x02000404,0x00002404,0x02002404,
+0x00200404,0x02200404,0x00202404,0x02202404,
+0x10000000,0x12000000,0x10002000,0x12002000,
+0x10200000,0x12200000,0x10202000,0x12202000,
+0x10000004,0x12000004,0x10002004,0x12002004,
+0x10200004,0x12200004,0x10202004,0x12202004,
+0x10000400,0x12000400,0x10002400,0x12002400,
+0x10200400,0x12200400,0x10202400,0x12202400,
+0x10000404,0x12000404,0x10002404,0x12002404,
+0x10200404,0x12200404,0x10202404,0x12202404,
+);
+@skb2=(
+# for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 
+0x00000000,0x00000001,0x00040000,0x00040001,
+0x01000000,0x01000001,0x01040000,0x01040001,
+0x00000002,0x00000003,0x00040002,0x00040003,
+0x01000002,0x01000003,0x01040002,0x01040003,
+0x00000200,0x00000201,0x00040200,0x00040201,
+0x01000200,0x01000201,0x01040200,0x01040201,
+0x00000202,0x00000203,0x00040202,0x00040203,
+0x01000202,0x01000203,0x01040202,0x01040203,
+0x08000000,0x08000001,0x08040000,0x08040001,
+0x09000000,0x09000001,0x09040000,0x09040001,
+0x08000002,0x08000003,0x08040002,0x08040003,
+0x09000002,0x09000003,0x09040002,0x09040003,
+0x08000200,0x08000201,0x08040200,0x08040201,
+0x09000200,0x09000201,0x09040200,0x09040201,
+0x08000202,0x08000203,0x08040202,0x08040203,
+0x09000202,0x09000203,0x09040202,0x09040203,
+);
+@skb3=(
+# for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 
+0x00000000,0x00100000,0x00000100,0x00100100,
+0x00000008,0x00100008,0x00000108,0x00100108,
+0x00001000,0x00101000,0x00001100,0x00101100,
+0x00001008,0x00101008,0x00001108,0x00101108,
+0x04000000,0x04100000,0x04000100,0x04100100,
+0x04000008,0x04100008,0x04000108,0x04100108,
+0x04001000,0x04101000,0x04001100,0x04101100,
+0x04001008,0x04101008,0x04001108,0x04101108,
+0x00020000,0x00120000,0x00020100,0x00120100,
+0x00020008,0x00120008,0x00020108,0x00120108,
+0x00021000,0x00121000,0x00021100,0x00121100,
+0x00021008,0x00121008,0x00021108,0x00121108,
+0x04020000,0x04120000,0x04020100,0x04120100,
+0x04020008,0x04120008,0x04020108,0x04120108,
+0x04021000,0x04121000,0x04021100,0x04121100,
+0x04021008,0x04121008,0x04021108,0x04121108,
+);
+@skb4=(
+# for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 
+0x00000000,0x10000000,0x00010000,0x10010000,
+0x00000004,0x10000004,0x00010004,0x10010004,
+0x20000000,0x30000000,0x20010000,0x30010000,
+0x20000004,0x30000004,0x20010004,0x30010004,
+0x00100000,0x10100000,0x00110000,0x10110000,
+0x00100004,0x10100004,0x00110004,0x10110004,
+0x20100000,0x30100000,0x20110000,0x30110000,
+0x20100004,0x30100004,0x20110004,0x30110004,
+0x00001000,0x10001000,0x00011000,0x10011000,
+0x00001004,0x10001004,0x00011004,0x10011004,
+0x20001000,0x30001000,0x20011000,0x30011000,
+0x20001004,0x30001004,0x20011004,0x30011004,
+0x00101000,0x10101000,0x00111000,0x10111000,
+0x00101004,0x10101004,0x00111004,0x10111004,
+0x20101000,0x30101000,0x20111000,0x30111000,
+0x20101004,0x30101004,0x20111004,0x30111004,
+);
+@skb5=(
+# for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 
+0x00000000,0x08000000,0x00000008,0x08000008,
+0x00000400,0x08000400,0x00000408,0x08000408,
+0x00020000,0x08020000,0x00020008,0x08020008,
+0x00020400,0x08020400,0x00020408,0x08020408,
+0x00000001,0x08000001,0x00000009,0x08000009,
+0x00000401,0x08000401,0x00000409,0x08000409,
+0x00020001,0x08020001,0x00020009,0x08020009,
+0x00020401,0x08020401,0x00020409,0x08020409,
+0x02000000,0x0A000000,0x02000008,0x0A000008,
+0x02000400,0x0A000400,0x02000408,0x0A000408,
+0x02020000,0x0A020000,0x02020008,0x0A020008,
+0x02020400,0x0A020400,0x02020408,0x0A020408,
+0x02000001,0x0A000001,0x02000009,0x0A000009,
+0x02000401,0x0A000401,0x02000409,0x0A000409,
+0x02020001,0x0A020001,0x02020009,0x0A020009,
+0x02020401,0x0A020401,0x02020409,0x0A020409,
+);
+@skb6=(
+# for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 
+0x00000000,0x00000100,0x00080000,0x00080100,
+0x01000000,0x01000100,0x01080000,0x01080100,
+0x00000010,0x00000110,0x00080010,0x00080110,
+0x01000010,0x01000110,0x01080010,0x01080110,
+0x00200000,0x00200100,0x00280000,0x00280100,
+0x01200000,0x01200100,0x01280000,0x01280100,
+0x00200010,0x00200110,0x00280010,0x00280110,
+0x01200010,0x01200110,0x01280010,0x01280110,
+0x00000200,0x00000300,0x00080200,0x00080300,
+0x01000200,0x01000300,0x01080200,0x01080300,
+0x00000210,0x00000310,0x00080210,0x00080310,
+0x01000210,0x01000310,0x01080210,0x01080310,
+0x00200200,0x00200300,0x00280200,0x00280300,
+0x01200200,0x01200300,0x01280200,0x01280300,
+0x00200210,0x00200310,0x00280210,0x00280310,
+0x01200210,0x01200310,0x01280210,0x01280310,
+);
+@skb7=(
+# for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 
+0x00000000,0x04000000,0x00040000,0x04040000,
+0x00000002,0x04000002,0x00040002,0x04040002,
+0x00002000,0x04002000,0x00042000,0x04042000,
+0x00002002,0x04002002,0x00042002,0x04042002,
+0x00000020,0x04000020,0x00040020,0x04040020,
+0x00000022,0x04000022,0x00040022,0x04040022,
+0x00002020,0x04002020,0x00042020,0x04042020,
+0x00002022,0x04002022,0x00042022,0x04042022,
+0x00000800,0x04000800,0x00040800,0x04040800,
+0x00000802,0x04000802,0x00040802,0x04040802,
+0x00002800,0x04002800,0x00042800,0x04042800,
+0x00002802,0x04002802,0x00042802,0x04042802,
+0x00000820,0x04000820,0x00040820,0x04040820,
+0x00000822,0x04000822,0x00040822,0x04040822,
+0x00002820,0x04002820,0x00042820,0x04042820,
+0x00002822,0x04002822,0x00042822,0x04042822,
+);
+
+@shifts2=(0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0);
+
+# used in ecb_encrypt
+@SP0=(
+0x00410100, 0x00010000, 0x40400000, 0x40410100,
+0x00400000, 0x40010100, 0x40010000, 0x40400000,
+0x40010100, 0x00410100, 0x00410000, 0x40000100,
+0x40400100, 0x00400000, 0x00000000, 0x40010000,
+0x00010000, 0x40000000, 0x00400100, 0x00010100,
+0x40410100, 0x00410000, 0x40000100, 0x00400100,
+0x40000000, 0x00000100, 0x00010100, 0x40410000,
+0x00000100, 0x40400100, 0x40410000, 0x00000000,
+0x00000000, 0x40410100, 0x00400100, 0x40010000,
+0x00410100, 0x00010000, 0x40000100, 0x00400100,
+0x40410000, 0x00000100, 0x00010100, 0x40400000,
+0x40010100, 0x40000000, 0x40400000, 0x00410000,
+0x40410100, 0x00010100, 0x00410000, 0x40400100,
+0x00400000, 0x40000100, 0x40010000, 0x00000000,
+0x00010000, 0x00400000, 0x40400100, 0x00410100,
+0x40000000, 0x40410000, 0x00000100, 0x40010100,
+);
+@SP1=(
+0x08021002, 0x00000000, 0x00021000, 0x08020000,
+0x08000002, 0x00001002, 0x08001000, 0x00021000,
+0x00001000, 0x08020002, 0x00000002, 0x08001000,
+0x00020002, 0x08021000, 0x08020000, 0x00000002,
+0x00020000, 0x08001002, 0x08020002, 0x00001000,
+0x00021002, 0x08000000, 0x00000000, 0x00020002,
+0x08001002, 0x00021002, 0x08021000, 0x08000002,
+0x08000000, 0x00020000, 0x00001002, 0x08021002,
+0x00020002, 0x08021000, 0x08001000, 0x00021002,
+0x08021002, 0x00020002, 0x08000002, 0x00000000,
+0x08000000, 0x00001002, 0x00020000, 0x08020002,
+0x00001000, 0x08000000, 0x00021002, 0x08001002,
+0x08021000, 0x00001000, 0x00000000, 0x08000002,
+0x00000002, 0x08021002, 0x00021000, 0x08020000,
+0x08020002, 0x00020000, 0x00001002, 0x08001000,
+0x08001002, 0x00000002, 0x08020000, 0x00021000,
+);
+@SP2=(
+0x20800000, 0x00808020, 0x00000020, 0x20800020,
+0x20008000, 0x00800000, 0x20800020, 0x00008020,
+0x00800020, 0x00008000, 0x00808000, 0x20000000,
+0x20808020, 0x20000020, 0x20000000, 0x20808000,
+0x00000000, 0x20008000, 0x00808020, 0x00000020,
+0x20000020, 0x20808020, 0x00008000, 0x20800000,
+0x20808000, 0x00800020, 0x20008020, 0x00808000,
+0x00008020, 0x00000000, 0x00800000, 0x20008020,
+0x00808020, 0x00000020, 0x20000000, 0x00008000,
+0x20000020, 0x20008000, 0x00808000, 0x20800020,
+0x00000000, 0x00808020, 0x00008020, 0x20808000,
+0x20008000, 0x00800000, 0x20808020, 0x20000000,
+0x20008020, 0x20800000, 0x00800000, 0x20808020,
+0x00008000, 0x00800020, 0x20800020, 0x00008020,
+0x00800020, 0x00000000, 0x20808000, 0x20000020,
+0x20800000, 0x20008020, 0x00000020, 0x00808000,
+);
+@SP3=(
+0x00080201, 0x02000200, 0x00000001, 0x02080201,
+0x00000000, 0x02080000, 0x02000201, 0x00080001,
+0x02080200, 0x02000001, 0x02000000, 0x00000201,
+0x02000001, 0x00080201, 0x00080000, 0x02000000,
+0x02080001, 0x00080200, 0x00000200, 0x00000001,
+0x00080200, 0x02000201, 0x02080000, 0x00000200,
+0x00000201, 0x00000000, 0x00080001, 0x02080200,
+0x02000200, 0x02080001, 0x02080201, 0x00080000,
+0x02080001, 0x00000201, 0x00080000, 0x02000001,
+0x00080200, 0x02000200, 0x00000001, 0x02080000,
+0x02000201, 0x00000000, 0x00000200, 0x00080001,
+0x00000000, 0x02080001, 0x02080200, 0x00000200,
+0x02000000, 0x02080201, 0x00080201, 0x00080000,
+0x02080201, 0x00000001, 0x02000200, 0x00080201,
+0x00080001, 0x00080200, 0x02080000, 0x02000201,
+0x00000201, 0x02000000, 0x02000001, 0x02080200,
+);
+@SP4=(
+0x01000000, 0x00002000, 0x00000080, 0x01002084,
+0x01002004, 0x01000080, 0x00002084, 0x01002000,
+0x00002000, 0x00000004, 0x01000004, 0x00002080,
+0x01000084, 0x01002004, 0x01002080, 0x00000000,
+0x00002080, 0x01000000, 0x00002004, 0x00000084,
+0x01000080, 0x00002084, 0x00000000, 0x01000004,
+0x00000004, 0x01000084, 0x01002084, 0x00002004,
+0x01002000, 0x00000080, 0x00000084, 0x01002080,
+0x01002080, 0x01000084, 0x00002004, 0x01002000,
+0x00002000, 0x00000004, 0x01000004, 0x01000080,
+0x01000000, 0x00002080, 0x01002084, 0x00000000,
+0x00002084, 0x01000000, 0x00000080, 0x00002004,
+0x01000084, 0x00000080, 0x00000000, 0x01002084,
+0x01002004, 0x01002080, 0x00000084, 0x00002000,
+0x00002080, 0x01002004, 0x01000080, 0x00000084,
+0x00000004, 0x00002084, 0x01002000, 0x01000004,
+);
+@SP5=(
+0x10000008, 0x00040008, 0x00000000, 0x10040400,
+0x00040008, 0x00000400, 0x10000408, 0x00040000,
+0x00000408, 0x10040408, 0x00040400, 0x10000000,
+0x10000400, 0x10000008, 0x10040000, 0x00040408,
+0x00040000, 0x10000408, 0x10040008, 0x00000000,
+0x00000400, 0x00000008, 0x10040400, 0x10040008,
+0x10040408, 0x10040000, 0x10000000, 0x00000408,
+0x00000008, 0x00040400, 0x00040408, 0x10000400,
+0x00000408, 0x10000000, 0x10000400, 0x00040408,
+0x10040400, 0x00040008, 0x00000000, 0x10000400,
+0x10000000, 0x00000400, 0x10040008, 0x00040000,
+0x00040008, 0x10040408, 0x00040400, 0x00000008,
+0x10040408, 0x00040400, 0x00040000, 0x10000408,
+0x10000008, 0x10040000, 0x00040408, 0x00000000,
+0x00000400, 0x10000008, 0x10000408, 0x10040400,
+0x10040000, 0x00000408, 0x00000008, 0x10040008,
+);
+@SP6=(
+0x00000800, 0x00000040, 0x00200040, 0x80200000,
+0x80200840, 0x80000800, 0x00000840, 0x00000000,
+0x00200000, 0x80200040, 0x80000040, 0x00200800,
+0x80000000, 0x00200840, 0x00200800, 0x80000040,
+0x80200040, 0x00000800, 0x80000800, 0x80200840,
+0x00000000, 0x00200040, 0x80200000, 0x00000840,
+0x80200800, 0x80000840, 0x00200840, 0x80000000,
+0x80000840, 0x80200800, 0x00000040, 0x00200000,
+0x80000840, 0x00200800, 0x80200800, 0x80000040,
+0x00000800, 0x00000040, 0x00200000, 0x80200800,
+0x80200040, 0x80000840, 0x00000840, 0x00000000,
+0x00000040, 0x80200000, 0x80000000, 0x00200040,
+0x00000000, 0x80200040, 0x00200040, 0x00000840,
+0x80000040, 0x00000800, 0x80200840, 0x00200000,
+0x00200840, 0x80000000, 0x80000800, 0x80200840,
+0x80200000, 0x00200840, 0x00200800, 0x80000800,
+);
+@SP7=(
+0x04100010, 0x04104000, 0x00004010, 0x00000000,
+0x04004000, 0x00100010, 0x04100000, 0x04104010,
+0x00000010, 0x04000000, 0x00104000, 0x00004010,
+0x00104010, 0x04004010, 0x04000010, 0x04100000,
+0x00004000, 0x00104010, 0x00100010, 0x04004000,
+0x04104010, 0x04000010, 0x00000000, 0x00104000,
+0x04000000, 0x00100000, 0x04004010, 0x04100010,
+0x00100000, 0x00004000, 0x04104000, 0x00000010,
+0x00100000, 0x00004000, 0x04000010, 0x04104010,
+0x00004010, 0x04000000, 0x00000000, 0x00104000,
+0x04100010, 0x04004010, 0x04004000, 0x00100010,
+0x04104000, 0x00000010, 0x00100010, 0x04004000,
+0x04104010, 0x00100000, 0x04100000, 0x04000010,
+0x00104000, 0x00004010, 0x04004010, 0x04100000,
+0x00000010, 0x04104000, 0x00104010, 0x00000000,
+0x04000000, 0x04100010, 0x00004000, 0x00104010,
+);
+
+sub main'des_set_key
+        {
+        local($param)=@_;
+        local(@key);
+        local($c,$d,$i,$s,$t);
+        local(@ks)=();
+
+        # Get the bytes in the order we want.
+        @key=unpack("C8",$param);
+
+        $c=     ($key[0]    )|
+                ($key[1]<< 8)|
+                ($key[2]<<16)|
+                ($key[3]<<24);
+        $d=     ($key[4]    )|
+                ($key[5]<< 8)|
+                ($key[6]<<16)|
+                ($key[7]<<24);
+
+        &doPC1(*c,*d);
+
+        for $i (@shifts2)
+                {
+                if ($i)
+                        {
+                        $c=($c>>2)|($c<<26);
+                        $d=($d>>2)|($d<<26);
+                        }
+                else
+                        {
+                        $c=($c>>1)|($c<<27);
+                        $d=($d>>1)|($d<<27);
+                        }
+                $c&=0x0fffffff;
+                $d&=0x0fffffff;
+                $s=     $skb0[ ($c    )&0x3f                 ]|
+                        $skb1[(($c>> 6)&0x03)|(($c>> 7)&0x3c)]|
+                        $skb2[(($c>>13)&0x0f)|(($c>>14)&0x30)]|
+                        $skb3[(($c>>20)&0x01)|(($c>>21)&0x06) |
+                                             (($c>>22)&0x38)];
+                $t=     $skb4[ ($d    )&0x3f                ]|
+                        $skb5[(($d>> 7)&0x03)|(($d>> 8)&0x3c)]|
+                        $skb6[ ($d>>15)&0x3f                 ]|
+                        $skb7[(($d>>21)&0x0f)|(($d>>22)&0x30)];
+                push(@ks,(($t<<16)|($s&0x0000ffff))&0xffffffff);
+                $s=      (($s>>16)&0x0000ffff)|($t&0xffff0000) ;
+                push(@ks,(($s<<4)|(($s>>28)&0xf))&0xffffffff);
+                }
+        @ks;
+        }
+
+sub doPC1
+        {
+        local(*a,*b)=@_;
+        local($t);
+
+        $t=(($b>>4)^$a)&0x0f0f0f0f;
+        $b^=($t<<4); $a^=$t;
+        # do $a first 
+        $t=(($a<<18)^$a)&0xcccc0000;
+        $a=$a^$t^(($t>>18)&0x00003fff);
+        $t=(($a<<17)^$a)&0xaaaa0000;
+        $a=$a^$t^(($t>>17)&0x00007fff);
+        $t=(($a<< 8)^$a)&0x00ff0000;
+        $a=$a^$t^(($t>> 8)&0x00ffffff);
+        $t=(($a<<17)^$a)&0xaaaa0000;
+        $a=$a^$t^(($t>>17)&0x00007fff);
+
+        # now do $b
+        $t=(($b<<24)^$b)&0xff000000;
+        $b=$b^$t^(($t>>24)&0x000000ff);
+        $t=(($b<< 8)^$b)&0x00ff0000;
+        $b=$b^$t^(($t>> 8)&0x00ffffff);
+        $t=(($b<<14)^$b)&0x33330000;
+        $b=$b^$t^(($t>>14)&0x0003ffff);
+        $b=(($b&0x00aa00aa)<<7)|(($b&0x55005500)>>7)|($b&0xaa55aa55);
+        $b=(($b>>8)&0x00ffffff)|((($a&0xf0000000)>>4)&0x0fffffff);
+        $a&=0x0fffffff;
+        }
+
+sub doIP
+        {
+        local(*a,*b)=@_;
+        local($t);
+
+        $t=(($b>> 4)^$a)&0x0f0f0f0f;
+        $b^=($t<< 4); $a^=$t;
+        $t=(($a>>16)^$b)&0x0000ffff;
+        $a^=($t<<16); $b^=$t;
+        $t=(($b>> 2)^$a)&0x33333333;
+        $b^=($t<< 2); $a^=$t;
+        $t=(($a>> 8)^$b)&0x00ff00ff;
+        $a^=($t<< 8); $b^=$t;
+        $t=(($b>> 1)^$a)&0x55555555;
+        $b^=($t<< 1); $a^=$t;
+        $t=$a;
+        $a=$b&0xffffffff;
+        $b=$t&0xffffffff;
+        }
+
+sub doFP
+        {
+        local(*a,*b)=@_;
+        local($t);
+
+        $t=(($b>> 1)^$a)&0x55555555;
+        $b^=($t<< 1); $a^=$t;
+        $t=(($a>> 8)^$b)&0x00ff00ff;
+        $a^=($t<< 8); $b^=$t;
+        $t=(($b>> 2)^$a)&0x33333333;
+        $b^=($t<< 2); $a^=$t;
+        $t=(($a>>16)^$b)&0x0000ffff;
+        $a^=($t<<16); $b^=$t;
+        $t=(($b>> 4)^$a)&0x0f0f0f0f;
+        $b^=($t<< 4); $a^=$t;
+        $a&=0xffffffff;
+        $b&=0xffffffff;
+        }
+
+sub main'des_ecb_encrypt
+        {
+        local(*ks,$encrypt,$in)=@_;
+        local($l,$r,$i,$t,$u,@input);
+        
+        @input=unpack("C8",$in);
+        # Get the bytes in the order we want.
+        $l=     ($input[0]    )|
+                ($input[1]<< 8)|
+                ($input[2]<<16)|
+                ($input[3]<<24);
+        $r=     ($input[4]    )|
+                ($input[5]<< 8)|
+                ($input[6]<<16)|
+                ($input[7]<<24);
+
+        $l&=0xffffffff;
+        $r&=0xffffffff;
+        &doIP(*l,*r);
+        if ($encrypt)
+                {
+                for ($i=0; $i<32; $i+=4)
+                        {
+                        $t=((($r&0x7fffffff)<<1)|(($r>>31)&0x00000001));
+                        $u=$t^$ks[$i  ];
+                        $t=$t^$ks[$i+1];
+                        $t2=(($t&0x0000000f)<<28);
+
+                        $t=((($t>>4)&0x0fffffff)|(($t&0x0000000f)<<28));
+                        $l^=    $SP1[ $t     &0x3f]|
+                                $SP3[($t>> 8)&0x3f]|
+                                $SP5[($t>>16)&0x3f]|
+                                $SP7[($t>>24)&0x3f]|
+                                $SP0[ $u     &0x3f]|
+                                $SP2[($u>> 8)&0x3f]|
+                                $SP4[($u>>16)&0x3f]|
+                                $SP6[($u>>24)&0x3f];
+
+                        $t=(($l<<1)|(($l>>31)&0x1))&0xffffffff;
+                        $u=$t^$ks[$i+2];
+                        $t=$t^$ks[$i+3];
+                        $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff;
+                        $r^=    $SP1[ $t     &0x3f]|
+                                $SP3[($t>> 8)&0x3f]|
+                                $SP5[($t>>16)&0x3f]|
+                                $SP7[($t>>24)&0x3f]|
+                                $SP0[ $u     &0x3f]|
+                                $SP2[($u>> 8)&0x3f]|
+                                $SP4[($u>>16)&0x3f]|
+                                $SP6[($u>>24)&0x3f];
+                        }
+                }
+        else    
+                {
+                for ($i=30; $i>0; $i-=4)
+                        {
+                        $t=(($r<<1)|(($r>>31)&0x1))&0xffffffff;
+                        $u=$t^$ks[$i  ];
+                        $t=$t^$ks[$i+1];
+                        $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff;
+                        $l^=    $SP1[ $t     &0x3f]|
+                                $SP3[($t>> 8)&0x3f]|
+                                $SP5[($t>>16)&0x3f]|
+                                $SP7[($t>>24)&0x3f]|
+                                $SP0[ $u     &0x3f]|
+                                $SP2[($u>> 8)&0x3f]|
+                                $SP4[($u>>16)&0x3f]|
+                                $SP6[($u>>24)&0x3f];
+
+                        $t=(($l<<1)|(($l>>31)&0x1))&0xffffffff;
+                        $u=$t^$ks[$i-2];
+                        $t=$t^$ks[$i-1];
+                        $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff;
+                        $r^=    $SP1[ $t     &0x3f]|
+                                $SP3[($t>> 8)&0x3f]|
+                                $SP5[($t>>16)&0x3f]|
+                                $SP7[($t>>24)&0x3f]|
+                                $SP0[ $u     &0x3f]|
+                                $SP2[($u>> 8)&0x3f]|
+                                $SP4[($u>>16)&0x3f]|
+                                $SP6[($u>>24)&0x3f];
+                        }
+                }
+        &doFP(*l,*r);
+        pack("C8",$l&0xff, 
+                  ($l>> 8)&0x00ffffff,
+                  ($l>>16)&0x0000ffff,
+                  ($l>>24)&0x000000ff,
+                  $r&0xff,
+                  ($r>> 8)&0x00ffffff,
+                  ($r>>16)&0x0000ffff,
+                  ($r>>24)&0x000000ff);
+        }
diff --git a/src/lib/libcrypto/des/des_crypt.man b/src/lib/libcrypto/des/des_crypt.man
new file mode 100644
index 0000000000..0ecc416877
--- /dev/null
+++ b/src/lib/libcrypto/des/des_crypt.man
@@ -0,0 +1,508 @@
+.TH DES_CRYPT 3 
+.SH NAME
+des_read_password, des_read_2password,
+des_string_to_key, des_string_to_2key, des_read_pw_string,
+des_random_key, des_set_key,
+des_key_sched, des_ecb_encrypt, des_ecb3_encrypt, des_cbc_encrypt,
+des_3cbc_encrypt,
+des_pcbc_encrypt, des_cfb_encrypt, des_ofb_encrypt,
+des_cbc_cksum, des_quad_cksum,
+des_enc_read, des_enc_write, des_set_odd_parity,
+des_is_weak_key, crypt \- (non USA) DES encryption
+.SH SYNOPSIS
+.nf
+.nj
+.ft B
+#include <des.h>
+.PP
+.B int des_read_password(key,prompt,verify)
+des_cblock *key;
+char *prompt;
+int verify;
+.PP
+.B int des_read_2password(key1,key2,prompt,verify)
+des_cblock *key1,*key2;
+char *prompt;
+int verify;
+.PP
+.B int des_string_to_key(str,key)
+char *str;
+des_cblock *key;
+.PP
+.B int des_string_to_2keys(str,key1,key2)
+char *str;
+des_cblock *key1,*key2;
+.PP
+.B int des_read_pw_string(buf,length,prompt,verify)
+char *buf;
+int length;
+char *prompt;
+int verify;
+.PP
+.B int des_random_key(key)
+des_cblock *key;
+.PP
+.B int des_set_key(key,schedule)
+des_cblock *key;
+des_key_schedule schedule;
+.PP
+.B int des_key_sched(key,schedule)
+des_cblock *key;
+des_key_schedule schedule;
+.PP
+.B int des_ecb_encrypt(input,output,schedule,encrypt)
+des_cblock *input;
+des_cblock *output;
+des_key_schedule schedule;
+int encrypt;
+.PP
+.B int des_ecb3_encrypt(input,output,ks1,ks2,encrypt)
+des_cblock *input;
+des_cblock *output;
+des_key_schedule ks1,ks2;
+int encrypt;
+.PP
+.B int des_cbc_encrypt(input,output,length,schedule,ivec,encrypt)
+des_cblock *input;
+des_cblock *output;
+long length;
+des_key_schedule schedule;
+des_cblock *ivec;
+int encrypt;
+.PP
+.B int des_3cbc_encrypt(input,output,length,sk1,sk2,ivec1,ivec2,encrypt)
+des_cblock *input;
+des_cblock *output;
+long length;
+des_key_schedule sk1;
+des_key_schedule sk2;
+des_cblock *ivec1;
+des_cblock *ivec2;
+int encrypt;
+.PP
+.B int des_pcbc_encrypt(input,output,length,schedule,ivec,encrypt)
+des_cblock *input;
+des_cblock *output;
+long length;
+des_key_schedule schedule;
+des_cblock *ivec;
+int encrypt;
+.PP
+.B int des_cfb_encrypt(input,output,numbits,length,schedule,ivec,encrypt)
+unsigned char *input;
+unsigned char *output;
+int numbits;
+long length;
+des_key_schedule schedule;
+des_cblock *ivec;
+int encrypt;
+.PP
+.B int des_ofb_encrypt(input,output,numbits,length,schedule,ivec)
+unsigned char *input,*output;
+int numbits;
+long length;
+des_key_schedule schedule;
+des_cblock *ivec;
+.PP
+.B unsigned long des_cbc_cksum(input,output,length,schedule,ivec)
+des_cblock *input;
+des_cblock *output;
+long length;
+des_key_schedule schedule;
+des_cblock *ivec;
+.PP
+.B unsigned long des_quad_cksum(input,output,length,out_count,seed)
+des_cblock *input;
+des_cblock *output;
+long length;
+int out_count;
+des_cblock *seed;
+.PP
+.B int des_check_key;
+.PP
+.B int des_enc_read(fd,buf,len,sched,iv)
+int fd;
+char *buf;
+int len;
+des_key_schedule sched;
+des_cblock *iv;
+.PP
+.B int des_enc_write(fd,buf,len,sched,iv)
+int fd;
+char *buf;
+int len;
+des_key_schedule sched;
+des_cblock *iv;
+.PP
+.B extern int des_rw_mode;
+.PP
+.B void des_set_odd_parity(key)
+des_cblock *key;
+.PP
+.B int des_is_weak_key(key)
+des_cblock *key;
+.PP
+.B char *crypt(passwd,salt)
+char *passwd;
+char *salt;
+.PP
+.fi
+.SH DESCRIPTION
+This library contains a fast implementation of the DES encryption
+algorithm.
+.PP
+There are two phases to the use of DES encryption.
+The first is the generation of a
+.I des_key_schedule
+from a key,
+the second is the actual encryption.
+A des key is of type
+.I des_cblock.
+This type is made from 8 characters with odd parity.
+The least significant bit in the character is the parity bit.
+The key schedule is an expanded form of the key; it is used to speed the
+encryption process.
+.PP
+.I des_read_password
+writes the string specified by prompt to the standard output,
+turns off echo and reads an input string from standard input
+until terminated with a newline.
+If verify is non-zero, it prompts and reads the input again and verifies
+that both entered passwords are the same.
+The entered string is converted into a des key by using the
+.I des_string_to_key
+routine.
+The new key is placed in the
+.I des_cblock
+that was passed (by reference) to the routine.
+If there were no errors,
+.I des_read_password
+returns 0,
+-1 is returned if there was a terminal error and 1 is returned for
+any other error.
+.PP
+.I des_read_2password
+operates in the same way as
+.I des_read_password
+except that it generates 2 keys by using the
+.I des_string_to_2key
+function.
+.PP
+.I des_read_pw_string
+is called by
+.I des_read_password
+to read and verify a string from a terminal device.
+The string is returned in
+.I buf.
+The size of
+.I buf
+is passed to the routine via the
+.I length
+parameter.
+.PP
+.I des_string_to_key
+converts a string into a valid des key.
+.PP
+.I des_string_to_2key
+converts a string into 2 valid des keys.
+This routine is best suited for used to generate keys for use with
+.I des_ecb3_encrypt.
+.PP
+.I des_random_key
+returns a random key that is made of a combination of process id,
+time and an increasing counter.
+.PP
+Before a des key can be used it is converted into a
+.I des_key_schedule
+via the
+.I des_set_key
+routine.
+If the
+.I des_check_key
+flag is non-zero,
+.I des_set_key
+will check that the key passed is of odd parity and is not a week or
+semi-weak key.
+If the parity is wrong,
+then -1 is returned.
+If the key is a weak key,
+then -2 is returned.
+If an error is returned,
+the key schedule is not generated.
+.PP
+.I des_key_sched
+is another name for the
+.I des_set_key
+function.
+.PP
+The following routines mostly operate on an input and output stream of
+.I des_cblock's.
+.PP
+.I des_ecb_encrypt
+is the basic DES encryption routine that encrypts or decrypts a single 8-byte
+.I des_cblock
+in
+.I electronic code book
+mode.
+It always transforms the input data, pointed to by
+.I input,
+into the output data,
+pointed to by the
+.I output
+argument.
+If the
+.I encrypt
+argument is non-zero (DES_ENCRYPT),
+the
+.I input
+(cleartext) is encrypted in to the
+.I output
+(ciphertext) using the key_schedule specified by the
+.I schedule
+argument,
+previously set via
+.I des_set_key.
+If
+.I encrypt
+is zero (DES_DECRYPT),
+the
+.I input
+(now ciphertext)
+is decrypted into the
+.I output
+(now cleartext).
+Input and output may overlap.
+No meaningful value is returned.
+.PP
+.I des_ecb3_encrypt
+encrypts/decrypts the
+.I input
+block by using triple ecb DES encryption.
+This involves encrypting the input with 
+.I ks1,
+decryption with the key schedule
+.I ks2,
+and then encryption with the first again.
+This routine greatly reduces the chances of brute force breaking of
+DES and has the advantage of if
+.I ks1
+and
+.I ks2
+are the same, it is equivalent to just encryption using ecb mode and
+.I ks1
+as the key.
+.PP
+.I des_cbc_encrypt
+encrypts/decrypts using the
+.I cipher-block-chaining
+mode of DES.
+If the
+.I encrypt
+argument is non-zero,
+the routine cipher-block-chain encrypts the cleartext data pointed to by the
+.I input
+argument into the ciphertext pointed to by the
+.I output
+argument,
+using the key schedule provided by the
+.I schedule
+argument,
+and initialisation vector provided by the
+.I ivec
+argument.
+If the
+.I length
+argument is not an integral multiple of eight bytes, 
+the last block is copied to a temporary area and zero filled.
+The output is always
+an integral multiple of eight bytes.
+To make multiple cbc encrypt calls on a large amount of data appear to
+be one 
+.I des_cbc_encrypt
+call, the
+.I ivec
+of subsequent calls should be the last 8 bytes of the output.
+.PP
+.I des_3cbc_encrypt
+encrypts/decrypts the
+.I input
+block by using triple cbc DES encryption.
+This involves encrypting the input with key schedule
+.I ks1,
+decryption with the key schedule
+.I ks2,
+and then encryption with the first again.
+2 initialisation vectors are required,
+.I ivec1
+and
+.I ivec2.
+Unlike
+.I des_cbc_encrypt,
+these initialisation vectors are modified by the subroutine.
+This routine greatly reduces the chances of brute force breaking of
+DES and has the advantage of if
+.I ks1
+and
+.I ks2
+are the same, it is equivalent to just encryption using cbc mode and
+.I ks1
+as the key.
+.PP
+.I des_pcbc_encrypt
+encrypt/decrypts using a modified block chaining mode.
+It provides better error propagation characteristics than cbc
+encryption.
+.PP
+.I des_cfb_encrypt
+encrypt/decrypts using cipher feedback mode.  This method takes an
+array of characters as input and outputs and array of characters.  It
+does not require any padding to 8 character groups.  Note: the ivec
+variable is changed and the new changed value needs to be passed to
+the next call to this function.  Since this function runs a complete
+DES ecb encryption per numbits, this function is only suggested for
+use when sending small numbers of characters.
+.PP
+.I des_ofb_encrypt
+encrypt using output feedback mode.  This method takes an
+array of characters as input and outputs and array of characters.  It
+does not require any padding to 8 character groups.  Note: the ivec
+variable is changed and the new changed value needs to be passed to
+the next call to this function.  Since this function runs a complete
+DES ecb encryption per numbits, this function is only suggested for
+use when sending small numbers of characters.
+.PP
+.I des_cbc_cksum
+produces an 8 byte checksum based on the input stream (via cbc encryption).
+The last 4 bytes of the checksum is returned and the complete 8 bytes is
+placed in
+.I output.
+.PP
+.I des_quad_cksum
+returns a 4 byte checksum from the input bytes.
+The algorithm can be iterated over the input,
+depending on
+.I out_count,
+1, 2, 3 or 4 times.
+If
+.I output
+is non-NULL,
+the 8 bytes generated by each pass are written into
+.I output.
+.PP
+.I des_enc_write
+is used to write
+.I len
+bytes
+to file descriptor
+.I fd
+from buffer
+.I buf.
+The data is encrypted via
+.I pcbc_encrypt
+(default) using
+.I sched
+for the key and
+.I iv
+as a starting vector.
+The actual data send down
+.I fd
+consists of 4 bytes (in network byte order) containing the length of the
+following encrypted data.  The encrypted data then follows, padded with random
+data out to a multiple of 8 bytes.
+.PP
+.I des_enc_read
+is used to read
+.I len
+bytes
+from file descriptor
+.I fd
+into buffer
+.I buf.
+The data being read from
+.I fd
+is assumed to have come from
+.I des_enc_write
+and is decrypted using
+.I sched
+for the key schedule and
+.I iv
+for the initial vector.
+The
+.I des_enc_read/des_enc_write
+pair can be used to read/write to files, pipes and sockets.
+I have used them in implementing a version of rlogin in which all
+data is encrypted.
+.PP
+.I des_rw_mode
+is used to specify the encryption mode to use with 
+.I des_enc_read
+and 
+.I des_end_write.
+If set to
+.I DES_PCBC_MODE
+(the default), des_pcbc_encrypt is used.
+If set to
+.I DES_CBC_MODE
+des_cbc_encrypt is used.
+These two routines and the variable are not part of the normal MIT library.
+.PP
+.I des_set_odd_parity
+sets the parity of the passed
+.I key
+to odd.  This routine is not part of the standard MIT library.
+.PP
+.I des_is_weak_key
+returns 1 is the passed key is a weak key (pick again :-),
+0 if it is ok.
+This routine is not part of the standard MIT library.
+.PP
+.I crypt
+is a replacement for the normal system crypt.
+It is much faster than the system crypt.
+.PP
+.SH FILES
+/usr/include/des.h
+.br
+/usr/lib/libdes.a
+.PP
+The encryption routines have been tested on 16bit, 32bit and 64bit
+machines of various endian and even works under VMS.
+.PP
+.SH BUGS
+.PP
+If you think this manual is sparse,
+read the des_crypt(3) manual from the MIT kerberos (or bones outside
+of the USA) distribution.
+.PP
+.I des_cfb_encrypt
+and
+.I des_ofb_encrypt
+operates on input of 8 bits.  What this means is that if you set
+numbits to 12, and length to 2, the first 12 bits will come from the 1st
+input byte and the low half of the second input byte.  The second 12
+bits will have the low 8 bits taken from the 3rd input byte and the
+top 4 bits taken from the 4th input byte.  The same holds for output.
+This function has been implemented this way because most people will
+be using a multiple of 8 and because once you get into pulling bytes input
+bytes apart things get ugly!
+.PP
+.I des_read_pw_string
+is the most machine/OS dependent function and normally generates the
+most problems when porting this code.
+.PP
+.I des_string_to_key
+is probably different from the MIT version since there are lots
+of fun ways to implement one-way encryption of a text string.
+.PP
+The routines are optimised for 32 bit machines and so are not efficient
+on IBM PCs.
+.PP
+NOTE: extensive work has been done on this library since this document
+was origionally written.  Please try to read des.doc from the libdes
+distribution since it is far more upto date and documents more of the
+functions.  Libdes is now also being shipped as part of SSLeay, a
+general cryptographic library that amonst other things implements
+netscapes SSL protocoll.  The most recent version can be found in
+SSLeay distributions.
+.SH AUTHOR
+Eric Young (eay@cryptsoft.com)
diff --git a/src/lib/libcrypto/des/des_locl.org b/src/lib/libcrypto/des/des_locl.org
new file mode 100644
index 0000000000..e2e503cbed
--- /dev/null
+++ b/src/lib/libcrypto/des/des_locl.org
@@ -0,0 +1,516 @@
+/* crypto/des/des_locl.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *
+ * Always modify des_locl.org since des_locl.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+#ifndef HEADER_DES_LOCL_H
+#define HEADER_DES_LOCL_H
+
+#if defined(WIN32) || defined(WIN16)
+#ifndef MSDOS
+#define MSDOS
+#endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef MSDOS
+#include <unistd.h>
+#endif
+#include "des.h"
+
+#ifndef DES_DEFAULT_OPTIONS
+/* the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
+#ifndef DES_PTR
+#undef DES_PTR
+#endif
+
+/* This helps C compiler generate the correct code for multiple functional
+ * units.  It reduces register dependancies at the expense of 2 more
+ * registers */
+#ifndef DES_RISC1
+#undef DES_RISC1
+#endif
+
+#ifndef DES_RISC2
+#undef DES_RISC2
+#endif
+
+#if defined(DES_RISC1) && defined(DES_RISC2)
+YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#endif
+
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
+ * Very mucy CPU dependant */
+#ifndef DES_UNROLL
+#undef DES_UNROLL
+#endif
+
+/* These default values were supplied by
+ * Peter Gutman <pgut001@cs.auckland.ac.nz>
+ * They are only used if nothing else has been defined */
+#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
+/* Special defines which change the way the code is built depending on the
+   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
+   even newer MIPS CPU's, but at the moment one size fits all for
+   optimization options.  Older Sparc's work better with only UNROLL, but
+   there's no way to tell at compile time what it is you're running on */
+ 
+#if defined( sun )              /* Newer Sparc's */
+  #define DES_PTR
+  #define DES_RISC1
+  #define DES_UNROLL
+#elif defined( __ultrix )       /* Older MIPS */
+  #define DES_PTR
+  #define DES_RISC2
+  #define DES_UNROLL
+#elif defined( __osf1__ )       /* Alpha */
+  #define DES_PTR
+  #define DES_RISC2
+#elif defined ( _AIX )          /* RS6000 */
+  /* Unknown */
+#elif defined( __hpux )         /* HP-PA */
+  /* Unknown */
+#elif defined( __aux )          /* 68K */
+  /* Unknown */
+#elif defined( __dgux )         /* 88K (but P6 in latest boxes) */
+  #define DES_UNROLL
+#elif defined( __sgi )          /* Newer MIPS */
+  #define DES_PTR
+  #define DES_RISC2
+  #define DES_UNROLL
+#elif defined( i386 )           /* x86 boxes, should be gcc */
+  #define DES_PTR
+  #define DES_RISC1
+  #define DES_UNROLL
+#endif /* Systems-specific speed defines */
+#endif
+
+#endif /* DES_DEFAULT_OPTIONS */
+
+#ifdef MSDOS            /* Visual C++ 2.1 (Windows NT/95) */
+#include <stdlib.h>
+#include <errno.h>
+#include <time.h>
+#include <io.h>
+#ifndef RAND
+#define RAND
+#endif
+#undef NOPROTO
+#endif
+
+#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
+#include <string.h>
+#endif
+
+#ifndef RAND
+#define RAND
+#endif
+
+#ifdef linux
+#undef RAND
+#endif
+
+#ifdef MSDOS
+#define getpid() 2
+#define RAND
+#undef NOPROTO
+#endif
+
+#if defined(NOCONST)
+#define const
+#endif
+
+#ifdef __STDC__
+#undef NOPROTO
+#endif
+
+#ifdef RAND
+#define srandom(s) srand(s)
+#define random rand
+#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(WIN32)
+#define ROTATE(a,n)     (_lrotr(a,n))
+#else
+#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 achitecture.  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 occured 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^= *(DES_LONG *)((unsigned char *)des_SP      +u1); \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x200+u2); \
+        u3=(int)(u>>8L); \
+        u1=(int)u&0xfc; \
+        u3&=0xfc; \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x400+u1); \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x600+u3); \
+        u2=(int)t>>8L; \
+        u1=(int)t&0xfc; \
+        u2&=0xfc; \
+        t>>=16L; \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x100+u1); \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x300+u2); \
+        u3=(int)t>>8L; \
+        u1=(int)t&0xfc; \
+        u3&=0xfc; \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x500+u1); \
+        LL^= *(DES_LONG *)((unsigned char *)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^= *(DES_LONG *)((unsigned char *)des_SP      +u1); \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x200+u2); \
+        s1=(int)(u>>16L); \
+        s2=(int)(u>>24L); \
+        s1&=0xfc; \
+        s2&=0xfc; \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x400+s1); \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x600+s2); \
+        u2=(int)t>>8L; \
+        u1=(int)t&0xfc; \
+        u2&=0xfc; \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x100+u1); \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x300+u2); \
+        s1=(int)(t>>16L); \
+        s2=(int)(t>>24L); \
+        s1&=0xfc; \
+        s2&=0xfc; \
+        LL^= *(DES_LONG *)((unsigned char *)des_SP+0x500+s1); \
+        LL^= *(DES_LONG *)((unsigned char *)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^= \
+        *(DES_LONG *)((unsigned char *)des_SP      +((u     )&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)des_SP+0x200+((u>> 8L)&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)des_SP+0x400+((u>>16L)&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)des_SP+0x600+((u>>24L)&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)des_SP+0x100+((t     )&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)des_SP+0x300+((t>> 8L)&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)des_SP+0x500+((t>>16L)&0xfc))^ \
+        *(DES_LONG *)((unsigned char *)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];
+
+#ifndef NOPROTO
+void fcrypt_body(DES_LONG *out,des_key_schedule ks,
+        DES_LONG Eswap0, DES_LONG Eswap1);
+#else
+void fcrypt_body();
+#endif
+
+#endif
diff --git a/src/lib/libcrypto/des/doIP b/src/lib/libcrypto/des/doIP
new file mode 100644
index 0000000000..18cf231303
--- /dev/null
+++ b/src/lib/libcrypto/des/doIP
@@ -0,0 +1,46 @@
+#!/usr/local/bin/perl
+
+@l=(
+         0, 1, 2, 3, 4, 5, 6, 7,
+         8, 9,10,11,12,13,14,15,
+        16,17,18,19,20,21,22,23,
+        24,25,26,27,28,29,30,31
+        );
+@r=(
+        32,33,34,35,36,37,38,39,
+        40,41,42,43,44,45,46,47,
+        48,49,50,51,52,53,54,55,
+        56,57,58,59,60,61,62,63
+        );
+
+require 'shifts.pl';
+
+sub PERM_OP
+        {
+        local(*a,*b,*t,$n,$m)=@_;
+
+        @z=&shift(*a,-$n);
+        @z=&xor(*b,*z);
+        @z=&and(*z,$m);
+        @b=&xor(*b,*z);
+        @z=&shift(*z,$n);
+        @a=&xor(*a,*z);
+        }
+
+
+@L=@l;
+@R=@r;
+&PERM_OP(*R,*L,*T,4,0x0f0f0f0f);
+&PERM_OP(*L,*R,*T,16,0x0000ffff);
+&PERM_OP(*R,*L,*T,2,0x33333333);
+&PERM_OP(*L,*R,*T,8,0x00ff00ff);
+&PERM_OP(*R,*L,*T,1,0x55555555);
+        &printit(@L);
+        &printit(@R);
+&PERM_OP(*R,*L,*T,1,0x55555555);
+&PERM_OP(*L,*R,*T,8,0x00ff00ff);
+&PERM_OP(*R,*L,*T,2,0x33333333);
+&PERM_OP(*L,*R,*T,16,0x0000ffff);
+&PERM_OP(*R,*L,*T,4,0x0f0f0f0f);
+        &printit(@L);
+        &printit(@R);
diff --git a/src/lib/libcrypto/des/doPC1 b/src/lib/libcrypto/des/doPC1
new file mode 100644
index 0000000000..096afd8c46
--- /dev/null
+++ b/src/lib/libcrypto/des/doPC1
@@ -0,0 +1,110 @@
+#!/usr/local/bin/perl
+
+@l=(
+         0, 1, 2, 3, 4, 5, 6, 7,
+         8, 9,10,11,12,13,14,15,
+        16,17,18,19,20,21,22,23,
+        24,25,26,27,28,29,30,31
+        );
+@r=(
+        32,33,34,35,36,37,38,39,
+        40,41,42,43,44,45,46,47,
+        48,49,50,51,52,53,54,55,
+        56,57,58,59,60,61,62,63
+        );
+
+require 'shifts.pl';
+
+sub PERM_OP
+        {
+        local(*a,*b,*t,$n,$m)=@_;
+
+        @z=&shift(*a,-$n);
+        @z=&xor(*b,*z);
+        @z=&and(*z,$m);
+        @b=&xor(*b,*z);
+        @z=&shift(*z,$n);
+        @a=&xor(*a,*z);
+        }
+
+sub HPERM_OP2
+        {
+        local(*a,*t,$n,$m)=@_;
+        local(@x,@y,$i);
+
+        @z=&shift(*a,16-$n);
+        @z=&xor(*a,*z);
+        @z=&and(*z,$m);
+        @a=&xor(*a,*z);
+        @z=&shift(*z,$n-16);
+        @a=&xor(*a,*z);
+        }
+
+sub HPERM_OP
+        {
+        local(*a,*t,$n,$m)=@_;
+        local(@x,@y,$i);
+
+        for ($i=0; $i<16; $i++)
+                {
+                $x[$i]=$a[$i];
+                $y[$i]=$a[16+$i];
+                }
+        @z=&shift(*x,-$n);
+        @z=&xor(*y,*z);
+        @z=&and(*z,$m);
+        @y=&xor(*y,*z);
+        @z=&shift(*z,$n);
+        @x=&xor(*x,*z);
+        for ($i=0; $i<16; $i++)
+                {
+                $a[$i]=$x[$i];
+                $a[16+$i]=$y[$i];
+                }
+        }
+
+@L=@l;
+@R=@r;
+
+        print "---\n"; &printit(@R);
+&PERM_OP(*R,*L,*T,4,0x0f0f0f0f);
+        print "---\n"; &printit(@R);
+&HPERM_OP2(*L,*T,-2,0xcccc0000);
+&HPERM_OP2(*R,*T,-2,0xcccc0000);
+        print "---\n"; &printit(@R);
+&PERM_OP(*R,*L,*T,1,0x55555555);
+        print "---\n"; &printit(@R);
+&PERM_OP(*L,*R,*T,8,0x00ff00ff);
+        print "---\n"; &printit(@R);
+&PERM_OP(*R,*L,*T,1,0x55555555);
+        print "---\n"; &printit(@R);
+#       &printit(@L);
+        &printit(@R);
+print <<"EOF";
+==============================
+63  55  47  39  31  23  15   7  
+62  54  46  38  30  22  14   6  
+61  53  45  37  29  21  13   5  
+60  52  44  36  --  --  --  --  
+
+57  49  41  33  25  17   9   1  
+58  50  42  34  26  18  10   2  
+59  51  43  35  27  19  11   3  
+28  20  12   4  --  --  --  --  
+EOF
+exit(1);
+@A=&and(*R,0x000000ff);
+@A=&shift(*A,16);
+@B=&and(*R,0x0000ff00);
+@C=&and(*R,0x00ff0000);
+@C=&shift(*C,-16);
+@D=&and(*L,0xf0000000);
+@D=&shift(*D,-4);
+@A=&or(*A,*B);
+@B=&or(*D,*C);
+@R=&or(*A,*B);
+@L=&and(*L,0x0fffffff);
+
+        &printit(@L);
+        &printit(@R);
+
diff --git a/src/lib/libcrypto/des/doPC2 b/src/lib/libcrypto/des/doPC2
new file mode 100644
index 0000000000..fa5cf74cf7
--- /dev/null
+++ b/src/lib/libcrypto/des/doPC2
@@ -0,0 +1,94 @@
+#!/usr/local/bin/perl
+
+@PC2_C=(14,17,11,24, 1, 5,
+         3,28,15, 6,21,10,
+        23,19,12, 4,26, 8,
+        16, 7,27,20,13, 2,
+        );
+
+@PC2_D=(41,52,31,37,47,55,
+        30,40,51,45,33,48,
+        44,49,39,56,34,53,
+        46,42,50,36,29,32,
+        );
+
+$i=0;
+foreach (@PC2_C) {
+        $_--;
+#       printf "%2d,",$_;
+        $C{$_}=$i;
+        ++$i;
+#       print "\n" if ((($i) % 8) == 0);
+        }
+$i=0;
+#print "\n";
+foreach (@PC2_D) {
+        $_-=28;
+        $_--;
+#       printf "%2d,",$_;
+        $D{$_}=$i;
+        $i++;
+#       print "\n" if ((($i) % 8) == 0);
+        }
+
+#print "\n";
+foreach $i (0 .. 27)
+        {
+        $_=$C{$i};
+#       printf "%2d,",$_;
+        $i++;
+#       print "\n" if ((($i) % 8) == 0);
+        }
+#print "\n";
+
+#print "\n";
+foreach $i (0 .. 27)
+        {
+        $_=$D{$i};
+#       printf "%2d,",$_;
+        $i++;
+#       print "\n" if ((($i) % 8) == 0);
+        }
+#print "\n";
+
+print "static ulong skb[8][64]={\n";
+&doit("C",*C, 0, 1, 2, 3, 4, 5);
+&doit("C",*C, 6, 7, 9,10,11,12);
+&doit("C",*C,13,14,15,16,18,19);
+&doit("C",*C,20,22,23,25,26,27);
+
+&doit("D",*D, 0, 1, 2, 3, 4, 5);
+&doit("D",*D, 7, 8,10,11,12,13);
+&doit("D",*D,15,16,17,18,19,20);
+&doit("D",*D,21,22,23,24,26,27);
+print "};\n";
+
+sub doit
+        {
+        local($l,*A,@b)=@_;
+        local(@out);
+
+        printf("/* for $l bits (numbered as per FIPS 46) %d %d %d %d %d %d */\n",
+                $b[0]+1, $b[1]+1, $b[2]+1, $b[3]+1, $b[4]+1, $b[5]+1);
+        for ($i=0; $i<64; $i++)
+                {
+                $out[$i]=0;
+                $j=1;
+#print "\n";
+                for ($k=0; $k<6; $k++)
+                        {
+                        $l=$A{$b[$k]};
+#print"$l - ";
+                        if ((1<<$k) & $i)
+                                {
+                                $ll=int($l/6)*8+($l%6);
+                                $out[$i]|=1<<($ll);
+                                }
+                        }
+                $pp=$out[$i];
+                $pp=($pp&0xff0000ff)|   (($pp&0x00ff0000)>>8)|
+                                        (($pp&0x0000ff00)<<8);
+                printf("0x%08X,",$pp);
+                print "\n" if (($i+1) % 4 == 0);
+                }
+        }
diff --git a/src/lib/libcrypto/des/ede_enc.c b/src/lib/libcrypto/des/ede_enc.c
new file mode 100644
index 0000000000..9f75dd1037
--- /dev/null
+++ b/src/lib/libcrypto/des/ede_enc.c
@@ -0,0 +1,190 @@
+/* crypto/des/ede_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 "des_locl.h"
+
+void des_ede3_cbc_encrypt(input, output, length, ks1, ks2, ks3, ivec, enc)
+des_cblock (*input);
+des_cblock (*output);
+long length;
+des_key_schedule ks1;
+des_key_schedule ks2;
+des_key_schedule ks3;
+des_cblock (*ivec);
+int enc;
+        {
+        register DES_LONG tin0,tin1;
+        register DES_LONG tout0,tout1,xor0,xor1;
+        register unsigned char *in,*out;
+        register long l=length;
+        DES_LONG tin[2];
+        unsigned char *iv;
+
+        in=(unsigned char *)input;
+        out=(unsigned char *)output;
+        iv=(unsigned char *)ivec;
+
+        if (enc)
+                {
+                c2l(iv,tout0);
+                c2l(iv,tout1);
+                for (l-=8; l>=0; l-=8)
+                        {
+                        c2l(in,tin0);
+                        c2l(in,tin1);
+                        tin0^=tout0;
+                        tin1^=tout1;
+
+                        tin[0]=tin0;
+                        tin[1]=tin1;
+                        des_encrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                        tout0=tin[0];
+                        tout1=tin[1];
+
+                        l2c(tout0,out);
+                        l2c(tout1,out);
+                        }
+                if (l != -8)
+                        {
+                        c2ln(in,tin0,tin1,l+8);
+                        tin0^=tout0;
+                        tin1^=tout1;
+
+                        tin[0]=tin0;
+                        tin[1]=tin1;
+                        des_encrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                        tout0=tin[0];
+                        tout1=tin[1];
+
+                        l2c(tout0,out);
+                        l2c(tout1,out);
+                        }
+                iv=(unsigned char *)ivec;
+                l2c(tout0,iv);
+                l2c(tout1,iv);
+                }
+        else
+                {
+                register DES_LONG t0,t1;
+
+                c2l(iv,xor0);
+                c2l(iv,xor1);
+                for (l-=8; l>=0; l-=8)
+                        {
+                        c2l(in,tin0);
+                        c2l(in,tin1);
+
+                        t0=tin0;
+                        t1=tin1;
+
+                        tin[0]=tin0;
+                        tin[1]=tin1;
+                        des_decrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                        tout0=tin[0];
+                        tout1=tin[1];
+
+                        tout0^=xor0;
+                        tout1^=xor1;
+                        l2c(tout0,out);
+                        l2c(tout1,out);
+                        xor0=t0;
+                        xor1=t1;
+                        }
+                if (l != -8)
+                        {
+                        c2l(in,tin0);
+                        c2l(in,tin1);
+                        
+                        t0=tin0;
+                        t1=tin1;
+
+                        tin[0]=tin0;
+                        tin[1]=tin1;
+                        des_decrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                        tout0=tin[0];
+                        tout1=tin[1];
+                
+                        tout0^=xor0;
+                        tout1^=xor1;
+                        l2cn(tout0,tout1,out,l+8);
+                        xor0=t0;
+                        xor1=t1;
+                        }
+
+                iv=(unsigned char *)ivec;
+                l2c(xor0,iv);
+                l2c(xor1,iv);
+                }
+        tin0=tin1=tout0=tout1=xor0=xor1=0;
+        tin[0]=tin[1]=0;
+        }
+
+#ifdef undef /* MACRO */
+void des_ede2_cbc_encrypt(input, output, length, ks1, ks2, ivec, enc)
+des_cblock (*input);
+des_cblock (*output);
+long length;
+des_key_schedule ks1;
+des_key_schedule ks2;
+des_cblock (*ivec);
+int enc;
+        {
+        des_ede3_cbc_encrypt(input,output,length,ks1,ks2,ks1,ivec,enc);
+        }
+#endif
+
diff --git a/src/lib/libcrypto/des/podd.h b/src/lib/libcrypto/des/podd.h
new file mode 100644
index 0000000000..1b2bfe0843
--- /dev/null
+++ b/src/lib/libcrypto/des/podd.h
@@ -0,0 +1,75 @@
+/* crypto/des/podd.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.]
+ */
+
+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};
diff --git a/src/lib/libcrypto/des/ranlib.sh b/src/lib/libcrypto/des/ranlib.sh
new file mode 100644
index 0000000000..543f712c6b
--- /dev/null
+++ b/src/lib/libcrypto/des/ranlib.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+cwd=`pwd`
+cd /tmp
+
+if [ -s /bin/ranlib ] ; then 
+        RL=/bin/ranlib
+else if [ -s /usr/bin/ranlib ] ; then
+        RL=/usr/bin/ranlib
+fi
+fi
+
+if [ "x$RL" != "x" ]
+then
+        case "$1" in
+                /*)  
+                $RL "$1"
+                ;;
+                *)
+                $RL "$cwd/$1"
+                ;;
+        esac
+fi
diff --git a/src/lib/libcrypto/des/shifts.pl b/src/lib/libcrypto/des/shifts.pl
new file mode 100644
index 0000000000..d8a240c1ba
--- /dev/null
+++ b/src/lib/libcrypto/des/shifts.pl
@@ -0,0 +1,198 @@
+#!/usr/bin/perl
+
+sub lab_shift
+        {
+        local(*a,$n)=@_;
+        local(@r,$i,$j,$k,$d,@z);
+
+        @r=&shift(*a,$n);
+        foreach $i (0 .. 31)
+                {
+                @z=split(/\^/,$r[$i]);
+                for ($j=0; $j <= $#z; $j++)
+                        {
+                        ($d)=($z[$j] =~ /^(..)/);
+                        ($k)=($z[$j] =~ /\[(.*)\]$/);
+                        $k.=",$n" if ($k ne "");
+                        $k="$n"   if ($k eq "");
+                        $d="$d[$k]";
+                        $z[$j]=$d;
+                        }
+                $r[$i]=join('^',@z);
+                }
+        return(@r);
+        }
+
+sub shift
+        {
+        local(*a,$n)=@_;
+        local(@f);
+
+        if ($n > 0)
+                {
+                @f=&shiftl(*a,$n);
+                }
+        else
+                {
+                @f=&shiftr(*a,-$n);
+                }
+        return(@f);
+        }
+
+sub rotate
+        {
+        local(*a,$n)=@_;
+        local(@f);
+
+        if ($n > 0)
+                { @f=&rotatel(*a,$n); }
+        else
+                { @f=&rotater(*a,-$n); }
+        return(@f);
+        }
+
+sub rotater
+        {
+        local(*a,$n)=@_;
+        local(@f,@g);
+
+        @f=&shiftr(*a,$n);
+        @g=&shiftl(*a,32-$n);
+        $#f=31;
+        $#g=31;
+        return(&or(*f,*g));
+        }
+
+sub rotatel
+        {
+        local(*a,$n)=@_;
+        local(@f,@g);
+
+        @f=&shiftl(*a,$n);
+        @g=&shiftr(*a,32-$n);
+        $#f=31;
+        $#g=31;
+        return(&or(*f,*g));
+        }
+
+sub shiftr
+        {
+        local(*a,$n)=@_;
+        local(@r,$i);
+
+        $#r=31;
+        foreach $i (0 .. 31)
+                {
+                if (($i+$n) > 31)
+                        {
+                        $r[$i]="--";
+                        }
+                else
+                        {
+                        $r[$i]=$a[$i+$n];
+                        }
+                }
+        return(@r);
+        }
+
+sub shiftl
+        {
+        local(*a,$n)=@_;
+        local(@r,$i);
+
+        $#r=31;
+        foreach $i (0 .. 31)
+                {
+                if ($i < $n)
+                        {
+                        $r[$i]="--";
+                        }
+                else
+                        {
+                        $r[$i]=$a[$i-$n];
+                        }
+                }
+        return(@r);
+        }
+
+sub printit
+        {
+        local(@a)=@_;
+        local($i);
+
+        foreach $i (0 .. 31)
+                {
+                printf "%2s  ",$a[$i];
+                print "\n" if (($i%8) == 7);
+                }
+        print "\n";
+        }
+
+sub xor
+        {
+        local(*a,*b)=@_;
+        local(@r,$i);
+
+        $#r=31;
+        foreach $i (0 .. 31)
+                {
+                $r[$i]=&compress($a[$i].'^'.$b[$i]);
+#               $r[$i]=$a[$i]."^".$b[$i];
+                }
+        return(@r);
+        }
+
+sub and
+        {
+        local(*a,$m)=@_;
+        local(@r,$i);
+
+        $#r=31;
+        foreach $i (0 .. 31)
+                {
+                $r[$i]=(($m & (1<<$i))?($a[$i]):('--'));
+                }
+        return(@r);
+        }
+
+sub or
+        {
+        local(*a,*b)=@_;
+        local(@r,$i);
+
+        $#r=31;
+        foreach $i (0 .. 31)
+                {
+                $r[$i]='--'   if (($a[$i] eq '--') && ($b[$i] eq '--'));
+                $r[$i]=$a[$i] if (($a[$i] ne '--') && ($b[$i] eq '--'));
+                $r[$i]=$b[$i] if (($a[$i] eq '--') && ($b[$i] ne '--'));
+                $r[$i]='++'   if (($a[$i] ne '--') && ($b[$i] ne '--'));
+                }
+        return(@r);
+        }
+
+sub compress
+        {
+        local($s)=@_;
+        local($_,$i,@a,%a,$r);
+
+        $s =~ s/\^\^/\^/g;
+        $s =~ s/^\^//;
+        $s =~ s/\^$//;
+        @a=split(/\^/,$s);
+
+        while ($#a >= 0)
+                {
+                $_=shift(@a);
+                next unless /\d/;
+                $a{$_}++;
+                }
+        foreach $i (sort keys %a)
+                {
+                next if ($a{$i}%2 == 0);
+                $r.="$i^";
+                }
+        chop($r);
+        return($r);
+        }
+1;
diff --git a/src/lib/libcrypto/des/sk.h b/src/lib/libcrypto/des/sk.h
new file mode 100644
index 0000000000..f2ade88c7c
--- /dev/null
+++ b/src/lib/libcrypto/des/sk.h
@@ -0,0 +1,204 @@
+/* crypto/des/sk.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.]
+ */
+
+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,
+}};
diff --git a/src/lib/libcrypto/des/supp.c b/src/lib/libcrypto/des/supp.c
new file mode 100644
index 0000000000..f8e5833f69
--- /dev/null
+++ b/src/lib/libcrypto/des/supp.c
@@ -0,0 +1,109 @@
+/* crypto/des/supp.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) 1995
+ *      Mark Murray.  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 acknowledgement:
+ *      This product includes software developed by Mark Murray
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY MARK MURRAY 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.
+ *
+ * $Id: supp.c,v 1.1.1.1 1998/10/05 20:12:45 ryker Exp $
+ */
+
+#include <stdio.h>
+#include "des_locl.h"
+
+void des_cblock_print_file(cb, fp)
+        des_cblock *cb;
+        FILE *fp;
+{
+        int i;
+        unsigned int *p = (unsigned int *)cb;
+
+        fprintf(fp, " 0x { ");
+        for (i = 0; i < 8; i++) {
+                fprintf(fp, "%x", p[i]);
+                if (i != 7) fprintf(fp, ", ");
+        }
+        fprintf(fp, " }");
+}
diff --git a/src/lib/libcrypto/des/testdes.pl b/src/lib/libcrypto/des/testdes.pl
new file mode 100644
index 0000000000..67fbd47f36
--- /dev/null
+++ b/src/lib/libcrypto/des/testdes.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl
+
+# des.pl tesing code
+
+require 'des.pl';
+
+$num_tests=34;
+@key_data=(
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10,
+        0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57,
+        0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E,
+        0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86,
+        0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E,
+        0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6,
+        0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE,
+        0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6,
+        0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE,
+        0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16,
+        0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F,
+        0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46,
+        0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E,
+        0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76,
+        0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07,
+        0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F,
+        0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7,
+        0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF,
+        0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6,
+        0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF,
+        0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
+        0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E,
+        0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10,
+        );
+
+@plain_data=(
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+        0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
+        0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42,
+        0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA,
+        0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72,
+        0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A,
+        0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2,
+        0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A,
+        0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2,
+        0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A,
+        0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02,
+        0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A,
+        0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32,
+        0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA,
+        0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62,
+        0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2,
+        0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA,
+        0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92,
+        0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A,
+        0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2,
+        0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF);
+
+@cipher_data=(
+        0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7,
+        0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58,
+        0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B,
+        0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33,
+        0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D,
+        0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD,
+        0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7,
+        0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4,
+        0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B,
+        0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71,
+        0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A,
+        0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A,
+        0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95,
+        0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B,
+        0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09,
+        0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A,
+        0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F,
+        0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88,
+        0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77,
+        0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A,
+        0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56,
+        0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56,
+        0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56,
+        0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC,
+        0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A,
+        0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41,
+        0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93,
+        0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00,
+        0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06,
+        0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7,
+        0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51,
+        0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE,
+        0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D,
+        0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2);
+
+print "Doing ecb tests\n";
+for ($i=0; $i<$num_tests; $i++)
+        {
+        printf "Doing test $i\n";
+        $key =pack("C8",splice(@key_data   ,0,8));
+        $data=pack("C8",splice(@plain_data ,0,8));
+        $res =pack("C8",splice(@cipher_data,0,8));
+
+        @ks=  &des_set_key($key);
+        $out1= &des_ecb_encrypt(*ks,1,$data);
+        $out2= &des_ecb_encrypt(*ks,0,$out1);
+        $out3= &des_ecb_encrypt(*ks,0,$res);
+        &eprint("encryption failure",$res,$out1)
+                if ($out1 ne $res);
+        &eprint("encryption/decryption failure",$data,$out2)
+                if ($out2 ne $data);
+        &eprint("decryption failure",$data,$out3)
+                if ($data ne $out3);
+        }
+print "Done\n";
+
+print "doing speed test over 30 seconds\n";
+$SIG{'ALRM'}='done';
+sub done {$done=1;}
+$done=0;
+
+$count=0;
+$d=pack("C8",0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef);
+@ks=  &des_set_key($d);
+alarm(30);
+$start=(times)[0];
+while (!$done)
+        {
+        $count++;
+        $d=&des_ecb_encrypt(*ks,1,$d);
+        }
+$end=(times)[0];
+$t=$end-$start;
+printf "$count DESs in %.2f seconds is %.2f DESs/sec or %.2f bytes/sec\n",
+        1.0*$t,1.0*$count/$t,$count*8.0/$t;
+
+sub eprint
+        {
+        local($s,$c,$e)=@_;
+        local(@k);
+
+        @k=unpack("C8",$c);
+        printf "%02x%02x%02x%02x %02x%02x%02x%02x - ",unpack("C8",$c);
+        printf "%02x%02x%02x%02x %02x%02x%02x%02x :",unpack("C8",$e);
+        print " $s\n";
+        }
diff --git a/src/lib/libcrypto/des/vms.com b/src/lib/libcrypto/des/vms.com
new file mode 100644
index 0000000000..62ca1fbda4
--- /dev/null
+++ b/src/lib/libcrypto/des/vms.com
@@ -0,0 +1,90 @@
+$! --- VMS.com ---
+$!
+$ GoSub defines
+$ GoSub linker_options
+$ If (P1 .nes. "")
+$ Then 
+$   GoSub 'P1'
+$ Else
+$   GoSub lib
+$   GoSub destest
+$   GoSub rpw
+$   GoSub speed
+$   GoSub des
+$ EndIF
+$!
+$ Exit
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$DEFINES:
+$ OPT_FILE := "VAX_LINKER_OPTIONS.OPT"
+$!
+$ CC_OPTS := "/NODebug/OPTimize/NOWarn"
+$!
+$ LINK_OPTS := "/NODebug/NOTraceback/Contiguous"
+$!
+$ OBJS  = "cbc_cksm.obj,cbc_enc.obj,ecb_enc.obj,pcbc_enc.obj," + -
+          "qud_cksm.obj,rand_key.obj,read_pwd.obj,set_key.obj,"      + -
+          "str2key.obj,enc_read.obj,enc_writ.obj,fcrypt.obj,"           + -
+          "cfb_enc.obj,ecb3_enc.obj,ofb_enc.obj"
+           
+           
+$!
+$ LIBDES = "cbc_cksm.c,cbc_enc.c,ecb_enc.c,enc_read.c,"           + -
+           "enc_writ.c,pcbc_enc.c,qud_cksm.c,rand_key.c,"         + -
+           "read_pwd.c,set_key.c,str2key.c,fcrypt.c,"                + -
+           "cfb_enc.c,ecb3_enc.c,ofb_enc.c"
+$ Return
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$LINKER_OPTIONS:
+$ If (f$search(OPT_FILE) .eqs. "")
+$ Then
+$   Create 'OPT_FILE'
+$DECK
+! Default system options file to link against the sharable C runtime library
+!
+Sys$Share:VAXcRTL.exe/Share
+$EOD
+$ EndIF
+$ Return
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$LIB:
+$ CC 'CC_OPTS' 'LIBDES'
+$ If (f$search("LIBDES.OLB") .nes. "")
+$ Then Library /Object /Replace libdes 'OBJS'
+$ Else Library /Create /Object  libdes 'OBJS'
+$ EndIF
+$ Return
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$DESTEST:
+$ CC 'CC_OPTS' destest
+$ Link 'link_opts' /Exec=destest destest.obj,libdes/LIBRARY,'opt_file'/Option
+$ Return
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$RPW:
+$ CC 'CC_OPTS' rpw
+$ Link 'link_opts' /Exec=rpw  rpw.obj,libdes/LIBRARY,'opt_file'/Option
+$ Return
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$SPEED:
+$ CC 'CC_OPTS' speed
+$ Link 'link_opts' /Exec=speed speed.obj,libdes/LIBRARY,'opt_file'/Option
+$ Return
+$!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$DES:
+$ CC 'CC_OPTS' des
+$ Link 'link_opts' /Exec=des des.obj,libdes/LIBRARY,'opt_file'/Option
+$ Return
diff --git a/src/lib/libcrypto/dh/Makefile.ssl b/src/lib/libcrypto/dh/Makefile.ssl
new file mode 100644
index 0000000000..dfa7e4525d
--- /dev/null
+++ b/src/lib/libcrypto/dh/Makefile.ssl
@@ -0,0 +1,84 @@
+#
+# SSLeay/crypto/dh/Makefile
+#
+
+DIR=    dh
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=dh
+ERRC=dh_err
+GENERAL=Makefile
+TEST= dhtest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= dh_gen.c dh_key.c dh_lib.c dh_check.c $(ERRC).c
+LIBOBJ= dh_gen.o dh_key.o dh_lib.o dh_check.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= dh.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/dh/dh.err b/src/lib/libcrypto/dh/dh.err
new file mode 100644
index 0000000000..a4fe746985
--- /dev/null
+++ b/src/lib/libcrypto/dh/dh.err
@@ -0,0 +1,12 @@
+/* Error codes for the DH functions. */
+
+/* Function codes. */
+#define DH_F_DHPARAMS_PRINT                              100
+#define DH_F_DHPARAMS_PRINT_FP                           101
+#define DH_F_DH_COMPUTE_KEY                              102
+#define DH_F_DH_GENERATE_KEY                             103
+#define DH_F_DH_GENERATE_PARAMETERS                      104
+#define DH_F_DH_NEW                                      105
+
+/* Reason codes. */
+#define DH_R_NO_PRIVATE_VALUE                            100
diff --git a/src/lib/libcrypto/dsa/Makefile.ssl b/src/lib/libcrypto/dsa/Makefile.ssl
new file mode 100644
index 0000000000..2cc4ddb39e
--- /dev/null
+++ b/src/lib/libcrypto/dsa/Makefile.ssl
@@ -0,0 +1,84 @@
+#
+# SSLeay/crypto/dsa/Makefile
+#
+
+DIR=    dsa
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=dsa
+ERRC=dsa_err
+GENERAL=Makefile
+TEST=dsatest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c dsa_sign.c $(ERRC).c
+LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_vrf.o dsa_sign.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= dsa.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/dsa/dsa.err b/src/lib/libcrypto/dsa/dsa.err
new file mode 100644
index 0000000000..1131e9fa74
--- /dev/null
+++ b/src/lib/libcrypto/dsa/dsa.err
@@ -0,0 +1,15 @@
+/* Error codes for the DSA functions. */
+
+/* Function codes. */
+#define DSA_F_DSAPARAMS_PRINT                            100
+#define DSA_F_DSAPARAMS_PRINT_FP                         101
+#define DSA_F_DSA_IS_PRIME                               102
+#define DSA_F_DSA_NEW                                    103
+#define DSA_F_DSA_PRINT                                  104
+#define DSA_F_DSA_PRINT_FP                               105
+#define DSA_F_DSA_SIGN                                   106
+#define DSA_F_DSA_SIGN_SETUP                             107
+#define DSA_F_DSA_VERIFY                                 108
+
+/* Reason codes. */
+#define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                100
diff --git a/src/lib/libcrypto/err/Makefile.ssl b/src/lib/libcrypto/err/Makefile.ssl
new file mode 100644
index 0000000000..57c87eb041
--- /dev/null
+++ b/src/lib/libcrypto/err/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/err/Makefile
+#
+
+DIR=    err
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=err.c err_all.c err_prn.c
+LIBOBJ=err.o err_all.o err_prn.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= err.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/err/err_code.pl b/src/lib/libcrypto/err/err_code.pl
new file mode 100644
index 0000000000..ebc8eef913
--- /dev/null
+++ b/src/lib/libcrypto/err/err_code.pl
@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+
+while (@ARGV)
+        {
+        $in=shift(@ARGV);
+        if ($in =~ /^-conf$/)
+                {
+                $in=shift(@ARGV);
+                open(IN,"<$in") || die "unable to open '$in'\n";
+                while (<IN>)
+                        {
+                        s/#.*$//;
+                        s/\s+$//;
+                        next if (/^$/);
+                        if (/^L\s+(\S+)\s+(\S+)$/)
+                                { $errfile{$1}=$2; }
+                        elsif (/^F\s+(\S+)$/)
+                                { $function{$1}=1; }
+                        elsif (/^R\s+(\S+)\s+(\S+)$/)
+                                { $r_value{$1}=$2; }
+                        else { die "bad input line: $in:$.\n"; }
+                        }
+                close(IN);
+                next;
+                }
+
+        open(IN,"<$in") || die "unable to open '$in'\n";
+        $last="";
+        while (<IN>)
+                {
+                if (/err\(([A-Z0-9]+_F_[0-9A-Z_]+)\s*,\s*([0-9A-Z]+_R_[0-9A-Z_]+)\s*\)/)
+                        {
+                        if ($1 != $last)
+                                {
+                                if ($function{$1} == 0)
+                                        {
+                                        printf STDERR "$. $1 is bad\n";
+                                        }
+                                }
+                        $function{$1}++;
+                        $last=$1;
+                        $reason{$2}++;
+                        }
+                }
+        close(IN);
+        }
+
+foreach (keys %function,keys %reason)
+        {
+        /^([A-Z0-9]+)_/;
+        $prefix{$1}++;
+        }
+
+@F=sort keys %function;
+@R=sort keys %reason;
+foreach $j (sort keys %prefix)
+        {
+        next if $errfile{$j} eq "NONE";
+        printf STDERR "doing %-6s - ",$j;
+        if (defined($errfile{$j}))
+                {
+                open(OUT,">$errfile{$j}") ||
+                        die "unable to open '$errfile{$j}':$!\n";
+                $close_file=1;
+                }
+        else
+                {
+                *OUT=*STDOUT;
+                $close=0;
+                }
+        @f=grep(/^${j}_/,@F);
+        @r=grep(/^${j}_/,@R);
+        $num=100;
+        print OUT "/* Error codes for the $j functions. */\n\n";
+        print OUT "/* Function codes. */\n";
+        $f_count=0;
+        foreach $i (@f)
+                {
+                $z=6-int(length($i)/8);
+                printf OUT "#define $i%s $num\n","\t" x $z;
+                $num++;
+                $f_count++;
+                }
+        $num=100;
+        print OUT "\n/* Reason codes. */\n";
+        $r_count=0;
+        foreach $i (@r)
+                {
+                $z=6-int(length($i)/8);
+                if (defined($r_value{$i}))
+                        {
+                        printf OUT "#define $i%s $r_value{$i}\n","\t" x $z;
+                        }
+                else
+                        {
+                        printf OUT "#define $i%s $num\n","\t" x $z;
+                        $num++;
+                        }
+                $r_count++;
+                }
+        close(OUT) if $close_file;
+
+        printf STDERR "%3d functions, %3d reasons\n",$f_count,$r_count;
+        }
+
diff --git a/src/lib/libcrypto/err/err_genc.pl b/src/lib/libcrypto/err/err_genc.pl
new file mode 100644
index 0000000000..a8e36c2f0c
--- /dev/null
+++ b/src/lib/libcrypto/err/err_genc.pl
@@ -0,0 +1,198 @@
+#!/usr/bin/perl
+
+if ($ARGV[0] eq "-s") { $static=1; shift @ARGV; }
+
+($#ARGV == 1) || die "usage: $0 [-s] <header file> <output C file>\n";
+open(IN,"<$ARGV[0]") || die "unable to open $ARGV[0]:$!\n";
+open(STDOUT,">$ARGV[1]") || die "unable to open $ARGV[1]:$!\n";
+
+$Func=0;
+$Reas=0;
+$fuction{'FOPEN'}='fopen';
+while (<IN>)
+        {
+        if (/(\S+)\s*\(\);/)
+                {
+                $t=$1;
+                $t =~ s/\*//;
+                ($upper=$t) =~ tr/a-z/A-Z/;
+                $fuction{$upper}=$t;
+                }
+        next unless (/^#define\s+(\S+)\s/);
+
+        $o=$1;
+        if ($o =~ /^([^_]+)_F_(.*)/)
+                {
+                $type=$1;
+                $Func++;
+                $n=$2;
+                $n=$fuction{$n} if (defined($fuction{$n}));
+                $out{$1."_str_functs"}.=
+                        sprintf("{ERR_PACK(0,%s,0),\t\"$n\"},\n",$o);
+                }
+        elsif ($o =~ /^([^_]+)_R_(.*)/)
+                {
+                $type=$1;
+                $Reas++;
+                $r=$2;
+                $r =~ tr/A-Z_/a-z /;
+                $pkg{$type."_str_reasons"}=$type;
+                $out{$type."_str_reasons"}.=sprintf("{%-40s,\"$r\"},\n",$o);
+                }
+        elsif ($ARGV[0] =~ /rsaref/ && $o =~ /^RE_(.*)/)
+                {
+                $type="RSAREF";
+                $Reas++;
+                $r=$1;
+                $r =~ tr/A-Z_/a-z /;
+                $pkg{$type."_str_reasons"}=$type;
+                $out{$type."_str_reasons"}.=sprintf("{%-40s,\"$r\"},\n",$o);
+                }
+        }
+close(IN);
+
+&header($type,$ARGV[0]);
+
+foreach (sort keys %out)
+        {
+        print "static ERR_STRING_DATA ${_}[]=\n\t{\n";
+        print $out{$_};
+        print "{0,NULL},\n";
+        print "\t};\n\n";
+        }
+print "#endif\n";
+
+if ($static)
+        { $lib="ERR_LIB_$type"; }
+else
+        { $lib="${type}_lib_error_code"; }
+
+$str="";
+$str.="#ifndef NO_ERR\n";
+$str.="\t\tERR_load_strings($lib,${type}_str_functs);\n" if $Func;
+$str.="\t\tERR_load_strings($lib,${type}_str_reasons);\n" if $Reas;
+$str.="#endif\n";
+
+if (!$static)
+        {
+print <<"EOF";
+
+static int ${type}_lib_error_code=0;
+
+void ERR_load_${type}_strings()
+        {
+        static int init=1;
+
+        if (${type}_lib_error_code == 0)
+                ${type}_lib_error_code=ERR_get_next_error_library();
+
+        if (init);
+                {;
+                init=0;
+$str
+                }
+        }
+
+void ERR_${type}_error(function,reason,file,line)
+int function;
+int reason;
+char *file;
+int line;
+        {
+        if (${type}_lib_error_code == 0)
+                ${type}_lib_error_code=ERR_get_next_error_library();
+        ERR_PUT_error(${type}_lib_error_code,function,reason,file,line);
+        }
+EOF
+        }
+else # $static
+        {
+        print <<"EOF";
+
+void ERR_load_${type}_strings()
+        {
+        static int init=1;
+
+        if (init);
+                {;
+                init=0;
+$str
+                }
+        }
+EOF
+        }
+
+sub header
+        {
+        ($type,$header)=@_;
+
+        ($lc=$type) =~ tr/A-Z/a-z/;
+        $header =~ s/^.*\///;
+
+        print "/* lib/$lc/${lc}\_err.c */\n";
+        print <<'EOF';
+/* 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.]
+ */
+EOF
+
+        print "#include <stdio.h>\n";
+        print "#include \"err.h\"\n";
+        print "#include \"$header\"\n";
+        print "\n/* BEGIN ERROR CODES */\n";
+        print "#ifndef NO_ERR\n";
+        }
+
diff --git a/src/lib/libcrypto/err/error.err b/src/lib/libcrypto/err/error.err
new file mode 100644
index 0000000000..f09557d8d9
--- /dev/null
+++ b/src/lib/libcrypto/err/error.err
@@ -0,0 +1,13 @@
+/* Error codes for the ERR functions. */
+
+/* Function codes. */
+
+/* Reason codes. */
+#define ERR_R_BN_LIB                                    100
+#define ERR_R_DER_LIB                                   101
+#define ERR_R_MALLOC_FAILURE                            102
+#define ERR_R_PEM_LIB                                   103
+#define ERR_R_RSA_LIB                                   104
+#define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED               105
+#define ERR_R_SYS_LIB                                   106
+#define ERR_R_X509_LIB                                  107
diff --git a/src/lib/libcrypto/err/ssleay.ec b/src/lib/libcrypto/err/ssleay.ec
new file mode 100644
index 0000000000..10b5dbb59d
--- /dev/null
+++ b/src/lib/libcrypto/err/ssleay.ec
@@ -0,0 +1,57 @@
+L ERR           NONE
+L CRYPTO        crypto.err
+L BN            bn/bn.err
+L RSA           rsa/rsa.err
+L DSA           dsa/dsa.err
+L DH            dh/dh.err
+L EVP           evp/evp.err
+L BUF           buffer/buffer.err
+L BIO           bio/bio.err
+L OBJ           objects/objects.err
+L PEM           pem/pem.err
+L X509          x509/x509.err
+L METH          meth/meth.err
+L ASN1          asn1/asn1.err
+L CONF          conf/conf.err
+L PROXY         proxy/proxy.err
+L PKCS7         pkcs7/pkcs7.err
+L RSAREF        ../rsaref/rsaref.err
+L SSL           ../ssl/ssl.err
+L SSL2          ../ssl/ssl2.err
+L SSL3          ../ssl/ssl3.err
+L SSL23         ../ssl/ssl23.err
+
+F RSAREF_F_RSA_BN2BIN
+F RSAREF_F_RSA_PRIVATE_DECRYPT
+F RSAREF_F_RSA_PRIVATE_ENCRYPT
+F RSAREF_F_RSA_PUBLIC_DECRYPT
+F RSAREF_F_RSA_PUBLIC_ENCRYPT
+#F SSL_F_CLIENT_CERTIFICATE
+
+R SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE          1010
+R SSL_R_SSLV3_ALERT_BAD_RECORD_MAC              1020
+R SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE       1030
+R SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE           1040
+R SSL_R_SSLV3_ALERT_NO_CERTIFICATE              1041
+R SSL_R_SSLV3_ALERT_BAD_CERTIFICATE             1042
+R SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE     1043
+R SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED         1044
+R SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED         1045
+R SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN         1046
+R SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER           1047
+
+R RSAREF_R_CONTENT_ENCODING                     0x0400
+R RSAREF_R_DATA                                 0x0401
+R RSAREF_R_DIGEST_ALGORITHM                     0x0402
+R RSAREF_R_ENCODING                             0x0403
+R RSAREF_R_KEY                                  0x0404
+R RSAREF_R_KEY_ENCODING                         0x0405
+R RSAREF_R_LEN                                  0x0406
+R RSAREF_R_MODULUS_LEN                          0x0407
+R RSAREF_R_NEED_RANDOM                          0x0408
+R RSAREF_R_PRIVATE_KEY                          0x0409
+R RSAREF_R_PUBLIC_KEY                           0x040a
+R RSAREF_R_SIGNATURE                            0x040b
+R RSAREF_R_SIGNATURE_ENCODING                   0x040c
+R RSAREF_R_ENCRYPTION_ALGORITHM                 0x040d
+
diff --git a/src/lib/libcrypto/evp/Makefile.ssl b/src/lib/libcrypto/evp/Makefile.ssl
new file mode 100644
index 0000000000..8bf2516458
--- /dev/null
+++ b/src/lib/libcrypto/evp/Makefile.ssl
@@ -0,0 +1,111 @@
+#
+# SSLeay/crypto/evp/Makefile
+#
+
+DIR=    evp
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=evp
+ERRC=evp_err
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= encode.c digest.c evp_enc.c evp_key.c \
+        e_ecb_d.c e_cbc_d.c e_cfb_d.c e_ofb_d.c \
+        e_ecb_i.c e_cbc_i.c e_cfb_i.c e_ofb_i.c \
+        e_ecb_3d.c e_cbc_3d.c e_rc4.c names.c \
+        e_cfb_3d.c e_ofb_3d.c e_xcbc_d.c \
+        e_ecb_r2.c e_cbc_r2.c e_cfb_r2.c e_ofb_r2.c \
+        e_ecb_bf.c e_cbc_bf.c e_cfb_bf.c e_ofb_bf.c \
+        e_ecb_c.c e_cbc_c.c e_cfb_c.c e_ofb_c.c \
+        e_ecb_r5.c e_cbc_r5.c e_cfb_r5.c e_ofb_r5.c \
+        m_null.c m_md2.c m_md5.c m_sha.c m_sha1.c m_dss.c m_dss1.c m_mdc2.c \
+        m_ripemd.c \
+        p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
+        bio_md.c bio_b64.c bio_enc.c $(ERRC).c e_null.c \
+        c_all.c evp_lib.c
+
+LIBOBJ= encode.o digest.o evp_enc.o evp_key.o \
+        e_ecb_d.o e_cbc_d.o e_cfb_d.o e_ofb_d.o \
+        e_ecb_i.o e_cbc_i.o e_cfb_i.o e_ofb_i.o \
+        e_ecb_3d.o e_cbc_3d.o e_rc4.o names.o \
+        e_cfb_3d.o e_ofb_3d.o e_xcbc_d.o \
+        e_ecb_r2.o e_cbc_r2.o e_cfb_r2.o e_ofb_r2.o \
+        e_ecb_bf.o e_cbc_bf.o e_cfb_bf.o e_ofb_bf.o \
+        e_ecb_c.o e_cbc_c.o e_cfb_c.o e_ofb_c.o \
+        e_ecb_r5.o e_cbc_r5.o e_cfb_r5.o e_ofb_r5.o \
+        m_null.o m_md2.o m_md5.o m_sha.o m_sha1.o m_dss.o m_dss1.o m_mdc2.o \
+        m_ripemd.o \
+        p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \
+        bio_md.o bio_b64.o bio_enc.o $(ERRC).o e_null.o \
+        c_all.o evp_lib.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= evp.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/evp/e_cbc_3d.c b/src/lib/libcrypto/evp/e_cbc_3d.c
new file mode 100644
index 0000000000..5761bf186a
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_3d.c
@@ -0,0 +1,163 @@
+/* crypto/evp/e_cbc_3d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_cbc_ede_init_key();
+static void des_cbc_ede3_init_key();
+static void des_cbc_ede_cipher();
+#endif
+
+static EVP_CIPHER d_cbc_ede_cipher2=
+        {
+        NID_des_ede_cbc,
+        8,16,8,
+        des_cbc_ede_init_key,
+        des_cbc_ede_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        EVP_CIPHER_get_asn1_iv,
+        EVP_CIPHER_set_asn1_iv,
+        };
+
+static EVP_CIPHER d_cbc_ede_cipher3=
+        {
+        NID_des_ede3_cbc,
+        8,24,8,
+        des_cbc_ede3_init_key,
+        des_cbc_ede_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_des_ede_cbc()
+        {
+        return(&d_cbc_ede_cipher2);
+        }
+
+EVP_CIPHER *EVP_des_ede3_cbc()
+        {
+        return(&d_cbc_ede_cipher3);
+        }
+        
+static void des_cbc_ede_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                memcpy( (char *)ctx->c.des_ede.ks3,
+                        (char *)ctx->c.des_ede.ks1,
+                        sizeof(ctx->c.des_ede.ks1));
+                }
+        }
+
+static void des_cbc_ede3_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+                }
+        }
+
+static void des_cbc_ede_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        des_ede3_cbc_encrypt(
+                (des_cblock *)in,(des_cblock *)out,
+                (long)inl, ctx->c.des_ede.ks1,
+                ctx->c.des_ede.ks2,ctx->c.des_ede.ks3,
+                (des_cblock *)&(ctx->iv[0]),
+                ctx->encrypt);
+        }
diff --git a/src/lib/libcrypto/evp/e_cbc_bf.c b/src/lib/libcrypto/evp/e_cbc_bf.c
new file mode 100644
index 0000000000..be605f4a13
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_bf.c
@@ -0,0 +1,119 @@
+/* crypto/evp/e_cbc_bf.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.]
+ */
+
+#ifndef NO_BLOWFISH
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void bf_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void bf_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void bf_cbc_init_key();
+static void bf_cbc_cipher();
+#endif
+
+static EVP_CIPHER bfish_cbc_cipher=
+        {
+        NID_bf_cbc,
+        8,EVP_BLOWFISH_KEY_SIZE,8,
+        bf_cbc_init_key,
+        bf_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
+        EVP_CIPHER_get_asn1_iv,
+        EVP_CIPHER_set_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_bf_cbc()
+        {
+        return(&bfish_cbc_cipher);
+        }
+        
+static void bf_cbc_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+        }
+
+static void bf_cbc_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        BF_cbc_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.bf_ks),&(ctx->iv[0]),
+                ctx->encrypt);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_cbc_c.c b/src/lib/libcrypto/evp/e_cbc_c.c
new file mode 100644
index 0000000000..b50c7874b3
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_c.c
@@ -0,0 +1,119 @@
+/* crypto/evp/e_cbc_c.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.]
+ */
+
+#ifndef NO_CAST
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void cast_cbc_init_key();
+static void cast_cbc_cipher();
+#endif
+
+static EVP_CIPHER cast5_cbc_cipher=
+        {
+        NID_cast5_cbc,
+        8,EVP_CAST5_KEY_SIZE,8,
+        cast_cbc_init_key,
+        cast_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
+        EVP_CIPHER_get_asn1_iv,
+        EVP_CIPHER_set_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_cast5_cbc()
+        {
+        return(&cast5_cbc_cipher);
+        }
+        
+static void cast_cbc_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+        }
+
+static void cast_cbc_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        CAST_cbc_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.cast_ks),&(ctx->iv[0]),
+                ctx->encrypt);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_cbc_d.c b/src/lib/libcrypto/evp/e_cbc_d.c
new file mode 100644
index 0000000000..c67706e3a0
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_d.c
@@ -0,0 +1,116 @@
+/* crypto/evp/e_cbc_d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_cbc_init_key();
+static void des_cbc_cipher();
+#endif
+
+static EVP_CIPHER d_cbc_cipher=
+        {
+        NID_des_cbc,
+        8,8,8,
+        des_cbc_init_key,
+        des_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
+        EVP_CIPHER_get_asn1_iv,
+        EVP_CIPHER_set_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_des_cbc()
+        {
+        return(&d_cbc_cipher);
+        }
+        
+static void des_cbc_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                des_set_key((des_cblock *)key,ctx->c.des_ks);
+        }
+
+static void des_cbc_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        des_ncbc_encrypt(
+                (des_cblock *)in,(des_cblock *)out,
+                (long)inl, ctx->c.des_ks,
+                (des_cblock *)&(ctx->iv[0]),
+                ctx->encrypt);
+        }
diff --git a/src/lib/libcrypto/evp/e_cbc_i.c b/src/lib/libcrypto/evp/e_cbc_i.c
new file mode 100644
index 0000000000..312ffcb721
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_i.c
@@ -0,0 +1,131 @@
+/* crypto/evp/e_cbc_i.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.]
+ */
+
+#ifndef NO_IDEA
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void idea_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void idea_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void idea_cbc_init_key();
+static void idea_cbc_cipher();
+#endif
+
+static EVP_CIPHER i_cbc_cipher=
+        {
+        NID_idea_cbc,
+        8,16,8,
+        idea_cbc_init_key,
+        idea_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
+        EVP_CIPHER_get_asn1_iv,
+        EVP_CIPHER_set_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_idea_cbc()
+        {
+        return(&i_cbc_cipher);
+        }
+        
+static void idea_cbc_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                {
+                if (enc)
+                        idea_set_encrypt_key(key,&(ctx->c.idea_ks));
+                else
+                        {
+                        IDEA_KEY_SCHEDULE tmp;
+
+                        idea_set_encrypt_key(key,&tmp);
+                        idea_set_decrypt_key(&tmp,&(ctx->c.idea_ks));
+                        memset((unsigned char *)&tmp,0,
+                                sizeof(IDEA_KEY_SCHEDULE));
+                        }
+                }
+        }
+
+static void idea_cbc_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        idea_cbc_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.idea_ks),&(ctx->iv[0]),
+                ctx->encrypt);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_cbc_r2.c b/src/lib/libcrypto/evp/e_cbc_r2.c
new file mode 100644
index 0000000000..4f8002f16d
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_r2.c
@@ -0,0 +1,136 @@
+/* crypto/evp/e_cbc_r2.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.]
+ */
+
+#ifndef NO_RC2
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc2_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc2_cbc_init_key();
+static void rc2_cbc_cipher();
+#endif
+
+static EVP_CIPHER r2_cbc_cipher=
+        {
+        NID_rc2_cbc,
+        8,EVP_RC2_KEY_SIZE,8,
+        rc2_cbc_init_key,
+        rc2_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+        EVP_CIPHER_get_asn1_iv,
+        EVP_CIPHER_set_asn1_iv,
+        };
+
+static EVP_CIPHER r2_40_cbc_cipher=
+        {
+        NID_rc2_40_cbc,
+        8,5 /* 40 bit */,8,
+        rc2_cbc_init_key,
+        rc2_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+        };
+
+EVP_CIPHER *EVP_rc2_cbc()
+        {
+        return(&r2_cbc_cipher);
+        }
+
+EVP_CIPHER *EVP_rc2_40_cbc()
+        {
+        return(&r2_40_cbc_cipher);
+        }
+        
+static void rc2_cbc_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
+                        key,EVP_CIPHER_CTX_key_length(ctx)*8);
+        }
+
+static void rc2_cbc_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        RC2_cbc_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.rc2_ks),&(ctx->iv[0]),
+                ctx->encrypt);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_cbc_r5.c b/src/lib/libcrypto/evp/e_cbc_r5.c
new file mode 100644
index 0000000000..f7d46ca91f
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cbc_r5.c
@@ -0,0 +1,120 @@
+/* crypto/evp/e_cbc_r5.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.]
+ */
+
+#ifndef NO_RC5
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void r_32_12_16_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void r_32_12_16_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void r_32_12_16_cbc_init_key();
+static void r_32_12_16_cbc_cipher();
+#endif
+
+static EVP_CIPHER rc5_32_12_16_cbc_cipher=
+        {
+        NID_rc5_cbc,
+        8,EVP_RC5_32_12_16_KEY_SIZE,8,
+        r_32_12_16_cbc_init_key,
+        r_32_12_16_cbc_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_rc5_32_12_16_cbc()
+        {
+        return(&rc5_32_12_16_cbc_cipher);
+        }
+        
+static void r_32_12_16_cbc_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                RC5_32_set_key(&(ctx->c.rc5_ks),EVP_RC5_32_12_16_KEY_SIZE,
+                        key,RC5_12_ROUNDS);
+        }
+
+static void r_32_12_16_cbc_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        RC5_32_cbc_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.rc5_ks),&(ctx->iv[0]),
+                ctx->encrypt);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_cfb_3d.c b/src/lib/libcrypto/evp/e_cfb_3d.c
new file mode 100644
index 0000000000..e7e3419411
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_3d.c
@@ -0,0 +1,166 @@
+/* crypto/evp/e_cfb_3d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_ede_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ede3_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ede_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_ede_cfb_init_key();
+static void des_ede3_cfb_init_key();
+static void des_ede_cfb_cipher();
+#endif
+
+static EVP_CIPHER d_ede_cfb_cipher2=
+        {
+        NID_des_ede_cfb64,
+        1,16,8,
+        des_ede_cfb_init_key,
+        des_ede_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+static EVP_CIPHER d_ede3_cfb_cipher3=
+        {
+        NID_des_ede3_cfb64,
+        1,24,8,
+        des_ede3_cfb_init_key,
+        des_ede_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_des_ede_cfb()
+        {
+        return(&d_ede_cfb_cipher2);
+        }
+
+EVP_CIPHER *EVP_des_ede3_cfb()
+        {
+        return(&d_ede3_cfb_cipher3);
+        }
+        
+static void des_ede_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                memcpy( (char *)ctx->c.des_ede.ks3,
+                        (char *)ctx->c.des_ede.ks1,
+                        sizeof(ctx->c.des_ede.ks1));
+                }
+        }
+
+static void des_ede3_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+                }
+        }
+
+static void des_ede_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        des_ede3_cfb64_encrypt(
+                in,out,(long)inl,
+                ctx->c.des_ede.ks1,
+                ctx->c.des_ede.ks2,
+                ctx->c.des_ede.ks3,
+                (des_cblock *)&(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
diff --git a/src/lib/libcrypto/evp/e_cfb_bf.c b/src/lib/libcrypto/evp/e_cfb_bf.c
new file mode 100644
index 0000000000..8aba2564b8
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_bf.c
@@ -0,0 +1,121 @@
+/* crypto/evp/e_cfb_bf.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.]
+ */
+
+#ifndef NO_BLOWFISH
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void bf_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void bf_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void bf_cfb_init_key();
+static void bf_cfb_cipher();
+#endif
+
+static EVP_CIPHER bfish_cfb_cipher=
+        {
+        NID_bf_cfb64,
+        1,EVP_BLOWFISH_KEY_SIZE,8,
+        bf_cfb_init_key,
+        bf_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_bf_cfb()
+        {
+        return(&bfish_cfb_cipher);
+        }
+        
+static void bf_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+        }
+
+static void bf_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        BF_cfb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.bf_ks),
+                &(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
+#endif
diff --git a/src/lib/libcrypto/evp/e_cfb_c.c b/src/lib/libcrypto/evp/e_cfb_c.c
new file mode 100644
index 0000000000..936df55fd8
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_c.c
@@ -0,0 +1,121 @@
+/* crypto/evp/e_cfb_c.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.]
+ */
+
+#ifndef NO_CAST
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void cast_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void cast_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void cast_cfb_init_key();
+static void cast_cfb_cipher();
+#endif
+
+static EVP_CIPHER cast5_cfb_cipher=
+        {
+        NID_cast5_cfb64,
+        1,EVP_CAST5_KEY_SIZE,8,
+        cast_cfb_init_key,
+        cast_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_cast5_cfb()
+        {
+        return(&cast5_cfb_cipher);
+        }
+        
+static void cast_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+        }
+
+static void cast_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        CAST_cfb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.cast_ks),
+                &(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
+#endif
diff --git a/src/lib/libcrypto/evp/e_cfb_d.c b/src/lib/libcrypto/evp/e_cfb_d.c
new file mode 100644
index 0000000000..9ae4558f51
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_d.c
@@ -0,0 +1,118 @@
+/* crypto/evp/e_cfb_d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_cfb_init_key();
+static void des_cfb_cipher();
+#endif
+
+static EVP_CIPHER d_cfb_cipher=
+        {
+        NID_des_cfb64,
+        1,8,8,
+        des_cfb_init_key,
+        des_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_des_cfb()
+        {
+        return(&d_cfb_cipher);
+        }
+        
+static void des_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                des_set_key((des_cblock *)key,ctx->c.des_ks);
+        }
+
+static void des_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        des_cfb64_encrypt(
+                in,out,
+                (long)inl, ctx->c.des_ks,
+                (des_cblock *)&(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
diff --git a/src/lib/libcrypto/evp/e_cfb_i.c b/src/lib/libcrypto/evp/e_cfb_i.c
new file mode 100644
index 0000000000..9225efaa86
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_i.c
@@ -0,0 +1,121 @@
+/* crypto/evp/e_cfb_i.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.]
+ */
+
+#ifndef NO_IDEA
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void idea_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void idea_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void idea_cfb_init_key();
+static void idea_cfb_cipher();
+#endif
+
+static EVP_CIPHER i_cfb_cipher=
+        {
+        NID_idea_cfb64,
+        1,IDEA_KEY_LENGTH,IDEA_BLOCK,
+        idea_cfb_init_key,
+        idea_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_idea_cfb()
+        {
+        return(&i_cfb_cipher);
+        }
+
+static void idea_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                idea_set_encrypt_key(key,&(ctx->c.idea_ks));
+        }
+
+static void idea_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        idea_cfb64_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.idea_ks),&(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_cfb_r2.c b/src/lib/libcrypto/evp/e_cfb_r2.c
new file mode 100644
index 0000000000..af5a39d1f4
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_r2.c
@@ -0,0 +1,122 @@
+/* crypto/evp/e_cfb_r2.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.]
+ */
+
+#ifndef NO_RC2
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc2_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc2_cfb_init_key();
+static void rc2_cfb_cipher();
+#endif
+
+static EVP_CIPHER r2_cfb_cipher=
+        {
+        NID_rc2_cfb64,
+        1,EVP_RC2_KEY_SIZE,8,
+        rc2_cfb_init_key,
+        rc2_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_rc2_cfb()
+        {
+        return(&r2_cfb_cipher);
+        }
+        
+static void rc2_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                RC2_set_key(&(ctx->c.rc2_ks),EVP_RC2_KEY_SIZE,key,
+                        EVP_RC2_KEY_SIZE*8);
+        }
+
+static void rc2_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        RC2_cfb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.rc2_ks),
+                &(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
+#endif
diff --git a/src/lib/libcrypto/evp/e_cfb_r5.c b/src/lib/libcrypto/evp/e_cfb_r5.c
new file mode 100644
index 0000000000..a2fddaedc0
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_cfb_r5.c
@@ -0,0 +1,122 @@
+/* crypto/evp/e_cfb_r5.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.]
+ */
+
+#ifndef NO_RC5
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc5_32_12_16_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc5_32_12_16_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc5_32_12_16_cfb_init_key();
+static void rc5_32_12_16_cfb_cipher();
+#endif
+
+static EVP_CIPHER rc5_cfb_cipher=
+        {
+        NID_rc5_cfb64,
+        1,EVP_RC5_32_12_16_KEY_SIZE,8,
+        rc5_32_12_16_cfb_init_key,
+        rc5_32_12_16_cfb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_rc5_32_12_16_cfb()
+        {
+        return(&rc5_cfb_cipher);
+        }
+        
+static void rc5_32_12_16_cfb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                RC5_32_set_key(&(ctx->c.rc5_ks),EVP_RC5_32_12_16_KEY_SIZE,key,
+                        RC5_12_ROUNDS);
+        }
+
+static void rc5_32_12_16_cfb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        RC5_32_cfb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.rc5_ks),
+                &(ctx->iv[0]),
+                &ctx->num,ctx->encrypt);
+        }
+#endif
diff --git a/src/lib/libcrypto/evp/e_ecb_3d.c b/src/lib/libcrypto/evp/e_ecb_3d.c
new file mode 100644
index 0000000000..908fc0760a
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_3d.c
@@ -0,0 +1,161 @@
+/* crypto/evp/e_ecb_3d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_ede_init_key();
+static void des_ede3_init_key();
+static void des_ede_cipher();
+#endif
+
+static EVP_CIPHER d_ede_cipher2=
+        {
+        NID_des_ede,
+        8,16,0,
+        des_ede_init_key,
+        des_ede_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        NULL,
+        NULL,
+        };
+
+static EVP_CIPHER d_ede3_cipher3=
+        {
+        NID_des_ede3,
+        8,24,0,
+        des_ede3_init_key,
+        des_ede_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        NULL,
+        };
+
+EVP_CIPHER *EVP_des_ede()
+        {
+        return(&d_ede_cipher2);
+        }
+
+EVP_CIPHER *EVP_des_ede3()
+        {
+        return(&d_ede3_cipher3);
+        }
+
+static void des_ede_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                memcpy( (char *)ctx->c.des_ede.ks3,
+                        (char *)ctx->c.des_ede.ks1,
+                        sizeof(ctx->c.des_ede.ks1));
+                }
+        }
+
+static void des_ede3_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+                }
+        }
+
+static void des_ede_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                des_ecb3_encrypt(
+                        (des_cblock *)&(in[i]),(des_cblock *)&(out[i]),
+                        ctx->c.des_ede.ks1,
+                        ctx->c.des_ede.ks2,
+                        ctx->c.des_ede.ks3,
+                        ctx->encrypt);
+                }
+        }
diff --git a/src/lib/libcrypto/evp/e_ecb_bf.c b/src/lib/libcrypto/evp/e_ecb_bf.c
new file mode 100644
index 0000000000..142a9d3123
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_bf.c
@@ -0,0 +1,122 @@
+/* crypto/evp/e_ecb_bf.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.]
+ */
+
+#ifndef NO_BLOWFISH
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void bf_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void bf_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void bf_ecb_init_key();
+static void bf_ecb_cipher();
+#endif
+
+static EVP_CIPHER bfish_ecb_cipher=
+        {
+        NID_bf_ecb,
+        8,EVP_BLOWFISH_KEY_SIZE,0,
+        bf_ecb_init_key,
+        bf_ecb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_bf_ecb()
+        {
+        return(&bfish_ecb_cipher);
+        }
+        
+static void bf_ecb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+        }
+
+static void bf_ecb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                BF_ecb_encrypt(
+                        &(in[i]),&(out[i]),
+                        &(ctx->c.bf_ks),ctx->encrypt);
+                }
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ecb_c.c b/src/lib/libcrypto/evp/e_ecb_c.c
new file mode 100644
index 0000000000..34e0c18296
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_c.c
@@ -0,0 +1,122 @@
+/* crypto/evp/e_ecb_c.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.]
+ */
+
+#ifndef NO_CAST
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void cast_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void cast_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void cast_ecb_init_key();
+static void cast_ecb_cipher();
+#endif
+
+static EVP_CIPHER cast5_ecb_cipher=
+        {
+        NID_cast5_ecb,
+        8,EVP_CAST5_KEY_SIZE,0,
+        cast_ecb_init_key,
+        cast_ecb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_cast5_ecb()
+        {
+        return(&cast5_ecb_cipher);
+        }
+        
+static void cast_ecb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+        }
+
+static void cast_ecb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                CAST_ecb_encrypt(
+                        &(in[i]),&(out[i]),
+                        &(ctx->c.cast_ks),ctx->encrypt);
+                }
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ecb_d.c b/src/lib/libcrypto/evp/e_ecb_d.c
new file mode 100644
index 0000000000..7a409d6459
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_d.c
@@ -0,0 +1,118 @@
+/* crypto/evp/e_ecb_d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_ecb_init_key();
+static void des_ecb_cipher();
+#endif
+
+static EVP_CIPHER d_ecb_cipher=
+        {
+        NID_des_ecb,
+        8,8,0,
+        des_ecb_init_key,
+        des_ecb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_des_ecb()
+        {
+        return(&d_ecb_cipher);
+        }
+        
+static void des_ecb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                des_set_key((des_cblock *)key,ctx->c.des_ks);
+        }
+
+static void des_ecb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                des_ecb_encrypt(
+                        (des_cblock *)&(in[i]),(des_cblock *)&(out[i]),
+                        ctx->c.des_ks,ctx->encrypt);
+                }
+        }
diff --git a/src/lib/libcrypto/evp/e_ecb_i.c b/src/lib/libcrypto/evp/e_ecb_i.c
new file mode 100644
index 0000000000..e24022a12c
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_i.c
@@ -0,0 +1,133 @@
+/* crypto/evp/e_ecb_i.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.]
+ */
+
+#ifndef NO_IDEA
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void idea_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void idea_ecb_init_key();
+static void idea_ecb_cipher();
+#endif
+
+static EVP_CIPHER i_ecb_cipher=
+        {
+        NID_idea_ecb,
+        8,16,0,
+        idea_ecb_init_key,
+        idea_ecb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_idea_ecb()
+        {
+        return(&i_ecb_cipher);
+        }
+        
+static void idea_ecb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                {
+                if (enc)
+                        idea_set_encrypt_key(key,&(ctx->c.idea_ks));
+                else
+                        {
+                        IDEA_KEY_SCHEDULE tmp;
+
+                        idea_set_encrypt_key(key,&tmp);
+                        idea_set_decrypt_key(&tmp, &(ctx->c.idea_ks));
+                        memset((unsigned char *)&tmp,0,
+                                sizeof(IDEA_KEY_SCHEDULE));
+                        }
+                }
+        }
+
+static void idea_ecb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                idea_ecb_encrypt(
+                        &(in[i]),&(out[i]),&(ctx->c.idea_ks));
+                }
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ecb_r2.c b/src/lib/libcrypto/evp/e_ecb_r2.c
new file mode 100644
index 0000000000..e35b06dc6d
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_r2.c
@@ -0,0 +1,123 @@
+/* crypto/evp/e_ecb_r2.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.]
+ */
+
+#ifndef NO_RC2
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc2_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc2_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc2_ecb_init_key();
+static void rc2_ecb_cipher();
+#endif
+
+static EVP_CIPHER r2_ecb_cipher=
+        {
+        NID_rc2_ecb,
+        8,EVP_RC2_KEY_SIZE,0,
+        rc2_ecb_init_key,
+        rc2_ecb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_rc2_ecb()
+        {
+        return(&r2_ecb_cipher);
+        }
+        
+static void rc2_ecb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                RC2_set_key(&(ctx->c.rc2_ks),EVP_RC2_KEY_SIZE,key,
+                        EVP_RC2_KEY_SIZE*8);
+        }
+
+static void rc2_ecb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                RC2_ecb_encrypt(
+                        &(in[i]),&(out[i]),
+                        &(ctx->c.rc2_ks),ctx->encrypt);
+                }
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ecb_r5.c b/src/lib/libcrypto/evp/e_ecb_r5.c
new file mode 100644
index 0000000000..08f4a82651
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ecb_r5.c
@@ -0,0 +1,123 @@
+/* crypto/evp/e_ecb_r5.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.]
+ */
+
+#ifndef NO_RC5
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc5_32_12_16_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc5_32_12_16_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc5_32_12_16_ecb_init_key();
+static void rc5_32_12_16_ecb_cipher();
+#endif
+
+static EVP_CIPHER rc5_ecb_cipher=
+        {
+        NID_rc5_ecb,
+        8,EVP_RC5_32_12_16_KEY_SIZE,0,
+        rc5_32_12_16_ecb_init_key,
+        rc5_32_12_16_ecb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
+        NULL,
+        NULL,
+        };
+
+EVP_CIPHER *EVP_rc5_32_12_16_ecb()
+        {
+        return(&rc5_ecb_cipher);
+        }
+        
+static void rc5_32_12_16_ecb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        if (key != NULL)
+                RC5_32_set_key(&(ctx->c.rc5_ks),EVP_RC5_32_12_16_KEY_SIZE,key,
+                        RC5_12_ROUNDS);
+        }
+
+static void rc5_32_12_16_ecb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        unsigned int i;
+
+        if (inl < 8) return;
+        inl-=8;
+        for (i=0; i<=inl; i+=8)
+                {
+                RC5_32_ecb_encrypt(
+                        &(in[i]),&(out[i]),
+                        &(ctx->c.rc5_ks),ctx->encrypt);
+                }
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ofb_3d.c b/src/lib/libcrypto/evp/e_ofb_3d.c
new file mode 100644
index 0000000000..c3add18e93
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_3d.c
@@ -0,0 +1,165 @@
+/* crypto/evp/e_ofb_3d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_ede_ofb_init_key();
+static void des_ede3_ofb_init_key();
+static void des_ede_ofb_cipher();
+#endif
+
+static EVP_CIPHER d_ede_ofb_cipher2=
+        {
+        NID_des_ede_ofb64,
+        1,16,8,
+        des_ede_ofb_init_key,
+        des_ede_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+static EVP_CIPHER d_ede3_ofb_cipher3=
+        {
+        NID_des_ede3_ofb64,
+        1,24,8,
+        des_ede3_ofb_init_key,
+        des_ede_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_des_ede_ofb()
+        {
+        return(&d_ede_ofb_cipher2);
+        }
+
+EVP_CIPHER *EVP_des_ede3_ofb()
+        {
+        return(&d_ede3_ofb_cipher3);
+        }
+        
+static void des_ede_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                memcpy( (char *)ctx->c.des_ede.ks3,
+                        (char *)ctx->c.des_ede.ks1,
+                        sizeof(ctx->c.des_ede.ks1));
+                }
+        }
+
+static void des_ede3_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                {
+                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
+                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+                }
+        }
+
+static void des_ede_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        des_ede3_ofb64_encrypt(
+                in,out,
+                (long)inl,
+                ctx->c.des_ede.ks1, ctx->c.des_ede.ks2, ctx->c.des_ede.ks3,
+                (des_cblock *)&(ctx->iv[0]),
+                &ctx->num);
+        }
diff --git a/src/lib/libcrypto/evp/e_ofb_bf.c b/src/lib/libcrypto/evp/e_ofb_bf.c
new file mode 100644
index 0000000000..492f9b9082
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_bf.c
@@ -0,0 +1,122 @@
+/* crypto/evp/e_ofb_bf.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.]
+ */
+
+#ifndef NO_BLOWFISH
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void bf_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void bf_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void bf_ofb_init_key();
+static void bf_ofb_cipher();
+#endif
+
+static EVP_CIPHER bfish_ofb_cipher=
+        {
+        NID_bf_ofb64,
+        1,EVP_BLOWFISH_KEY_SIZE,8,
+        bf_ofb_init_key,
+        bf_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_bf_ofb()
+        {
+        return(&bfish_ofb_cipher);
+        }
+        
+static void bf_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+        }
+
+static void bf_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        BF_ofb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.bf_ks),
+                &(ctx->iv[0]),
+                &ctx->num);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ofb_c.c b/src/lib/libcrypto/evp/e_ofb_c.c
new file mode 100644
index 0000000000..f1eef4469c
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_c.c
@@ -0,0 +1,122 @@
+/* crypto/evp/e_ofb_c.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.]
+ */
+
+#ifndef NO_CAST
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void cast_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void cast_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void cast_ofb_init_key();
+static void cast_ofb_cipher();
+#endif
+
+static EVP_CIPHER cast5_ofb_cipher=
+        {
+        NID_cast5_ofb64,
+        1,EVP_CAST5_KEY_SIZE,8,
+        cast_ofb_init_key,
+        cast_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_cast5_ofb()
+        {
+        return(&cast5_ofb_cipher);
+        }
+        
+static void cast_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+        }
+
+static void cast_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        CAST_ofb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.cast_ks),
+                &(ctx->iv[0]),
+                &ctx->num);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ofb_d.c b/src/lib/libcrypto/evp/e_ofb_d.c
new file mode 100644
index 0000000000..09d4b4139d
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_d.c
@@ -0,0 +1,118 @@
+/* crypto/evp/e_ofb_d.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void des_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void des_ofb_init_key();
+static void des_ofb_cipher();
+#endif
+
+static EVP_CIPHER d_ofb_cipher=
+        {
+        NID_des_ofb64,
+        1,8,8,
+        des_ofb_init_key,
+        des_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_des_ofb()
+        {
+        return(&d_ofb_cipher);
+        }
+        
+static void des_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                des_set_key((des_cblock *)key,ctx->c.des_ks);
+        }
+
+static void des_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        des_ofb64_encrypt(
+                in,out,
+                (long)inl, ctx->c.des_ks,
+                (des_cblock *)&(ctx->iv[0]),
+                &ctx->num);
+        }
diff --git a/src/lib/libcrypto/evp/e_ofb_i.c b/src/lib/libcrypto/evp/e_ofb_i.c
new file mode 100644
index 0000000000..96c8afd9c8
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_i.c
@@ -0,0 +1,121 @@
+/* crypto/evp/e_ofb_i.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.]
+ */
+
+#ifndef NO_IDEA
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void idea_ofb_init_key();
+static void idea_ofb_cipher();
+#endif
+
+static EVP_CIPHER i_ofb_cipher=
+        {
+        NID_idea_ofb64,
+        1,IDEA_KEY_LENGTH,IDEA_BLOCK,
+        idea_ofb_init_key,
+        idea_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_idea_ofb()
+        {
+        return(&i_ofb_cipher);
+        }
+        
+static void idea_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                idea_set_encrypt_key(key,&(ctx->c.idea_ks));
+        }
+
+static void idea_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        idea_ofb64_encrypt(
+                in,out,(long)inl,
+                &(ctx->c.idea_ks),&(ctx->iv[0]),
+                &ctx->num);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ofb_r2.c b/src/lib/libcrypto/evp/e_ofb_r2.c
new file mode 100644
index 0000000000..0f6d729988
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_r2.c
@@ -0,0 +1,123 @@
+/* crypto/evp/e_ofb_r2.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.]
+ */
+
+#ifndef NO_RC2
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc2_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc2_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc2_ofb_init_key();
+static void rc2_ofb_cipher();
+#endif
+
+static EVP_CIPHER r2_ofb_cipher=
+        {
+        NID_rc2_ofb64,
+        1,EVP_RC2_KEY_SIZE,8,
+        rc2_ofb_init_key,
+        rc2_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_rc2_ofb()
+        {
+        return(&r2_ofb_cipher);
+        }
+        
+static void rc2_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                RC2_set_key(&(ctx->c.rc2_ks),EVP_RC2_KEY_SIZE,key,
+                        EVP_RC2_KEY_SIZE*8);
+        }
+
+static void rc2_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        RC2_ofb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.rc2_ks),
+                &(ctx->iv[0]),
+                &ctx->num);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/e_ofb_r5.c b/src/lib/libcrypto/evp/e_ofb_r5.c
new file mode 100644
index 0000000000..db28d6c317
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_ofb_r5.c
@@ -0,0 +1,123 @@
+/* crypto/evp/e_ofb_r5.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.]
+ */
+
+#ifndef NO_RC5
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+#ifndef NOPROTO
+static void rc5_32_12_16_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+        unsigned char *iv,int enc);
+static void rc5_32_12_16_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        unsigned char *in, unsigned int inl);
+#else
+static void rc5_32_12_16_ofb_init_key();
+static void rc5_32_12_16_ofb_cipher();
+#endif
+
+static EVP_CIPHER rc5_ofb_cipher=
+        {
+        NID_rc5_ofb64,
+        1,EVP_RC5_32_12_16_KEY_SIZE,8,
+        rc5_32_12_16_ofb_init_key,
+        rc5_32_12_16_ofb_cipher,
+        NULL,
+        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        };
+
+EVP_CIPHER *EVP_rc5_32_12_16_ofb()
+        {
+        return(&rc5_ofb_cipher);
+        }
+        
+static void rc5_32_12_16_ofb_init_key(ctx,key,iv,enc)
+EVP_CIPHER_CTX *ctx;
+unsigned char *key;
+unsigned char *iv;
+int enc;
+        {
+        ctx->num=0;
+
+        if (iv != NULL)
+                memcpy(&(ctx->oiv[0]),iv,8);
+        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
+        if (key != NULL)
+                RC5_32_set_key(&(ctx->c.rc5_ks),EVP_RC5_32_12_16_KEY_SIZE,key,
+                        RC5_12_ROUNDS);
+        }
+
+static void rc5_32_12_16_ofb_cipher(ctx,out,in,inl)
+EVP_CIPHER_CTX *ctx;
+unsigned char *out;
+unsigned char *in;
+unsigned int inl;
+        {
+        RC5_32_ofb64_encrypt(
+                in,out,
+                (long)inl, &(ctx->c.rc5_ks),
+                &(ctx->iv[0]),
+                &ctx->num);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/evp.err b/src/lib/libcrypto/evp/evp.err
new file mode 100644
index 0000000000..cfc17437bc
--- /dev/null
+++ b/src/lib/libcrypto/evp/evp.err
@@ -0,0 +1,24 @@
+/* Error codes for the EVP functions. */
+
+/* Function codes. */
+#define EVP_F_D2I_PKEY                                   100
+#define EVP_F_EVP_DECRYPTFINAL                           101
+#define EVP_F_EVP_OPENINIT                               102
+#define EVP_F_EVP_PKEY_COPY_PARAMETERS                   103
+#define EVP_F_EVP_PKEY_DECRYPT                           104
+#define EVP_F_EVP_PKEY_ENCRYPT                           105
+#define EVP_F_EVP_PKEY_NEW                               106
+#define EVP_F_EVP_SIGNFINAL                              107
+#define EVP_F_EVP_VERIFYFINAL                            108
+
+/* Reason codes. */
+#define EVP_R_BAD_DECRYPT                                100
+#define EVP_R_DIFFERENT_KEY_TYPES                        101
+#define EVP_R_IV_TOO_LARGE                               102
+#define EVP_R_MISSING_PARMATERS                          103
+#define EVP_R_NO_SIGN_FUNCTION_CONFIGURED                104
+#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED              105
+#define EVP_R_PUBLIC_KEY_NOT_RSA                         106
+#define EVP_R_UNSUPPORTED_CIPHER                         107
+#define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   108
+#define EVP_R_WRONG_PUBLIC_KEY_TYPE                      109
diff --git a/src/lib/libcrypto/evp/pk_lib.c b/src/lib/libcrypto/evp/pk_lib.c
new file mode 100644
index 0000000000..08f9fabbae
--- /dev/null
+++ b/src/lib/libcrypto/evp/pk_lib.c
@@ -0,0 +1,82 @@
+/* crypto/evp/pk_lib.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 "cryptlib.h"
+#include "evp.h"
+#include "objects.h"
+
+static LHASH *pk_md=NULL;
+
+static LHASH *pk_md=NULL;
+
+int EVP_add_pkey_md(oid,pkm,md)
+int oid;
+EVP_PKEY_METHOD *pkm;
+EVP_MD *md;
+        {
+        }
+
+EVP_add_pkey(pkm)
+EVP_PKEY_METHOD *pkm;
+        {
+        }
+
+EVP_PKEY_METHOD:q
+
+
diff --git a/src/lib/libcrypto/hmac/Makefile.ssl b/src/lib/libcrypto/hmac/Makefile.ssl
new file mode 100644
index 0000000000..7a042b7261
--- /dev/null
+++ b/src/lib/libcrypto/hmac/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/md/Makefile
+#
+
+DIR=    hmac
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=hmactest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=hmac.c
+LIBOBJ=hmac.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= hmac.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/idea/Makefile.ssl b/src/lib/libcrypto/idea/Makefile.ssl
new file mode 100644
index 0000000000..41b42ce03b
--- /dev/null
+++ b/src/lib/libcrypto/idea/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/idea/Makefile
+#
+
+DIR=    idea
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=ideatest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
+LIBOBJ=i_cbc.o i_cfb64.o i_ofb64.o i_ecb.o i_skey.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= idea.h
+HEADER= idea_lcl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/lhash/Makefile.ssl b/src/lib/libcrypto/lhash/Makefile.ssl
new file mode 100644
index 0000000000..cb08547b4f
--- /dev/null
+++ b/src/lib/libcrypto/lhash/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/lhash/Makefile
+#
+
+DIR=    lhash
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=lhash.c lh_stats.c
+LIBOBJ=lhash.o lh_stats.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= lhash.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/libvms.com b/src/lib/libcrypto/libvms.com
new file mode 100644
index 0000000000..44f90c65b0
--- /dev/null
+++ b/src/lib/libcrypto/libvms.com
@@ -0,0 +1,31 @@
+$!
+$! Compile crypto.c as several subset modules and insert in crypto-xxx.olb.
+$! If P1 is specifed, it specifies alternate list of subsets to compile.
+$!
+$ libname = "CRYPTO-AXP.OLB"
+$ subset_list = "LIB,ASN1,BN,BUFFER,CONF,DES,DH,DSA,ERROR,EVP,IDEA,LHASH,MD," + -
+        "METH,OBJECTS,PEM,RAND,RC,RSA,SHA,STACK,TXT_DB,X509"
+$ if p1 .nes. "" then subset_list = p1
+$!
+$ if f$getsyi("CPU") .lt. 128 then libname = "CRYPTO-VAX.OLB"
+$ if f$search(libname) .eqs. "" then library/create/object/log 'libname'
+$!
+$ cc = "cc/include=[-.include]/prefix=all" + P2
+$!
+$ i = 0
+$ next_subset:
+$    subset = f$element(i,",",subset_list)
+$    if subset .eqs. "," then goto done
+$    i = i + 1
+$    create crypto_'subset'.subset
+#include "crypto.c"
+$    ofile = "sys$disk:[]crypto_" + subset + ".obj"
+$    on warning then goto next_subset
+$    write sys$output "Compiling ", ofile
+$    cc /object='ofile' crypto_'subset'.subset -
+        /define=(CRYPTO_SUBSET,CRYPTO_'subset'_SUBSET)
+$    library/replace/log 'libname'/module=CRYPTO_'subset' 'ofile'
+$    goto next_subset
+$!
+$ done:
+$ exit
diff --git a/src/lib/libcrypto/md2/Makefile.ssl b/src/lib/libcrypto/md2/Makefile.ssl
new file mode 100644
index 0000000000..d8e7200c83
--- /dev/null
+++ b/src/lib/libcrypto/md2/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/md/Makefile
+#
+
+DIR=    md
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=md2test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=md2_dgst.c md5_one.c
+LIBOBJ=md2_dgst.o md2_one.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= md2.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/md2/md2.org b/src/lib/libcrypto/md2/md2.org
new file mode 100644
index 0000000000..9f39933790
--- /dev/null
+++ b/src/lib/libcrypto/md2/md2.org
@@ -0,0 +1,106 @@
+/* crypto/md/md2.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *
+ * Always modify md2.org since md2.h is automatically generated from 
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+
+#ifndef HEADER_MD2_H
+#define HEADER_MD2_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define MD2_DIGEST_LENGTH       16
+#define MD2_BLOCK               16
+
+#define MD2_INT unsigned int
+
+typedef struct MD2state_st
+        {
+        int num;
+        unsigned char data[MD2_BLOCK];
+        MD2_INT cksm[MD2_BLOCK];
+        MD2_INT state[MD2_BLOCK];
+        } MD2_CTX;
+
+#ifndef NOPROTO
+char *MD2_options(void);
+void MD2_Init(MD2_CTX *c);
+void MD2_Update(MD2_CTX *c, register unsigned char *data, unsigned long len);
+void MD2_Final(unsigned char *md, MD2_CTX *c);
+unsigned char *MD2(unsigned char *d, unsigned long n,unsigned char *md);
+#else
+char *MD2_options();
+void MD2_Init();
+void MD2_Update();
+void MD2_Final();
+unsigned char *MD2();
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/lib/libcrypto/md5/Makefile.ssl b/src/lib/libcrypto/md5/Makefile.ssl
new file mode 100644
index 0000000000..47e1ce05ca
--- /dev/null
+++ b/src/lib/libcrypto/md5/Makefile.ssl
@@ -0,0 +1,104 @@
+#
+# SSLeay/crypto/md5/Makefile
+#
+
+DIR=    md5
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+MD5_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=md5test.c
+APPS=md5.c
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=md5_dgst.c md5_one.c
+LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= md5.h
+HEADER= md5_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/mx86-elf.o: asm/mx86unix.cpp
+        $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o
+
+# solaris
+asm/mx86-sol.o: asm/mx86unix.cpp
+        $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s
+        as -o asm/mx86-sol.o asm/mx86-sol.s
+        rm -f asm/mx86-sol.s
+
+# a.out
+asm/mx86-out.o: asm/mx86unix.cpp
+        $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
+
+# bsdi
+asm/mx86bsdi.o: asm/mx86unix.cpp
+        $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o
+
+asm/mx86unix.cpp:
+        (cd asm; perl md5-586.pl cpp >mx86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/md5/Makefile.uni b/src/lib/libcrypto/md5/Makefile.uni
new file mode 100644
index 0000000000..54685712db
--- /dev/null
+++ b/src/lib/libcrypto/md5/Makefile.uni
@@ -0,0 +1,109 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+DIR=    md5
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+MD5_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=md5test
+APPS=md5
+
+LIB=libmd5.a
+LIBSRC=md5_dgst.c md5_one.c
+LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= md5.h
+HEADER= md5_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB):    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+
+# elf
+asm/mx86-elf.o: asm/mx86unix.cpp
+        $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o
+
+# solaris
+asm/mx86-sol.o: asm/mx86unix.cpp
+        $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s
+        as -o asm/mx86-sol.o asm/mx86-sol.s
+        rm -f asm/mx86-sol.s
+
+# a.out
+asm/mx86-out.o: asm/mx86unix.cpp
+        $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
+
+# bsdi
+asm/mx86bsdi.o: asm/mx86unix.cpp
+        $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o
+
+asm/mx86unix.cpp:
+        (cd asm; perl md5-586.pl cpp >mx86unix.cpp)
+
+test:   $(TEST)
+        ./$(TEST)
+
+$(TEST): $(TEST).c $(LIB)
+        $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB)
+
+$(APPS): $(APPS).c $(LIB)
+        $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) MD5_ASM_OBJ="" CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) MD5_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+x86-elf:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-elf.o" CFLAG="-DELF -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-out:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-out.o" CFLAG="-DOUT -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-solaris:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-sol.o" CFLAG="-DSOL -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-bdsi:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-bdsi.o" CFLAG="-DBDSI -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/md5/asm/m5-win32.asm b/src/lib/libcrypto/md5/asm/m5-win32.asm
new file mode 100644
index 0000000000..c2081da746
--- /dev/null
+++ b/src/lib/libcrypto/md5/asm/m5-win32.asm
@@ -0,0 +1,686 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by md5-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   md5-586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _md5_block_x86
+
+_md5_block_x86 PROC NEAR
+        push    esi
+        push    edi
+        mov     edi,            DWORD PTR 12[esp]
+        mov     esi,            DWORD PTR 16[esp]
+        mov     ecx,            DWORD PTR 20[esp]
+        push    ebp
+        push    ebx
+        add     ecx,            esi
+        sub     ecx,            64
+        mov     eax,            DWORD PTR [edi]
+        push    ecx
+        mov     ebx,            DWORD PTR 4[edi]
+        mov     ecx,            DWORD PTR 8[edi]
+        mov     edx,            DWORD PTR 12[edi]
+L000start:
+        ; 
+        ; R0 section
+        mov     edi,            ecx
+        mov     ebp,            DWORD PTR [esi]
+        ; R0 0
+        xor     edi,            edx
+        and     edi,            ebx
+        lea     eax,            DWORD PTR 3614090360[ebp*1+eax]
+        mov     ebp,            DWORD PTR 4[esi]
+        xor     edi,            edx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            7
+        add     eax,            ebx
+        ; R0 1
+        xor     edi,            ecx
+        and     edi,            eax
+        lea     edx,            DWORD PTR 3905402710[ebp*1+edx]
+        mov     ebp,            DWORD PTR 8[esi]
+        xor     edi,            ecx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            12
+        add     edx,            eax
+        ; R0 2
+        xor     edi,            ebx
+        and     edi,            edx
+        lea     ecx,            DWORD PTR 606105819[ebp*1+ecx]
+        mov     ebp,            DWORD PTR 12[esi]
+        xor     edi,            ebx
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            17
+        add     ecx,            edx
+        ; R0 3
+        xor     edi,            eax
+        and     edi,            ecx
+        lea     ebx,            DWORD PTR 3250441966[ebp*1+ebx]
+        mov     ebp,            DWORD PTR 16[esi]
+        xor     edi,            eax
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            22
+        add     ebx,            ecx
+        ; R0 4
+        xor     edi,            edx
+        and     edi,            ebx
+        lea     eax,            DWORD PTR 4118548399[ebp*1+eax]
+        mov     ebp,            DWORD PTR 20[esi]
+        xor     edi,            edx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            7
+        add     eax,            ebx
+        ; R0 5
+        xor     edi,            ecx
+        and     edi,            eax
+        lea     edx,            DWORD PTR 1200080426[ebp*1+edx]
+        mov     ebp,            DWORD PTR 24[esi]
+        xor     edi,            ecx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            12
+        add     edx,            eax
+        ; R0 6
+        xor     edi,            ebx
+        and     edi,            edx
+        lea     ecx,            DWORD PTR 2821735955[ebp*1+ecx]
+        mov     ebp,            DWORD PTR 28[esi]
+        xor     edi,            ebx
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            17
+        add     ecx,            edx
+        ; R0 7
+        xor     edi,            eax
+        and     edi,            ecx
+        lea     ebx,            DWORD PTR 4249261313[ebp*1+ebx]
+        mov     ebp,            DWORD PTR 32[esi]
+        xor     edi,            eax
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            22
+        add     ebx,            ecx
+        ; R0 8
+        xor     edi,            edx
+        and     edi,            ebx
+        lea     eax,            DWORD PTR 1770035416[ebp*1+eax]
+        mov     ebp,            DWORD PTR 36[esi]
+        xor     edi,            edx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            7
+        add     eax,            ebx
+        ; R0 9
+        xor     edi,            ecx
+        and     edi,            eax
+        lea     edx,            DWORD PTR 2336552879[ebp*1+edx]
+        mov     ebp,            DWORD PTR 40[esi]
+        xor     edi,            ecx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            12
+        add     edx,            eax
+        ; R0 10
+        xor     edi,            ebx
+        and     edi,            edx
+        lea     ecx,            DWORD PTR 4294925233[ebp*1+ecx]
+        mov     ebp,            DWORD PTR 44[esi]
+        xor     edi,            ebx
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            17
+        add     ecx,            edx
+        ; R0 11
+        xor     edi,            eax
+        and     edi,            ecx
+        lea     ebx,            DWORD PTR 2304563134[ebp*1+ebx]
+        mov     ebp,            DWORD PTR 48[esi]
+        xor     edi,            eax
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            22
+        add     ebx,            ecx
+        ; R0 12
+        xor     edi,            edx
+        and     edi,            ebx
+        lea     eax,            DWORD PTR 1804603682[ebp*1+eax]
+        mov     ebp,            DWORD PTR 52[esi]
+        xor     edi,            edx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            7
+        add     eax,            ebx
+        ; R0 13
+        xor     edi,            ecx
+        and     edi,            eax
+        lea     edx,            DWORD PTR 4254626195[ebp*1+edx]
+        mov     ebp,            DWORD PTR 56[esi]
+        xor     edi,            ecx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            12
+        add     edx,            eax
+        ; R0 14
+        xor     edi,            ebx
+        and     edi,            edx
+        lea     ecx,            DWORD PTR 2792965006[ebp*1+ecx]
+        mov     ebp,            DWORD PTR 60[esi]
+        xor     edi,            ebx
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            17
+        add     ecx,            edx
+        ; R0 15
+        xor     edi,            eax
+        and     edi,            ecx
+        lea     ebx,            DWORD PTR 1236535329[ebp*1+ebx]
+        mov     ebp,            DWORD PTR 4[esi]
+        xor     edi,            eax
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            22
+        add     ebx,            ecx
+        ; 
+        ; R1 section
+        ; R1 16
+        lea     eax,            DWORD PTR 4129170786[ebp*1+eax]
+        xor     edi,            ebx
+        and     edi,            edx
+        mov     ebp,            DWORD PTR 24[esi]
+        xor     edi,            ecx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            5
+        add     eax,            ebx
+        ; R1 17
+        lea     edx,            DWORD PTR 3225465664[ebp*1+edx]
+        xor     edi,            eax
+        and     edi,            ecx
+        mov     ebp,            DWORD PTR 44[esi]
+        xor     edi,            ebx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            9
+        add     edx,            eax
+        ; R1 18
+        lea     ecx,            DWORD PTR 643717713[ebp*1+ecx]
+        xor     edi,            edx
+        and     edi,            ebx
+        mov     ebp,            DWORD PTR [esi]
+        xor     edi,            eax
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            14
+        add     ecx,            edx
+        ; R1 19
+        lea     ebx,            DWORD PTR 3921069994[ebp*1+ebx]
+        xor     edi,            ecx
+        and     edi,            eax
+        mov     ebp,            DWORD PTR 20[esi]
+        xor     edi,            edx
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            20
+        add     ebx,            ecx
+        ; R1 20
+        lea     eax,            DWORD PTR 3593408605[ebp*1+eax]
+        xor     edi,            ebx
+        and     edi,            edx
+        mov     ebp,            DWORD PTR 40[esi]
+        xor     edi,            ecx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            5
+        add     eax,            ebx
+        ; R1 21
+        lea     edx,            DWORD PTR 38016083[ebp*1+edx]
+        xor     edi,            eax
+        and     edi,            ecx
+        mov     ebp,            DWORD PTR 60[esi]
+        xor     edi,            ebx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            9
+        add     edx,            eax
+        ; R1 22
+        lea     ecx,            DWORD PTR 3634488961[ebp*1+ecx]
+        xor     edi,            edx
+        and     edi,            ebx
+        mov     ebp,            DWORD PTR 16[esi]
+        xor     edi,            eax
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            14
+        add     ecx,            edx
+        ; R1 23
+        lea     ebx,            DWORD PTR 3889429448[ebp*1+ebx]
+        xor     edi,            ecx
+        and     edi,            eax
+        mov     ebp,            DWORD PTR 36[esi]
+        xor     edi,            edx
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            20
+        add     ebx,            ecx
+        ; R1 24
+        lea     eax,            DWORD PTR 568446438[ebp*1+eax]
+        xor     edi,            ebx
+        and     edi,            edx
+        mov     ebp,            DWORD PTR 56[esi]
+        xor     edi,            ecx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            5
+        add     eax,            ebx
+        ; R1 25
+        lea     edx,            DWORD PTR 3275163606[ebp*1+edx]
+        xor     edi,            eax
+        and     edi,            ecx
+        mov     ebp,            DWORD PTR 12[esi]
+        xor     edi,            ebx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            9
+        add     edx,            eax
+        ; R1 26
+        lea     ecx,            DWORD PTR 4107603335[ebp*1+ecx]
+        xor     edi,            edx
+        and     edi,            ebx
+        mov     ebp,            DWORD PTR 32[esi]
+        xor     edi,            eax
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            14
+        add     ecx,            edx
+        ; R1 27
+        lea     ebx,            DWORD PTR 1163531501[ebp*1+ebx]
+        xor     edi,            ecx
+        and     edi,            eax
+        mov     ebp,            DWORD PTR 52[esi]
+        xor     edi,            edx
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            20
+        add     ebx,            ecx
+        ; R1 28
+        lea     eax,            DWORD PTR 2850285829[ebp*1+eax]
+        xor     edi,            ebx
+        and     edi,            edx
+        mov     ebp,            DWORD PTR 8[esi]
+        xor     edi,            ecx
+        add     eax,            edi
+        mov     edi,            ebx
+        rol     eax,            5
+        add     eax,            ebx
+        ; R1 29
+        lea     edx,            DWORD PTR 4243563512[ebp*1+edx]
+        xor     edi,            eax
+        and     edi,            ecx
+        mov     ebp,            DWORD PTR 28[esi]
+        xor     edi,            ebx
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            9
+        add     edx,            eax
+        ; R1 30
+        lea     ecx,            DWORD PTR 1735328473[ebp*1+ecx]
+        xor     edi,            edx
+        and     edi,            ebx
+        mov     ebp,            DWORD PTR 48[esi]
+        xor     edi,            eax
+        add     ecx,            edi
+        mov     edi,            edx
+        rol     ecx,            14
+        add     ecx,            edx
+        ; R1 31
+        lea     ebx,            DWORD PTR 2368359562[ebp*1+ebx]
+        xor     edi,            ecx
+        and     edi,            eax
+        mov     ebp,            DWORD PTR 20[esi]
+        xor     edi,            edx
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            20
+        add     ebx,            ecx
+        ; 
+        ; R2 section
+        ; R2 32
+        xor     edi,            edx
+        xor     edi,            ebx
+        lea     eax,            DWORD PTR 4294588738[ebp*1+eax]
+        add     eax,            edi
+        mov     ebp,            DWORD PTR 32[esi]
+        rol     eax,            4
+        mov     edi,            ebx
+        ; R2 33
+        lea     edx,            DWORD PTR 2272392833[ebp*1+edx]
+        add     eax,            ebx
+        xor     edi,            ecx
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 44[esi]
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            11
+        add     edx,            eax
+        ; R2 34
+        xor     edi,            ebx
+        xor     edi,            edx
+        lea     ecx,            DWORD PTR 1839030562[ebp*1+ecx]
+        add     ecx,            edi
+        mov     ebp,            DWORD PTR 56[esi]
+        rol     ecx,            16
+        mov     edi,            edx
+        ; R2 35
+        lea     ebx,            DWORD PTR 4259657740[ebp*1+ebx]
+        add     ecx,            edx
+        xor     edi,            eax
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 4[esi]
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            23
+        add     ebx,            ecx
+        ; R2 36
+        xor     edi,            edx
+        xor     edi,            ebx
+        lea     eax,            DWORD PTR 2763975236[ebp*1+eax]
+        add     eax,            edi
+        mov     ebp,            DWORD PTR 16[esi]
+        rol     eax,            4
+        mov     edi,            ebx
+        ; R2 37
+        lea     edx,            DWORD PTR 1272893353[ebp*1+edx]
+        add     eax,            ebx
+        xor     edi,            ecx
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 28[esi]
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            11
+        add     edx,            eax
+        ; R2 38
+        xor     edi,            ebx
+        xor     edi,            edx
+        lea     ecx,            DWORD PTR 4139469664[ebp*1+ecx]
+        add     ecx,            edi
+        mov     ebp,            DWORD PTR 40[esi]
+        rol     ecx,            16
+        mov     edi,            edx
+        ; R2 39
+        lea     ebx,            DWORD PTR 3200236656[ebp*1+ebx]
+        add     ecx,            edx
+        xor     edi,            eax
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 52[esi]
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            23
+        add     ebx,            ecx
+        ; R2 40
+        xor     edi,            edx
+        xor     edi,            ebx
+        lea     eax,            DWORD PTR 681279174[ebp*1+eax]
+        add     eax,            edi
+        mov     ebp,            DWORD PTR [esi]
+        rol     eax,            4
+        mov     edi,            ebx
+        ; R2 41
+        lea     edx,            DWORD PTR 3936430074[ebp*1+edx]
+        add     eax,            ebx
+        xor     edi,            ecx
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 12[esi]
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            11
+        add     edx,            eax
+        ; R2 42
+        xor     edi,            ebx
+        xor     edi,            edx
+        lea     ecx,            DWORD PTR 3572445317[ebp*1+ecx]
+        add     ecx,            edi
+        mov     ebp,            DWORD PTR 24[esi]
+        rol     ecx,            16
+        mov     edi,            edx
+        ; R2 43
+        lea     ebx,            DWORD PTR 76029189[ebp*1+ebx]
+        add     ecx,            edx
+        xor     edi,            eax
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 36[esi]
+        add     ebx,            edi
+        mov     edi,            ecx
+        rol     ebx,            23
+        add     ebx,            ecx
+        ; R2 44
+        xor     edi,            edx
+        xor     edi,            ebx
+        lea     eax,            DWORD PTR 3654602809[ebp*1+eax]
+        add     eax,            edi
+        mov     ebp,            DWORD PTR 48[esi]
+        rol     eax,            4
+        mov     edi,            ebx
+        ; R2 45
+        lea     edx,            DWORD PTR 3873151461[ebp*1+edx]
+        add     eax,            ebx
+        xor     edi,            ecx
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 60[esi]
+        add     edx,            edi
+        mov     edi,            eax
+        rol     edx,            11
+        add     edx,            eax
+        ; R2 46
+        xor     edi,            ebx
+        xor     edi,            edx
+        lea     ecx,            DWORD PTR 530742520[ebp*1+ecx]
+        add     ecx,            edi
+        mov     ebp,            DWORD PTR 8[esi]
+        rol     ecx,            16
+        mov     edi,            edx
+        ; R2 47
+        lea     ebx,            DWORD PTR 3299628645[ebp*1+ebx]
+        add     ecx,            edx
+        xor     edi,            eax
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR [esi]
+        add     ebx,            edi
+        mov     edi,            -1
+        rol     ebx,            23
+        add     ebx,            ecx
+        ; 
+        ; R3 section
+        ; R3 48
+        xor     edi,            edx
+        or      edi,            ebx
+        lea     eax,            DWORD PTR 4096336452[ebp*1+eax]
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 28[esi]
+        add     eax,            edi
+        mov     edi,            -1
+        rol     eax,            6
+        xor     edi,            ecx
+        add     eax,            ebx
+        ; R3 49
+        or      edi,            eax
+        lea     edx,            DWORD PTR 1126891415[ebp*1+edx]
+        xor     edi,            ebx
+        mov     ebp,            DWORD PTR 56[esi]
+        add     edx,            edi
+        mov     edi,            -1
+        rol     edx,            10
+        xor     edi,            ebx
+        add     edx,            eax
+        ; R3 50
+        or      edi,            edx
+        lea     ecx,            DWORD PTR 2878612391[ebp*1+ecx]
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 20[esi]
+        add     ecx,            edi
+        mov     edi,            -1
+        rol     ecx,            15
+        xor     edi,            eax
+        add     ecx,            edx
+        ; R3 51
+        or      edi,            ecx
+        lea     ebx,            DWORD PTR 4237533241[ebp*1+ebx]
+        xor     edi,            edx
+        mov     ebp,            DWORD PTR 48[esi]
+        add     ebx,            edi
+        mov     edi,            -1
+        rol     ebx,            21
+        xor     edi,            edx
+        add     ebx,            ecx
+        ; R3 52
+        or      edi,            ebx
+        lea     eax,            DWORD PTR 1700485571[ebp*1+eax]
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 12[esi]
+        add     eax,            edi
+        mov     edi,            -1
+        rol     eax,            6
+        xor     edi,            ecx
+        add     eax,            ebx
+        ; R3 53
+        or      edi,            eax
+        lea     edx,            DWORD PTR 2399980690[ebp*1+edx]
+        xor     edi,            ebx
+        mov     ebp,            DWORD PTR 40[esi]
+        add     edx,            edi
+        mov     edi,            -1
+        rol     edx,            10
+        xor     edi,            ebx
+        add     edx,            eax
+        ; R3 54
+        or      edi,            edx
+        lea     ecx,            DWORD PTR 4293915773[ebp*1+ecx]
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 4[esi]
+        add     ecx,            edi
+        mov     edi,            -1
+        rol     ecx,            15
+        xor     edi,            eax
+        add     ecx,            edx
+        ; R3 55
+        or      edi,            ecx
+        lea     ebx,            DWORD PTR 2240044497[ebp*1+ebx]
+        xor     edi,            edx
+        mov     ebp,            DWORD PTR 32[esi]
+        add     ebx,            edi
+        mov     edi,            -1
+        rol     ebx,            21
+        xor     edi,            edx
+        add     ebx,            ecx
+        ; R3 56
+        or      edi,            ebx
+        lea     eax,            DWORD PTR 1873313359[ebp*1+eax]
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 60[esi]
+        add     eax,            edi
+        mov     edi,            -1
+        rol     eax,            6
+        xor     edi,            ecx
+        add     eax,            ebx
+        ; R3 57
+        or      edi,            eax
+        lea     edx,            DWORD PTR 4264355552[ebp*1+edx]
+        xor     edi,            ebx
+        mov     ebp,            DWORD PTR 24[esi]
+        add     edx,            edi
+        mov     edi,            -1
+        rol     edx,            10
+        xor     edi,            ebx
+        add     edx,            eax
+        ; R3 58
+        or      edi,            edx
+        lea     ecx,            DWORD PTR 2734768916[ebp*1+ecx]
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 52[esi]
+        add     ecx,            edi
+        mov     edi,            -1
+        rol     ecx,            15
+        xor     edi,            eax
+        add     ecx,            edx
+        ; R3 59
+        or      edi,            ecx
+        lea     ebx,            DWORD PTR 1309151649[ebp*1+ebx]
+        xor     edi,            edx
+        mov     ebp,            DWORD PTR 16[esi]
+        add     ebx,            edi
+        mov     edi,            -1
+        rol     ebx,            21
+        xor     edi,            edx
+        add     ebx,            ecx
+        ; R3 60
+        or      edi,            ebx
+        lea     eax,            DWORD PTR 4149444226[ebp*1+eax]
+        xor     edi,            ecx
+        mov     ebp,            DWORD PTR 44[esi]
+        add     eax,            edi
+        mov     edi,            -1
+        rol     eax,            6
+        xor     edi,            ecx
+        add     eax,            ebx
+        ; R3 61
+        or      edi,            eax
+        lea     edx,            DWORD PTR 3174756917[ebp*1+edx]
+        xor     edi,            ebx
+        mov     ebp,            DWORD PTR 8[esi]
+        add     edx,            edi
+        mov     edi,            -1
+        rol     edx,            10
+        xor     edi,            ebx
+        add     edx,            eax
+        ; R3 62
+        or      edi,            edx
+        lea     ecx,            DWORD PTR 718787259[ebp*1+ecx]
+        xor     edi,            eax
+        mov     ebp,            DWORD PTR 36[esi]
+        add     ecx,            edi
+        mov     edi,            -1
+        rol     ecx,            15
+        xor     edi,            eax
+        add     ecx,            edx
+        ; R3 63
+        or      edi,            ecx
+        lea     ebx,            DWORD PTR 3951481745[ebp*1+ebx]
+        xor     edi,            edx
+        mov     ebp,            DWORD PTR 24[esp]
+        add     ebx,            edi
+        add     esi,            64
+        rol     ebx,            21
+        mov     edi,            DWORD PTR [ebp]
+        add     ebx,            ecx
+        add     eax,            edi
+        mov     edi,            DWORD PTR 4[ebp]
+        add     ebx,            edi
+        mov     edi,            DWORD PTR 8[ebp]
+        add     ecx,            edi
+        mov     edi,            DWORD PTR 12[ebp]
+        add     edx,            edi
+        mov     DWORD PTR [ebp],eax
+        mov     DWORD PTR 4[ebp],ebx
+        mov     edi,            DWORD PTR [esp]
+        mov     DWORD PTR 8[ebp],ecx
+        mov     DWORD PTR 12[ebp],edx
+        cmp     edi,            esi
+        jge     L000start
+        pop     eax
+        pop     ebx
+        pop     ebp
+        pop     edi
+        pop     esi
+        ret
+_md5_block_x86 ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/md5/asm/mx86unix.cpp b/src/lib/libcrypto/md5/asm/mx86unix.cpp
new file mode 100644
index 0000000000..5d399122b6
--- /dev/null
+++ b/src/lib/libcrypto/md5/asm/mx86unix.cpp
@@ -0,0 +1,730 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define md5_block_x86 _md5_block_x86
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by md5-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "md5-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl md5_block_x86
+        TYPE(md5_block_x86,@function)
+md5_block_x86:
+        pushl   %esi
+        pushl   %edi
+        movl    12(%esp),       %edi
+        movl    16(%esp),       %esi
+        movl    20(%esp),       %ecx
+        pushl   %ebp
+        pushl   %ebx
+        addl    %esi,           %ecx
+        subl    $64,            %ecx
+        movl    (%edi),         %eax
+        pushl   %ecx
+        movl    4(%edi),        %ebx
+        movl    8(%edi),        %ecx
+        movl    12(%edi),       %edx
+.L000start:
+
+        /* R0 section */
+        movl    %ecx,           %edi
+        movl    (%esi),         %ebp
+        /* R0 0 */
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        leal    3614090360(%eax,%ebp,1),%eax
+        movl    4(%esi),        %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $7,             %eax
+        addl    %ebx,           %eax
+        /* R0 1 */
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        leal    3905402710(%edx,%ebp,1),%edx
+        movl    8(%esi),        %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $12,            %edx
+        addl    %eax,           %edx
+        /* R0 2 */
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        leal    606105819(%ecx,%ebp,1),%ecx
+        movl    12(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $17,            %ecx
+        addl    %edx,           %ecx
+        /* R0 3 */
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        leal    3250441966(%ebx,%ebp,1),%ebx
+        movl    16(%esi),       %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $22,            %ebx
+        addl    %ecx,           %ebx
+        /* R0 4 */
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        leal    4118548399(%eax,%ebp,1),%eax
+        movl    20(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $7,             %eax
+        addl    %ebx,           %eax
+        /* R0 5 */
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        leal    1200080426(%edx,%ebp,1),%edx
+        movl    24(%esi),       %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $12,            %edx
+        addl    %eax,           %edx
+        /* R0 6 */
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        leal    2821735955(%ecx,%ebp,1),%ecx
+        movl    28(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $17,            %ecx
+        addl    %edx,           %ecx
+        /* R0 7 */
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        leal    4249261313(%ebx,%ebp,1),%ebx
+        movl    32(%esi),       %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $22,            %ebx
+        addl    %ecx,           %ebx
+        /* R0 8 */
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        leal    1770035416(%eax,%ebp,1),%eax
+        movl    36(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $7,             %eax
+        addl    %ebx,           %eax
+        /* R0 9 */
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        leal    2336552879(%edx,%ebp,1),%edx
+        movl    40(%esi),       %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $12,            %edx
+        addl    %eax,           %edx
+        /* R0 10 */
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        leal    4294925233(%ecx,%ebp,1),%ecx
+        movl    44(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $17,            %ecx
+        addl    %edx,           %ecx
+        /* R0 11 */
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        leal    2304563134(%ebx,%ebp,1),%ebx
+        movl    48(%esi),       %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $22,            %ebx
+        addl    %ecx,           %ebx
+        /* R0 12 */
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        leal    1804603682(%eax,%ebp,1),%eax
+        movl    52(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $7,             %eax
+        addl    %ebx,           %eax
+        /* R0 13 */
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        leal    4254626195(%edx,%ebp,1),%edx
+        movl    56(%esi),       %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $12,            %edx
+        addl    %eax,           %edx
+        /* R0 14 */
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        leal    2792965006(%ecx,%ebp,1),%ecx
+        movl    60(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $17,            %ecx
+        addl    %edx,           %ecx
+        /* R0 15 */
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        leal    1236535329(%ebx,%ebp,1),%ebx
+        movl    4(%esi),        %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $22,            %ebx
+        addl    %ecx,           %ebx
+
+        /* R1 section */
+        /* R1 16 */
+        leal    4129170786(%eax,%ebp,1),%eax
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        movl    24(%esi),       %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $5,             %eax
+        addl    %ebx,           %eax
+        /* R1 17 */
+        leal    3225465664(%edx,%ebp,1),%edx
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        movl    44(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $9,             %edx
+        addl    %eax,           %edx
+        /* R1 18 */
+        leal    643717713(%ecx,%ebp,1),%ecx
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        movl    (%esi),         %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $14,            %ecx
+        addl    %edx,           %ecx
+        /* R1 19 */
+        leal    3921069994(%ebx,%ebp,1),%ebx
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        movl    20(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $20,            %ebx
+        addl    %ecx,           %ebx
+        /* R1 20 */
+        leal    3593408605(%eax,%ebp,1),%eax
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        movl    40(%esi),       %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $5,             %eax
+        addl    %ebx,           %eax
+        /* R1 21 */
+        leal    38016083(%edx,%ebp,1),%edx
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        movl    60(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $9,             %edx
+        addl    %eax,           %edx
+        /* R1 22 */
+        leal    3634488961(%ecx,%ebp,1),%ecx
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        movl    16(%esi),       %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $14,            %ecx
+        addl    %edx,           %ecx
+        /* R1 23 */
+        leal    3889429448(%ebx,%ebp,1),%ebx
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        movl    36(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $20,            %ebx
+        addl    %ecx,           %ebx
+        /* R1 24 */
+        leal    568446438(%eax,%ebp,1),%eax
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        movl    56(%esi),       %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $5,             %eax
+        addl    %ebx,           %eax
+        /* R1 25 */
+        leal    3275163606(%edx,%ebp,1),%edx
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        movl    12(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $9,             %edx
+        addl    %eax,           %edx
+        /* R1 26 */
+        leal    4107603335(%ecx,%ebp,1),%ecx
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        movl    32(%esi),       %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $14,            %ecx
+        addl    %edx,           %ecx
+        /* R1 27 */
+        leal    1163531501(%ebx,%ebp,1),%ebx
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        movl    52(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $20,            %ebx
+        addl    %ecx,           %ebx
+        /* R1 28 */
+        leal    2850285829(%eax,%ebp,1),%eax
+        xorl    %ebx,           %edi
+        andl    %edx,           %edi
+        movl    8(%esi),        %ebp
+        xorl    %ecx,           %edi
+        addl    %edi,           %eax
+        movl    %ebx,           %edi
+        roll    $5,             %eax
+        addl    %ebx,           %eax
+        /* R1 29 */
+        leal    4243563512(%edx,%ebp,1),%edx
+        xorl    %eax,           %edi
+        andl    %ecx,           %edi
+        movl    28(%esi),       %ebp
+        xorl    %ebx,           %edi
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $9,             %edx
+        addl    %eax,           %edx
+        /* R1 30 */
+        leal    1735328473(%ecx,%ebp,1),%ecx
+        xorl    %edx,           %edi
+        andl    %ebx,           %edi
+        movl    48(%esi),       %ebp
+        xorl    %eax,           %edi
+        addl    %edi,           %ecx
+        movl    %edx,           %edi
+        roll    $14,            %ecx
+        addl    %edx,           %ecx
+        /* R1 31 */
+        leal    2368359562(%ebx,%ebp,1),%ebx
+        xorl    %ecx,           %edi
+        andl    %eax,           %edi
+        movl    20(%esi),       %ebp
+        xorl    %edx,           %edi
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $20,            %ebx
+        addl    %ecx,           %ebx
+
+        /* R2 section */
+        /* R2 32 */
+        xorl    %edx,           %edi
+        xorl    %ebx,           %edi
+        leal    4294588738(%eax,%ebp,1),%eax
+        addl    %edi,           %eax
+        movl    32(%esi),       %ebp
+        roll    $4,             %eax
+        movl    %ebx,           %edi
+        /* R2 33 */
+        leal    2272392833(%edx,%ebp,1),%edx
+        addl    %ebx,           %eax
+        xorl    %ecx,           %edi
+        xorl    %eax,           %edi
+        movl    44(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $11,            %edx
+        addl    %eax,           %edx
+        /* R2 34 */
+        xorl    %ebx,           %edi
+        xorl    %edx,           %edi
+        leal    1839030562(%ecx,%ebp,1),%ecx
+        addl    %edi,           %ecx
+        movl    56(%esi),       %ebp
+        roll    $16,            %ecx
+        movl    %edx,           %edi
+        /* R2 35 */
+        leal    4259657740(%ebx,%ebp,1),%ebx
+        addl    %edx,           %ecx
+        xorl    %eax,           %edi
+        xorl    %ecx,           %edi
+        movl    4(%esi),        %ebp
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $23,            %ebx
+        addl    %ecx,           %ebx
+        /* R2 36 */
+        xorl    %edx,           %edi
+        xorl    %ebx,           %edi
+        leal    2763975236(%eax,%ebp,1),%eax
+        addl    %edi,           %eax
+        movl    16(%esi),       %ebp
+        roll    $4,             %eax
+        movl    %ebx,           %edi
+        /* R2 37 */
+        leal    1272893353(%edx,%ebp,1),%edx
+        addl    %ebx,           %eax
+        xorl    %ecx,           %edi
+        xorl    %eax,           %edi
+        movl    28(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $11,            %edx
+        addl    %eax,           %edx
+        /* R2 38 */
+        xorl    %ebx,           %edi
+        xorl    %edx,           %edi
+        leal    4139469664(%ecx,%ebp,1),%ecx
+        addl    %edi,           %ecx
+        movl    40(%esi),       %ebp
+        roll    $16,            %ecx
+        movl    %edx,           %edi
+        /* R2 39 */
+        leal    3200236656(%ebx,%ebp,1),%ebx
+        addl    %edx,           %ecx
+        xorl    %eax,           %edi
+        xorl    %ecx,           %edi
+        movl    52(%esi),       %ebp
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $23,            %ebx
+        addl    %ecx,           %ebx
+        /* R2 40 */
+        xorl    %edx,           %edi
+        xorl    %ebx,           %edi
+        leal    681279174(%eax,%ebp,1),%eax
+        addl    %edi,           %eax
+        movl    (%esi),         %ebp
+        roll    $4,             %eax
+        movl    %ebx,           %edi
+        /* R2 41 */
+        leal    3936430074(%edx,%ebp,1),%edx
+        addl    %ebx,           %eax
+        xorl    %ecx,           %edi
+        xorl    %eax,           %edi
+        movl    12(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $11,            %edx
+        addl    %eax,           %edx
+        /* R2 42 */
+        xorl    %ebx,           %edi
+        xorl    %edx,           %edi
+        leal    3572445317(%ecx,%ebp,1),%ecx
+        addl    %edi,           %ecx
+        movl    24(%esi),       %ebp
+        roll    $16,            %ecx
+        movl    %edx,           %edi
+        /* R2 43 */
+        leal    76029189(%ebx,%ebp,1),%ebx
+        addl    %edx,           %ecx
+        xorl    %eax,           %edi
+        xorl    %ecx,           %edi
+        movl    36(%esi),       %ebp
+        addl    %edi,           %ebx
+        movl    %ecx,           %edi
+        roll    $23,            %ebx
+        addl    %ecx,           %ebx
+        /* R2 44 */
+        xorl    %edx,           %edi
+        xorl    %ebx,           %edi
+        leal    3654602809(%eax,%ebp,1),%eax
+        addl    %edi,           %eax
+        movl    48(%esi),       %ebp
+        roll    $4,             %eax
+        movl    %ebx,           %edi
+        /* R2 45 */
+        leal    3873151461(%edx,%ebp,1),%edx
+        addl    %ebx,           %eax
+        xorl    %ecx,           %edi
+        xorl    %eax,           %edi
+        movl    60(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        roll    $11,            %edx
+        addl    %eax,           %edx
+        /* R2 46 */
+        xorl    %ebx,           %edi
+        xorl    %edx,           %edi
+        leal    530742520(%ecx,%ebp,1),%ecx
+        addl    %edi,           %ecx
+        movl    8(%esi),        %ebp
+        roll    $16,            %ecx
+        movl    %edx,           %edi
+        /* R2 47 */
+        leal    3299628645(%ebx,%ebp,1),%ebx
+        addl    %edx,           %ecx
+        xorl    %eax,           %edi
+        xorl    %ecx,           %edi
+        movl    (%esi),         %ebp
+        addl    %edi,           %ebx
+        movl    $-1,            %edi
+        roll    $23,            %ebx
+        addl    %ecx,           %ebx
+
+        /* R3 section */
+        /* R3 48 */
+        xorl    %edx,           %edi
+        orl     %ebx,           %edi
+        leal    4096336452(%eax,%ebp,1),%eax
+        xorl    %ecx,           %edi
+        movl    28(%esi),       %ebp
+        addl    %edi,           %eax
+        movl    $-1,            %edi
+        roll    $6,             %eax
+        xorl    %ecx,           %edi
+        addl    %ebx,           %eax
+        /* R3 49 */
+        orl     %eax,           %edi
+        leal    1126891415(%edx,%ebp,1),%edx
+        xorl    %ebx,           %edi
+        movl    56(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        xorl    %ebx,           %edi
+        addl    %eax,           %edx
+        /* R3 50 */
+        orl     %edx,           %edi
+        leal    2878612391(%ecx,%ebp,1),%ecx
+        xorl    %eax,           %edi
+        movl    20(%esi),       %ebp
+        addl    %edi,           %ecx
+        movl    $-1,            %edi
+        roll    $15,            %ecx
+        xorl    %eax,           %edi
+        addl    %edx,           %ecx
+        /* R3 51 */
+        orl     %ecx,           %edi
+        leal    4237533241(%ebx,%ebp,1),%ebx
+        xorl    %edx,           %edi
+        movl    48(%esi),       %ebp
+        addl    %edi,           %ebx
+        movl    $-1,            %edi
+        roll    $21,            %ebx
+        xorl    %edx,           %edi
+        addl    %ecx,           %ebx
+        /* R3 52 */
+        orl     %ebx,           %edi
+        leal    1700485571(%eax,%ebp,1),%eax
+        xorl    %ecx,           %edi
+        movl    12(%esi),       %ebp
+        addl    %edi,           %eax
+        movl    $-1,            %edi
+        roll    $6,             %eax
+        xorl    %ecx,           %edi
+        addl    %ebx,           %eax
+        /* R3 53 */
+        orl     %eax,           %edi
+        leal    2399980690(%edx,%ebp,1),%edx
+        xorl    %ebx,           %edi
+        movl    40(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        xorl    %ebx,           %edi
+        addl    %eax,           %edx
+        /* R3 54 */
+        orl     %edx,           %edi
+        leal    4293915773(%ecx,%ebp,1),%ecx
+        xorl    %eax,           %edi
+        movl    4(%esi),        %ebp
+        addl    %edi,           %ecx
+        movl    $-1,            %edi
+        roll    $15,            %ecx
+        xorl    %eax,           %edi
+        addl    %edx,           %ecx
+        /* R3 55 */
+        orl     %ecx,           %edi
+        leal    2240044497(%ebx,%ebp,1),%ebx
+        xorl    %edx,           %edi
+        movl    32(%esi),       %ebp
+        addl    %edi,           %ebx
+        movl    $-1,            %edi
+        roll    $21,            %ebx
+        xorl    %edx,           %edi
+        addl    %ecx,           %ebx
+        /* R3 56 */
+        orl     %ebx,           %edi
+        leal    1873313359(%eax,%ebp,1),%eax
+        xorl    %ecx,           %edi
+        movl    60(%esi),       %ebp
+        addl    %edi,           %eax
+        movl    $-1,            %edi
+        roll    $6,             %eax
+        xorl    %ecx,           %edi
+        addl    %ebx,           %eax
+        /* R3 57 */
+        orl     %eax,           %edi
+        leal    4264355552(%edx,%ebp,1),%edx
+        xorl    %ebx,           %edi
+        movl    24(%esi),       %ebp
+        addl    %edi,           %edx
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        xorl    %ebx,           %edi
+        addl    %eax,           %edx
+        /* R3 58 */
+        orl     %edx,           %edi
+        leal    2734768916(%ecx,%ebp,1),%ecx
+        xorl    %eax,           %edi
+        movl    52(%esi),       %ebp
+        addl    %edi,           %ecx
+        movl    $-1,            %edi
+        roll    $15,            %ecx
+        xorl    %eax,           %edi
+        addl    %edx,           %ecx
+        /* R3 59 */
+        orl     %ecx,           %edi
+        leal    1309151649(%ebx,%ebp,1),%ebx
+        xorl    %edx,           %edi
+        movl    16(%esi),       %ebp
+        addl    %edi,           %ebx
+        movl    $-1,            %edi
+        roll    $21,            %ebx
+        xorl    %edx,           %edi
+        addl    %ecx,           %ebx
+        /* R3 60 */
+        orl     %ebx,           %edi
+        leal    4149444226(%eax,%ebp,1),%eax
+        xorl    %ecx,           %edi
+        movl    44(%esi),       %ebp
+        addl    %edi,           %eax
+        movl    $-1,            %edi
+        roll    $6,             %eax
+        xorl    %ecx,           %edi
+        addl    %ebx,           %eax
+        /* R3 61 */
+        orl     %eax,           %edi
+        leal    3174756917(%edx,%ebp,1),%edx
+        xorl    %ebx,           %edi
+        movl    8(%esi),        %ebp
+        addl    %edi,           %edx
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        xorl    %ebx,           %edi
+        addl    %eax,           %edx
+        /* R3 62 */
+        orl     %edx,           %edi
+        leal    718787259(%ecx,%ebp,1),%ecx
+        xorl    %eax,           %edi
+        movl    36(%esi),       %ebp
+        addl    %edi,           %ecx
+        movl    $-1,            %edi
+        roll    $15,            %ecx
+        xorl    %eax,           %edi
+        addl    %edx,           %ecx
+        /* R3 63 */
+        orl     %ecx,           %edi
+        leal    3951481745(%ebx,%ebp,1),%ebx
+        xorl    %edx,           %edi
+        movl    24(%esp),       %ebp
+        addl    %edi,           %ebx
+        addl    $64,            %esi
+        roll    $21,            %ebx
+        movl    (%ebp),         %edi
+        addl    %ecx,           %ebx
+        addl    %edi,           %eax
+        movl    4(%ebp),        %edi
+        addl    %edi,           %ebx
+        movl    8(%ebp),        %edi
+        addl    %edi,           %ecx
+        movl    12(%ebp),       %edi
+        addl    %edi,           %edx
+        movl    %eax,           (%ebp)
+        movl    %ebx,           4(%ebp)
+        movl    (%esp),         %edi
+        movl    %ecx,           8(%ebp)
+        movl    %edx,           12(%ebp)
+        cmpl    %esi,           %edi
+        jge     .L000start
+        popl    %eax
+        popl    %ebx
+        popl    %ebp
+        popl    %edi
+        popl    %esi
+        ret
+.md5_block_x86_end:
+        SIZE(md5_block_x86,.md5_block_x86_end-md5_block_x86)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/mdc2/Makefile.ssl b/src/lib/libcrypto/mdc2/Makefile.ssl
new file mode 100644
index 0000000000..495a2789a0
--- /dev/null
+++ b/src/lib/libcrypto/mdc2/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/mdc2/Makefile
+#
+
+DIR=    mdc2
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST= mdc2test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=mdc2dgst.c mdc2_one.c
+LIBOBJ=mdc2dgst.o mdc2_one.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= mdc2.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/objects/Makefile.ssl b/src/lib/libcrypto/objects/Makefile.ssl
new file mode 100644
index 0000000000..320523cea1
--- /dev/null
+++ b/src/lib/libcrypto/objects/Makefile.ssl
@@ -0,0 +1,87 @@
+#
+# SSLeay/crypto/objects/Makefile
+#
+
+DIR=    objects
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=objects
+ERRC=obj_err
+GENERAL=Makefile README
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= obj_dat.c obj_lib.c $(ERRC).c
+LIBOBJ= obj_dat.o obj_lib.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= objects.h
+HEADER= $(EXHEADER) obj_dat.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    obj_dat.h lib
+
+obj_dat.h: objects.h obj_dat.pl
+        perl ./obj_dat.pl < objects.h > obj_dat.h
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/objects/objects.err b/src/lib/libcrypto/objects/objects.err
new file mode 100644
index 0000000000..8bec3eaea2
--- /dev/null
+++ b/src/lib/libcrypto/objects/objects.err
@@ -0,0 +1,12 @@
+/* Error codes for the OBJ functions. */
+
+/* Function codes. */
+#define OBJ_F_OBJ_CREATE                                 100
+#define OBJ_F_OBJ_DUP                                    101
+#define OBJ_F_OBJ_NID2LN                                 102
+#define OBJ_F_OBJ_NID2OBJ                                103
+#define OBJ_F_OBJ_NID2SN                                 104
+
+/* Reason codes. */
+#define OBJ_R_MALLOC_FAILURE                             100
+#define OBJ_R_UNKNOWN_NID                                101
diff --git a/src/lib/libcrypto/pem/Makefile.ssl b/src/lib/libcrypto/pem/Makefile.ssl
new file mode 100644
index 0000000000..fc04a88fd9
--- /dev/null
+++ b/src/lib/libcrypto/pem/Makefile.ssl
@@ -0,0 +1,96 @@
+#
+# SSLeay/crypto/pem/Makefile
+#
+
+DIR=    pem
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=pem
+ERRC=pem_err
+GENERAL=Makefile
+TEST=
+APPS=
+
+CTX_SIZE= ctx_size
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c $(ERRC).c
+
+LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= pem.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    pem.h lib
+
+pem.h: $(CTX_SIZE)
+        ./$(CTX_SIZE) <pem.org >pem.new
+        if [ -f pem.h ]; then mv -f pem.h pem.old; fi
+        mv -f pem.new pem.h
+
+$(CTX_SIZE): $(CTX_SIZE).o
+        $(CC) $(CFLAGS) -o $(CTX_SIZE) $(CTX_SIZE).o
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(CTX_SIZE).c $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(CTX_SIZE) *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # SPECIAL CASE .org
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/pem/ctx_size.c b/src/lib/libcrypto/pem/ctx_size.c
new file mode 100644
index 0000000000..87469bc4af
--- /dev/null
+++ b/src/lib/libcrypto/pem/ctx_size.c
@@ -0,0 +1,122 @@
+/* crypto/pem/ctx_size.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 "cryptlib.h"
+#include "evp.h"
+
+int main(argc,argv)
+int argc;
+char *argv[];
+        {
+        int i,j;
+        char buf[256];
+
+        for (;;)
+                {
+                char *str;
+                buf[0]='\0';
+                fgets(buf,256,stdin);
+                if (buf[0] == '\0') break;
+
+                str="#define EVP_ENCODE_CTX_SIZE ";
+                if (strncmp(buf,str,strlen(str)) == 0)
+                        {
+                        printf("%s %d\n",str,(int)sizeof(EVP_ENCODE_CTX));
+                        continue;
+                        }
+                str="#define EVP_MD_SIZE ";
+                if (strncmp(buf,str,strlen(str)) == 0)
+                        {
+                        printf("%s %d\n",str,(int)sizeof(EVP_MD));
+                        continue;
+                        }
+                str="#define EVP_MD_CTX_SIZE ";
+                if (strncmp(buf,str,strlen(str)) == 0)
+                        {
+                        printf("%s %d\n",str,(int)sizeof(EVP_MD_CTX));
+                        continue;
+                        }
+                str="#define EVP_CIPHER_SIZE ";
+                if (strncmp(buf,str,strlen(str)) == 0)
+                        {
+                        printf("%s %d\n",str,(int)sizeof(EVP_CIPHER));
+                        continue;
+                        }
+                str="#define EVP_CIPHER_CTX_SIZE ";
+                if (strncmp(buf,str,strlen(str)) == 0)
+                        {
+                        printf("%s %d\n",str,(int)sizeof(EVP_CIPHER_CTX));
+                        continue;
+                        }
+
+                str="#define EVP_MAX_MD_SIZE ";
+                if (strncmp(buf,str,strlen(str)) == 0)
+                        {
+                        i=MD2_DIGEST_LENGTH;
+                        j=MD5_DIGEST_LENGTH;
+                        if (j > i) i=j;
+                        j=SHA_DIGEST_LENGTH;
+                        if (j > i) i=j;
+                        printf("%s %d\n",str,i);
+                        continue;
+                        }
+                fputs(buf,stdout);
+                }
+        exit(0);
+        }
diff --git a/src/lib/libcrypto/pem/pem.err b/src/lib/libcrypto/pem/pem.err
new file mode 100644
index 0000000000..0e523abf82
--- /dev/null
+++ b/src/lib/libcrypto/pem/pem.err
@@ -0,0 +1,38 @@
+/* Error codes for the PEM functions. */
+
+/* Function codes. */
+#define PEM_F_DEF_CALLBACK                               100
+#define PEM_F_LOAD_IV                                    101
+#define PEM_F_PEM_ASN1_READ                              102
+#define PEM_F_PEM_ASN1_READ_BIO                          103
+#define PEM_F_PEM_ASN1_WRITE                             104
+#define PEM_F_PEM_ASN1_WRITE_BIO                         105
+#define PEM_F_PEM_DO_HEADER                              106
+#define PEM_F_PEM_GET_EVP_CIPHER_INFO                    107
+#define PEM_F_PEM_READ                                   108
+#define PEM_F_PEM_READ_BIO                               109
+#define PEM_F_PEM_SEALFINAL                              110
+#define PEM_F_PEM_SEALINIT                               111
+#define PEM_F_PEM_SIGNFINAL                              112
+#define PEM_F_PEM_WRITE                                  113
+#define PEM_F_PEM_WRITE_BIO                              114
+#define PEM_F_PEM_X509_INFO_READ                         115
+#define PEM_F_PEM_X509_INFO_READ_BIO                     116
+#define PEM_F_PEM_X509_INFO_WRITE_BIO                    117
+
+/* Reason codes. */
+#define PEM_R_BAD_BASE64_DECODE                          100
+#define PEM_R_BAD_DECRYPT                                101
+#define PEM_R_BAD_END_LINE                               102
+#define PEM_R_BAD_IV_CHARS                               103
+#define PEM_R_BAD_PASSWORD_READ                          104
+#define PEM_R_NOT_DEK_INFO                               105
+#define PEM_R_NOT_ENCRYPTED                              106
+#define PEM_R_NOT_PROC_TYPE                              107
+#define PEM_R_NO_START_LINE                              108
+#define PEM_R_PROBLEMS_GETTING_PASSWORD                  109
+#define PEM_R_PUBLIC_KEY_NO_RSA                          110
+#define PEM_R_READ_KEY                                   111
+#define PEM_R_SHORT_HEADER                               112
+#define PEM_R_UNSUPPORTED_CIPHER                         113
+#define PEM_R_UNSUPPORTED_ENCRYPTION                     114
diff --git a/src/lib/libcrypto/pem/pem.org b/src/lib/libcrypto/pem/pem.org
new file mode 100644
index 0000000000..38952509dd
--- /dev/null
+++ b/src/lib/libcrypto/pem/pem.org
@@ -0,0 +1,562 @@
+/* crypto/pem/pem.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
+ *
+ * Always modify pem.org since pem.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+#ifndef HEADER_PEM_H
+#define HEADER_PEM_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include "evp.h"
+#include "x509.h"
+
+#define PEM_OBJ_UNDEF           0
+#define PEM_OBJ_X509            1
+#define PEM_OBJ_X509_REQ        2
+#define PEM_OBJ_CRL             3
+#define PEM_OBJ_SSL_SESSION     4
+#define PEM_OBJ_PRIV_KEY        10
+#define PEM_OBJ_PRIV_RSA        11
+#define PEM_OBJ_PRIV_DSA        12
+#define PEM_OBJ_PRIV_DH         13
+#define PEM_OBJ_PUB_RSA         14
+#define PEM_OBJ_PUB_DSA         15
+#define PEM_OBJ_PUB_DH          16
+#define PEM_OBJ_DHPARAMS        17
+#define PEM_OBJ_DSAPARAMS       18
+#define PEM_OBJ_PRIV_RSA_PUBLIC 19
+
+#define PEM_ERROR               30
+#define PEM_DEK_DES_CBC         40
+#define PEM_DEK_IDEA_CBC        45
+#define PEM_DEK_DES_EDE         50
+#define PEM_DEK_DES_ECB         60
+#define PEM_DEK_RSA             70
+#define PEM_DEK_RSA_MD2         80
+#define PEM_DEK_RSA_MD5         90
+
+#define PEM_MD_MD2              NID_md2
+#define PEM_MD_MD5              NID_md5
+#define PEM_MD_SHA              NID_sha
+#define PEM_MD_MD2_RSA          NID_md2WithRSAEncryption
+#define PEM_MD_MD5_RSA          NID_md5WithRSAEncryption
+#define PEM_MD_SHA_RSA          NID_sha1WithRSAEncryption
+
+#define PEM_STRING_X509_OLD     "X509 CERTIFICATE"
+#define PEM_STRING_X509         "CERTIFICATE"
+#define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
+#define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"
+#define PEM_STRING_X509_CRL     "X509 CRL"
+#define PEM_STRING_EVP_PKEY     "PRIVATE KEY"
+#define PEM_STRING_RSA          "RSA PRIVATE KEY"
+#define PEM_STRING_RSA_PUBLIC   "RSA PUBLIC KEY"
+#define PEM_STRING_DSA          "DSA PRIVATE KEY"
+#define PEM_STRING_PKCS7        "PKCS7"
+#define PEM_STRING_DHPARAMS     "DH PARAMETERS"
+#define PEM_STRING_SSL_SESSION  "SSL SESSION PARAMETERS"
+#define PEM_STRING_DSAPARAMS    "DSA PARAMETERS"
+
+#ifndef HEADER_ENVELOPE_H
+
+#define EVP_ENCODE_CTX_SIZE  92
+#define EVP_MD_SIZE  48
+#define EVP_MD_CTX_SIZE  152
+#define EVP_CIPHER_SIZE  28
+#define EVP_CIPHER_CTX_SIZE  4212
+#define EVP_MAX_MD_SIZE  20
+
+typedef struct evp_encode_ctx_st
+        {
+        char data[EVP_ENCODE_CTX_SIZE];
+        } EVP_ENCODE_CTX;
+
+typedef struct env_md_ctx_st
+        {
+        char data[EVP_MD_CTX_SIZE];
+        } EVP_MD_CTX;
+
+typedef struct evp_cipher_st
+        {
+        char data[EVP_CIPHER_SIZE];
+        } EVP_CIPHER;
+
+typedef struct evp_cipher_ctx_st
+        {
+        char data[EVP_CIPHER_CTX_SIZE];
+        } EVP_CIPHER_CTX;
+#endif
+
+
+typedef struct PEM_Encode_Seal_st
+        {
+        EVP_ENCODE_CTX encode;
+        EVP_MD_CTX md;
+        EVP_CIPHER_CTX cipher;
+        } PEM_ENCODE_SEAL_CTX;
+
+/* enc_type is one off */
+#define PEM_TYPE_ENCRYPTED      10
+#define PEM_TYPE_MIC_ONLY       20
+#define PEM_TYPE_MIC_CLEAR      30
+#define PEM_TYPE_CLEAR          40
+
+typedef struct pem_recip_st
+        {
+        char *name;
+        X509_NAME *dn;
+
+        int cipher;
+        int key_enc;
+        char iv[8];
+        } PEM_USER;
+
+typedef struct pem_ctx_st
+        {
+        int type;               /* what type of object */
+
+        struct  {
+                int version;    
+                int mode;               
+                } proc_type;
+
+        char *domain;
+
+        struct  {
+                int cipher;
+                unsigned char iv[8];
+                } DEK_info;
+                
+        PEM_USER *originator;
+
+        int num_recipient;
+        PEM_USER **recipient;
+
+#ifdef HEADER_STACK_H
+        STACK *x509_chain;      /* certificate chain */
+#else
+        char *x509_chain;       /* certificate chain */
+#endif
+        EVP_MD *md;             /* signature type */
+
+        int md_enc;             /* is the md encrypted or not? */
+        int md_len;             /* length of md_data */
+        char *md_data;          /* message digest, could be pkey encrypted */
+
+        EVP_CIPHER *dec;        /* date encryption cipher */
+        int key_len;            /* key length */
+        unsigned char *key;     /* key */
+        unsigned char iv[8];    /* the iv */
+
+        
+        int  data_enc;          /* is the data encrypted */
+        int data_len;
+        unsigned char *data;
+        } PEM_CTX;
+
+#ifdef SSLEAY_MACROS
+
+#define PEM_write_SSL_SESSION(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_SSL_SESSION, \
+                        PEM_STRING_SSL_SESSION,fp, (char *)x, NULL,NULL,0,NULL)
+#define PEM_write_X509(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp, \
+                        (char *)x, NULL,NULL,0,NULL)
+#define PEM_write_X509_REQ(fp,x) PEM_ASN1_write( \
+                (int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,fp,(char *)x, \
+                        NULL,NULL,0,NULL)
+#define PEM_write_X509_CRL(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL, \
+                        fp,(char *)x, NULL,NULL,0,NULL)
+#define PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb) \
+                PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,\
+                        (char *)x,enc,kstr,klen,cb)
+#define PEM_write_RSAPublicKey(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_RSAPublicKey,\
+                        PEM_STRING_RSA_PUBLIC,fp,(char *)x,NULL,NULL,0,NULL)
+#define PEM_write_DSAPrivateKey(fp,x,enc,kstr,klen,cb) \
+                PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,\
+                        (char *)x,enc,kstr,klen,cb)
+#define PEM_write_PrivateKey(bp,x,enc,kstr,klen,cb) \
+                PEM_ASN1_write((int (*)())i2d_PrivateKey,\
+                (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
+                        bp,(char *)x,enc,kstr,klen,cb)
+#define PEM_write_PKCS7(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,fp, \
+                        (char *)x, NULL,NULL,0,NULL)
+#define PEM_write_DHparams(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,\
+                        (char *)x,NULL,NULL,0,NULL)
+
+#define PEM_read_SSL_SESSION(fp,x,cb) (SSL_SESSION *)PEM_ASN1_read( \
+        (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,fp,(char **)x,cb)
+#define PEM_read_X509(fp,x,cb) (X509 *)PEM_ASN1_read( \
+        (char *(*)())d2i_X509,PEM_STRING_X509,fp,(char **)x,cb)
+#define PEM_read_X509_REQ(fp,x,cb) (X509_REQ *)PEM_ASN1_read( \
+        (char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,fp,(char **)x,cb)
+#define PEM_read_X509_CRL(fp,x,cb) (X509_CRL *)PEM_ASN1_read( \
+        (char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,fp,(char **)x,cb)
+#define PEM_read_RSAPrivateKey(fp,x,cb) (RSA *)PEM_ASN1_read( \
+        (char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,fp,(char **)x,cb)
+#define PEM_read_RSAPublicKey(fp,x,cb) (RSA *)PEM_ASN1_read( \
+        (char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb)
+#define PEM_read_DSAPrivateKey(fp,x,cb) (DSA *)PEM_ASN1_read( \
+        (char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,fp,(char **)x,cb)
+#define PEM_read_PrivateKey(fp,x,cb) (EVP_PKEY *)PEM_ASN1_read( \
+        (char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,fp,(char **)x,cb)
+#define PEM_read_PKCS7(fp,x,cb) (PKCS7 *)PEM_ASN1_read( \
+        (char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,fp,(char **)x,cb)
+#define PEM_read_DHparams(fp,x,cb) (DH *)PEM_ASN1_read( \
+        (char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,fp,(char **)x,cb)
+
+#define PEM_write_bio_SSL_SESSION(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_SSL_SESSION, \
+                        PEM_STRING_SSL_SESSION,bp, (char *)x, NULL,NULL,0,NULL)
+#define PEM_write_bio_X509(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_X509,PEM_STRING_X509,bp, \
+                        (char *)x, NULL,NULL,0,NULL)
+#define PEM_write_bio_X509_REQ(bp,x) PEM_ASN1_write_bio( \
+                (int (*)())i2d_X509_REQ,PEM_STRING_X509_REQ,bp,(char *)x, \
+                        NULL,NULL,0,NULL)
+#define PEM_write_bio_X509_CRL(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_X509_CRL,PEM_STRING_X509_CRL,\
+                        bp,(char *)x, NULL,NULL,0,NULL)
+#define PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb) \
+                PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,\
+                        bp,(char *)x,enc,kstr,klen,cb)
+#define PEM_write_bio_RSAPublicKey(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_RSAPublicKey, \
+                        PEM_STRING_RSA_PUBLIC,\
+                        bp,(char *)x,NULL,NULL,0,NULL)
+#define PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb) \
+                PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,\
+                        bp,(char *)x,enc,kstr,klen,cb)
+#define PEM_write_bio_PrivateKey(bp,x,enc,kstr,klen,cb) \
+                PEM_ASN1_write_bio((int (*)())i2d_PrivateKey,\
+                (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
+                        bp,(char *)x,enc,kstr,klen,cb)
+#define PEM_write_bio_PKCS7(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp, \
+                        (char *)x, NULL,NULL,0,NULL)
+#define PEM_write_bio_DHparams(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,\
+                        bp,(char *)x,NULL,NULL,0,NULL)
+#define PEM_write_bio_DSAparams(bp,x) \
+                PEM_ASN1_write_bio((int (*)())i2d_DSAparams, \
+                        PEM_STRING_DSAPARAMS,bp,(char *)x,NULL,NULL,0,NULL)
+
+#define PEM_read_bio_SSL_SESSION(bp,x,cb) (SSL_SESSION *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,bp,(char **)x,cb)
+#define PEM_read_bio_X509(bp,x,cb) (X509 *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_X509,PEM_STRING_X509,bp,(char **)x,cb)
+#define PEM_read_bio_X509_REQ(bp,x,cb) (X509_REQ *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,bp,(char **)x,cb)
+#define PEM_read_bio_X509_CRL(bp,x,cb) (X509_CRL *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,bp,(char **)x,cb)
+#define PEM_read_bio_RSAPrivateKey(bp,x,cb) (RSA *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,bp,(char **)x,cb)
+#define PEM_read_bio_RSAPublicKey(bp,x,cb) (RSA *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb)
+#define PEM_read_bio_DSAPrivateKey(bp,x,cb) (DSA *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,bp,(char **)x,cb)
+#define PEM_read_bio_PrivateKey(bp,x,cb) (EVP_PKEY *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,bp,(char **)x,cb)
+
+#define PEM_read_bio_PKCS7(bp,x,cb) (PKCS7 *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,bp,(char **)x,cb)
+#define PEM_read_bio_DHparams(bp,x,cb) (DH *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,bp,(char **)x,cb)
+#define PEM_read_bio_DSAparams(bp,x,cb) (DSA *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_DSAparams,PEM_STRING_DSAPARAMS,bp,(char **)x,cb)
+
+#endif
+
+#ifndef NOPROTO
+int     PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
+int     PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len,
+                int (*callback)());
+
+#ifdef HEADER_BIO_H
+int     PEM_read_bio(BIO *bp, char **name, char **header,
+                unsigned char **data,long *len);
+int     PEM_write_bio(BIO *bp,char *name,char *hdr,unsigned char *data,
+                long len);
+char *  PEM_ASN1_read_bio(char *(*d2i)(),char *name,BIO *bp,char **x,
+                int (*cb)());
+int     PEM_ASN1_write_bio(int (*i2d)(),char *name,BIO *bp,char *x,
+                EVP_CIPHER *enc,unsigned char *kstr,int klen,int (*callback)());
+STACK * PEM_X509_INFO_read_bio(BIO *bp, STACK *sk, int (*cb)());
+int     PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
+                unsigned char *kstr, int klen, int (*cb)());
+#endif
+
+#ifndef WIN16
+int     PEM_read(FILE *fp, char **name, char **header,
+                unsigned char **data,long *len);
+int     PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
+char *  PEM_ASN1_read(char *(*d2i)(),char *name,FILE *fp,char **x,
+                int (*cb)());
+int     PEM_ASN1_write(int (*i2d)(),char *name,FILE *fp,char *x,
+                EVP_CIPHER *enc,unsigned char *kstr,int klen,int (*callback)());
+STACK * PEM_X509_INFO_read(FILE *fp, STACK *sk, int (*cb)());
+#endif
+
+int     PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
+                EVP_MD *md_type, unsigned char **ek, int *ekl,
+                unsigned char *iv, EVP_PKEY **pubk, int npubk);
+void    PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
+                unsigned char *in, int inl);
+int     PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig,int *sigl,
+                unsigned char *out, int *outl, EVP_PKEY *priv);
+
+void    PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
+void    PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
+int     PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
+                unsigned int *siglen, EVP_PKEY *pkey);
+
+void    ERR_load_PEM_strings(void);
+
+void    PEM_proc_type(char *buf, int type);
+void    PEM_dek_info(char *buf, char *type, int len, char *str);
+
+#ifndef SSLEAY_MACROS
+
+#ifndef WIN16
+X509 *PEM_read_X509(FILE *fp,X509 **x,int (*cb)());
+X509_REQ *PEM_read_X509_REQ(FILE *fp,X509_REQ **x,int (*cb)());
+X509_CRL *PEM_read_X509_CRL(FILE *fp,X509_CRL **x,int (*cb)());
+RSA *PEM_read_RSAPrivateKey(FILE *fp,RSA **x,int (*cb)());
+RSA *PEM_read_RSAPublicKey(FILE *fp,RSA **x,int (*cb)());
+DSA *PEM_read_DSAPrivateKey(FILE *fp,DSA **x,int (*cb)());
+EVP_PKEY *PEM_read_PrivateKey(FILE *fp,EVP_PKEY **x,int (*cb)());
+PKCS7 *PEM_read_PKCS7(FILE *fp,PKCS7 **x,int (*cb)());
+DH *PEM_read_DHparams(FILE *fp,DH **x,int (*cb)());
+DSA *PEM_read_DSAparams(FILE *fp,DSA **x,int (*cb)());
+int PEM_write_X509(FILE *fp,X509 *x);
+int PEM_write_X509_REQ(FILE *fp,X509_REQ *x);
+int PEM_write_X509_CRL(FILE *fp,X509_CRL *x);
+int PEM_write_RSAPrivateKey(FILE *fp,RSA *x,EVP_CIPHER *enc,unsigned char *kstr,
+        int klen,int (*cb)());
+int PEM_write_RSAPublicKey(FILE *fp,RSA *x);
+int PEM_write_DSAPrivateKey(FILE *fp,DSA *x,EVP_CIPHER *enc,unsigned char *kstr,
+        int klen,int (*cb)());
+int PEM_write_PrivateKey(FILE *fp,EVP_PKEY *x,EVP_CIPHER *enc,
+        unsigned char *kstr,int klen,int (*cb)());
+int PEM_write_PKCS7(FILE *fp,PKCS7 *x);
+int PEM_write_DHparams(FILE *fp,DH *x);
+int PEM_write_DSAparams(FILE *fp,DSA *x);
+#endif
+
+#ifdef HEADER_BIO_H
+X509 *PEM_read_bio_X509(BIO *bp,X509 **x,int (*cb)());
+X509_REQ *PEM_read_bio_X509_REQ(BIO *bp,X509_REQ **x,int (*cb)());
+X509_CRL *PEM_read_bio_X509_CRL(BIO *bp,X509_CRL **x,int (*cb)());
+RSA *PEM_read_bio_RSAPrivateKey(BIO *bp,RSA **x,int (*cb)());
+RSA *PEM_read_bio_RSAPublicKey(BIO *bp,RSA **x,int (*cb)());
+DSA *PEM_read_bio_DSAPrivateKey(BIO *bp,DSA **x,int (*cb)());
+EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp,EVP_PKEY **x,int (*cb)());
+PKCS7 *PEM_read_bio_PKCS7(BIO *bp,PKCS7 **x,int (*cb)());
+DH *PEM_read_bio_DHparams(BIO *bp,DH **x,int (*cb)());
+DSA *PEM_read_bio_DSAparams(BIO *bp,DSA **x,int (*cb)());
+int PEM_write_bio_X509(BIO *bp,X509 *x);
+int PEM_write_bio_X509_REQ(BIO *bp,X509_REQ *x);
+int PEM_write_bio_X509_CRL(BIO *bp,X509_CRL *x);
+int PEM_write_bio_RSAPrivateKey(BIO *fp,RSA *x,EVP_CIPHER *enc,
+        unsigned char *kstr,int klen,int (*cb)());
+int PEM_write_bio_RSAPublicKey(BIO *fp,RSA *x);
+int PEM_write_bio_DSAPrivateKey(BIO *fp,DSA *x,EVP_CIPHER *enc,
+        unsigned char *kstr,int klen,int (*cb)());
+int PEM_write_bio_PrivateKey(BIO *fp,EVP_PKEY *x,EVP_CIPHER *enc,
+        unsigned char *kstr,int klen,int (*cb)());
+int PEM_write_bio_PKCS7(BIO *bp,PKCS7 *x);
+int PEM_write_bio_DHparams(BIO *bp,DH *x);
+int PEM_write_bio_DSAparams(BIO *bp,DSA *x);
+#endif
+
+#endif /* SSLEAY_MACROS */
+
+
+#else
+
+int     PEM_get_EVP_CIPHER_INFO();
+int     PEM_do_header();
+int     PEM_read_bio();
+int     PEM_write_bio();
+#ifndef WIN16
+int     PEM_read();
+int     PEM_write();
+STACK * PEM_X509_INFO_read();
+char *  PEM_ASN1_read();
+int     PEM_ASN1_write();
+#endif
+STACK * PEM_X509_INFO_read_bio();
+int     PEM_X509_INFO_write_bio();
+char *  PEM_ASN1_read_bio();
+int     PEM_ASN1_write_bio();
+int     PEM_SealInit();
+void    PEM_SealUpdate();
+int     PEM_SealFinal();
+int     PEM_SignFinal();
+
+void    ERR_load_PEM_strings();
+
+void    PEM_proc_type();
+void    PEM_dek_info();
+
+#ifndef SSLEAY_MACROS
+#ifndef WIN16
+X509 *PEM_read_X509();
+X509_REQ *PEM_read_X509_REQ();
+X509_CRL *PEM_read_X509_CRL();
+RSA *PEM_read_RSAPrivateKey();
+RSA *PEM_read_RSAPublicKey();
+DSA *PEM_read_DSAPrivateKey();
+EVP_PKEY *PEM_read_PrivateKey();
+PKCS7 *PEM_read_PKCS7();
+DH *PEM_read_DHparams();
+DSA *PEM_read_DSAparams();
+int PEM_write_X509();
+int PEM_write_X509_REQ();
+int PEM_write_X509_CRL();
+int PEM_write_RSAPrivateKey();
+int PEM_write_RSAPublicKey();
+int PEM_write_DSAPrivateKey();
+int PEM_write_PrivateKey();
+int PEM_write_PKCS7();
+int PEM_write_DHparams();
+int PEM_write_DSAparams();
+#endif
+
+X509 *PEM_read_bio_X509();
+X509_REQ *PEM_read_bio_X509_REQ();
+X509_CRL *PEM_read_bio_X509_CRL();
+RSA *PEM_read_bio_RSAPrivateKey();
+RSA *PEM_read_bio_RSAPublicKey();
+DSA *PEM_read_bio_DSAPrivateKey();
+EVP_PKEY *PEM_read_bio_PrivateKey();
+PKCS7 *PEM_read_bio_PKCS7();
+DH *PEM_read_bio_DHparams();
+DSA *PEM_read_bio_DSAparams();
+int PEM_write_bio_X509();
+int PEM_write_bio_X509_REQ();
+int PEM_write_bio_X509_CRL();
+int PEM_write_bio_RSAPrivateKey();
+int PEM_write_bio_RSAPublicKey();
+int PEM_write_bio_DSAPrivateKey();
+int PEM_write_bio_PrivateKey();
+int PEM_write_bio_PKCS7();
+int PEM_write_bio_DHparams();
+int PEM_write_bio_DSAparams();
+
+#endif /* SSLEAY_MACROS */
+
+#endif
+
+/* BEGIN ERROR CODES */
+/* Error codes for the PEM functions. */
+
+/* Function codes. */
+#define PEM_F_DEF_CALLBACK                               100
+#define PEM_F_LOAD_IV                                    101
+#define PEM_F_PEM_ASN1_READ                              102
+#define PEM_F_PEM_ASN1_READ_BIO                          103
+#define PEM_F_PEM_ASN1_WRITE                             104
+#define PEM_F_PEM_ASN1_WRITE_BIO                         105
+#define PEM_F_PEM_DO_HEADER                              106
+#define PEM_F_PEM_GET_EVP_CIPHER_INFO                    107
+#define PEM_F_PEM_READ                                   108
+#define PEM_F_PEM_READ_BIO                               109
+#define PEM_F_PEM_SEALFINAL                              110
+#define PEM_F_PEM_SEALINIT                               111
+#define PEM_F_PEM_SIGNFINAL                              112
+#define PEM_F_PEM_WRITE                                  113
+#define PEM_F_PEM_WRITE_BIO                              114
+#define PEM_F_PEM_X509_INFO_READ                         115
+#define PEM_F_PEM_X509_INFO_READ_BIO                     116
+#define PEM_F_PEM_X509_INFO_WRITE_BIO                    117
+
+/* Reason codes. */
+#define PEM_R_BAD_BASE64_DECODE                          100
+#define PEM_R_BAD_DECRYPT                                101
+#define PEM_R_BAD_END_LINE                               102
+#define PEM_R_BAD_IV_CHARS                               103
+#define PEM_R_BAD_PASSWORD_READ                          104
+#define PEM_R_NOT_DEK_INFO                               105
+#define PEM_R_NOT_ENCRYPTED                              106
+#define PEM_R_NOT_PROC_TYPE                              107
+#define PEM_R_NO_START_LINE                              108
+#define PEM_R_PROBLEMS_GETTING_PASSWORD                  109
+#define PEM_R_PUBLIC_KEY_NO_RSA                          110
+#define PEM_R_READ_KEY                                   111
+#define PEM_R_SHORT_HEADER                               112
+#define PEM_R_UNSUPPORTED_CIPHER                         113
+#define PEM_R_UNSUPPORTED_ENCRYPTION                     114
+ 
+#ifdef  __cplusplus
+}
+#endif
+#endif
+
diff --git a/src/lib/libcrypto/pkcs7/Makefile.ssl b/src/lib/libcrypto/pkcs7/Makefile.ssl
new file mode 100644
index 0000000000..a88359b320
--- /dev/null
+++ b/src/lib/libcrypto/pkcs7/Makefile.ssl
@@ -0,0 +1,86 @@
+#
+# SSLeay/crypto/asn1/Makefile
+#
+
+DIR=    pkcs7
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=pkcs7
+ERRC=pkcs7err
+GENERAL=Makefile README
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= pk7_lib.c pkcs7err.c pk7_doit.c
+LIBOBJ= pk7_lib.o pkcs7err.o pk7_doit.o
+
+SRC= $(LIBSRC)
+
+EXHEADER=  pkcs7.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+test:
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/pkcs7/README b/src/lib/libcrypto/pkcs7/README
new file mode 100644
index 0000000000..27001c6970
--- /dev/null
+++ b/src/lib/libcrypto/pkcs7/README
@@ -0,0 +1,5 @@
+WARNING
+
+Everything in this directory is experimental and is subject to change.
+
+Do not rely on the stuff in here not changing in the next release
diff --git a/src/lib/libcrypto/pkcs7/mf.p7 b/src/lib/libcrypto/pkcs7/mf.p7
new file mode 100644
index 0000000000..524335b4b3
--- /dev/null
+++ b/src/lib/libcrypto/pkcs7/mf.p7
@@ -0,0 +1,18 @@
+-----BEGIN PKCS7-----
+MIAGCSqGSIb3DQEHAqCAMIIC2QIBATEMMAoGCCqGSIb3DQIFMIAGCSqGSIb3DQEH
+AQAAoIIB7TCCAekwggFSAgEAMA0GCSqGSIb3DQEBBAUAMFsxCzAJBgNVBAYTAkFV
+MRMwEQYDVQQIEwpRdWVlbnNsYW5kMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0
+ZDEbMBkGA1UEAxMSVGVzdCBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTc0NloX
+DTk4MDYwOTEzNTc0NlowYzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xh
+bmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMSMwIQYDVQQDExpTZXJ2ZXIg
+dGVzdCBjZXJ0ICg1MTIgYml0KTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCfs8OE
+J5X/EjFSDxXvRhHErYDmNlsP3YDXYY3g/HJFCTT+VWZFQ0xol2r+qKCl3194/+7X
+ZLg/BMtv/yr+/rntAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAeEzEdgr2nChPcALL
+vY8gl/GIlpoAjPmKD+pLeGZI9s+SEX5u1q8nCrJ6ZzkfrRnqgI5Anmev9+qPZfdU
+bz5zdVSf4sUL9nX9ChXjK9NCJA3UzQHSFqhZErGUwGNkAHYHp2+zAdY6Ho6rmMzt
+g0CDu/sKR4qzm6REsQGS8kgpjz4xgcUwgcICAQEwYDBbMQswCQYDVQQGEwJBVTET
+MBEGA1UECBMKUXVlZW5zbGFuZDEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQx
+GzAZBgNVBAMTElRlc3QgQ0EgKDEwMjQgYml0KQIBADAKBggqhkiG9w0CBTANBgkq
+hkiG9w0BAQQFAARALnrxJiOX9XZf2D+3vL8SKMQmMq55LltomwOLGUru/q1uVXzi
+ARg7FSCegOpA1nunsTURMUGgrPXKK4XmL4IseQAAAAA=
+-----END PKCS7-----
diff --git a/src/lib/libcrypto/pkcs7/p7.tst b/src/lib/libcrypto/pkcs7/p7.tst
new file mode 100644
index 0000000000..6d14dce163
--- /dev/null
+++ b/src/lib/libcrypto/pkcs7/p7.tst
@@ -0,0 +1,33 @@
+-----BEGIN PKCS7-----
+MIAGCSqGSIb3DQEHAqCAMIIFsQIBATELMAkGBSsOAwIaBQAwgAYJKoZIhvcNAQcB
+AACgggQdMIICJTCCAc+gAwIBAgIBIjANBgkqhkiG9w0BAQQFADCBgjELMAkGA1UE
+BhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxETAPBgNVBAcTCEJyaXNiYW5lMRow
+GAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDEUMBIGA1UECxMLZGV2ZWxvcG1lbnQx
+GTAXBgNVBAMTEENyeXB0U29mdCBEZXYgQ0EwHhcNOTcwNjEzMTgxMDE3WhcNOTgw
+NjEzMTgxMDE3WjCBiDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQx
+ETAPBgNVBAcTCEJyaXNiYW5lMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDEU
+MBIGA1UECxMLSUlTIHRlc3RpbmcxDjAMBgNVBAMTBXRlc3QxMQ8wDQYJKoZIhvcN
+AQkBFgAwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxtWiv59VH42+rotrmFAyDxTc
+J2osFt5uy/zEllx3vvjtwewqQxGUOwf6cjqFOTrnpEdVvwywpEhIQ5364bJqIwID
+AQABoygwJjAkBglghkgBhvhCAQ0EFxYVR2VuZXJhdGVkIHdpdGggU1NMZWF5MA0G
+CSqGSIb3DQEBBAUAA0EAMnYkNV2AdpeHPy/qlcdZx6MDGIJgrLhklhcn6Or6KiAP
+t9+nv9XdOGHyMyQr9ufsweuQfAgJ9yjKPZR2/adTjTCCAfAwggGaAgEAMA0GCSqG
+SIb3DQEBBAUAMIGCMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDER
+MA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRQw
+EgYDVQQLEwtkZXZlbG9wbWVudDEZMBcGA1UEAxMQQ3J5cHRTb2Z0IERldiBDQTAe
+Fw05NzAzMjIxMzM0MDRaFw05ODAzMjIxMzM0MDRaMIGCMQswCQYDVQQGEwJBVTET
+MBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoT
+EUNyeXB0U29mdCBQdHkgTHRkMRQwEgYDVQQLEwtkZXZlbG9wbWVudDEZMBcGA1UE
+AxMQQ3J5cHRTb2Z0IERldiBDQTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDgDgKq
+IBuUMAJi4c8juAqEZ8f8FcuDWT+HcScvNztRJy9K8DnbGpiSrzzix4El6N4A7vbl
+crwn/0CZmQJguZpfAgMBAAEwDQYJKoZIhvcNAQEEBQADQQA0UUvxlXXe6wKkVukn
+ZoCyXbjlNsqt2rwbvfZEam6fQP3S7uq+o1Pnj+KDgE33WxWbQAA9h8fY1LWN7X3a
+yTm/MYIBbTCCAWkCAQEwgYgwgYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVl
+bnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0
+eSBMdGQxFDASBgNVBAsTC2RldmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQg
+RGV2IENBAgEiMAkGBSsOAwIaBQCgfTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB
+MCMGCSqGSIb3DQEJBDEWBBSUVhbGkNE+KGqpOK13+FkfOkaoizAcBgkqhkiG9w0B
+CQUxDxcNOTcwNzAxMDE0MzM0WjAeBgkqhkiG9w0BCQ8xETAPMA0GCCqGSIb3DQMC
+AgEoMA0GCSqGSIb3DQEBAQUABECa9Jpo4w/fZOc3Vy78wZFAVF8kvpn7il99Ldsr
+AQ4JiBmcfiSwEBBY6WuKT+/SYtFwZl1oXkTwB5AVCFIC/IFNAAAAAA==
+-----END PKCS7-----
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.err b/src/lib/libcrypto/pkcs7/pkcs7.err
new file mode 100644
index 0000000000..91413aae43
--- /dev/null
+++ b/src/lib/libcrypto/pkcs7/pkcs7.err
@@ -0,0 +1,26 @@
+/* Error codes for the PKCS7 functions. */
+
+/* Function codes. */
+#define PKCS7_F_PKCS7_ADD_CERTIFICATE                    100
+#define PKCS7_F_PKCS7_ADD_CRL                            101
+#define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                 102
+#define PKCS7_F_PKCS7_ADD_SIGNER                         103
+#define PKCS7_F_PKCS7_CTRL                               104
+#define PKCS7_F_PKCS7_DATAINIT                           105
+#define PKCS7_F_PKCS7_DATASIGN                           106
+#define PKCS7_F_PKCS7_DATAVERIFY                         107
+#define PKCS7_F_PKCS7_SET_CIPHER                         108
+#define PKCS7_F_PKCS7_SET_CONTENT                        109
+#define PKCS7_F_PKCS7_SET_TYPE                           110
+
+/* Reason codes. */
+#define PKCS7_R_INTERNAL_ERROR                           100
+#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     101
+#define PKCS7_R_SIGNATURE_FAILURE                        102
+#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               103
+#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   104
+#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            105
+#define PKCS7_R_UNKNOWN_DIGEST_TYPE                      106
+#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  107
+#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 108
+#define PKCS7_R_WRONG_CONTENT_TYPE                       109
diff --git a/src/lib/libcrypto/rand/Makefile.ssl b/src/lib/libcrypto/rand/Makefile.ssl
new file mode 100644
index 0000000000..d04f0a9b43
--- /dev/null
+++ b/src/lib/libcrypto/rand/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/rand/Makefile
+#
+
+DIR=    rand
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST= randtest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=md_rand.c randfile.c
+LIBOBJ=md_rand.o randfile.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= rand.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/ranlib.sh b/src/lib/libcrypto/ranlib.sh
new file mode 100644
index 0000000000..543f712c6b
--- /dev/null
+++ b/src/lib/libcrypto/ranlib.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+cwd=`pwd`
+cd /tmp
+
+if [ -s /bin/ranlib ] ; then 
+        RL=/bin/ranlib
+else if [ -s /usr/bin/ranlib ] ; then
+        RL=/usr/bin/ranlib
+fi
+fi
+
+if [ "x$RL" != "x" ]
+then
+        case "$1" in
+                /*)  
+                $RL "$1"
+                ;;
+                *)
+                $RL "$cwd/$1"
+                ;;
+        esac
+fi
diff --git a/src/lib/libcrypto/rc2/Makefile.ssl b/src/lib/libcrypto/rc2/Makefile.ssl
new file mode 100644
index 0000000000..c5138f13e2
--- /dev/null
+++ b/src/lib/libcrypto/rc2/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/rc2/Makefile
+#
+
+DIR=    rc2
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rc2test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+LIBOBJ=rc2_ecb.o rc2_skey.o rc2_cbc.o rc2cfb64.o rc2ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= rc2.h
+HEADER= rc2_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rc2/Makefile.uni b/src/lib/libcrypto/rc2/Makefile.uni
new file mode 100644
index 0000000000..e50b3f2d19
--- /dev/null
+++ b/src/lib/libcrypto/rc2/Makefile.uni
@@ -0,0 +1,72 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+
+DIR=    rc2
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+IDEA_ENC=rc2_cbc.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rc2test
+APPS=rc2speed
+
+LIB=librc2.a
+LIBSRC=rc2_skey.c rc2_ecb.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+LIBOBJ=rc2_skey.o rc2_ecb.o $(IDEA_ENC) rc2cfb64.o rc2ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= rc2.h
+HEADER= rc2_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB):    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+
+test:   $(TEST)
+        ./$(TEST)
+
+$(TEST): $(TEST).c $(LIB)
+        $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB)
+
+$(APPS): $(APPS).c $(LIB)
+        $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rc2/rc2.org b/src/lib/libcrypto/rc2/rc2.org
new file mode 100644
index 0000000000..37354cfa62
--- /dev/null
+++ b/src/lib/libcrypto/rc2/rc2.org
@@ -0,0 +1,118 @@
+/* crypto/rc2/rc2.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
+ *
+ * Always modify rc2.org since rc2.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+#ifndef HEADER_RC2_H
+#define HEADER_RC2_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define RC2_ENCRYPT     1
+#define RC2_DECRYPT     0
+
+/* I need to put in a mod for the alpha - eay */
+#define RC2_INT unsigned short
+
+#define RC2_BLOCK       8
+#define RC2_KEY_LENGTH  16
+
+typedef struct rc2_key_st
+        {
+        RC2_INT data[64];
+        } RC2_KEY;
+
+#ifndef NOPROTO
+ 
+void RC2_set_key(RC2_KEY *key, int len, unsigned char *data,int bits);
+void RC2_ecb_encrypt(unsigned char *in,unsigned char *out,RC2_KEY *key,
+        int enc);
+void RC2_encrypt(unsigned long *data,RC2_KEY *key);
+void RC2_decrypt(unsigned long *data,RC2_KEY *key);
+void RC2_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
+        RC2_KEY *ks, unsigned char *iv, int enc);
+void RC2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+        RC2_KEY *schedule, unsigned char *ivec, int *num, int enc);
+void RC2_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
+        RC2_KEY *schedule, unsigned char *ivec, int *num);
+
+#else
+
+void RC2_set_key();
+void RC2_ecb_encrypt();
+void RC2_encrypt();
+void RC2_decrypt();
+void RC2_cbc_encrypt();
+void RC2_cfb64_encrypt();
+void RC2_ofb64_encrypt();
+
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/lib/libcrypto/rc4/Makefile.ssl b/src/lib/libcrypto/rc4/Makefile.ssl
new file mode 100644
index 0000000000..19c1e980f3
--- /dev/null
+++ b/src/lib/libcrypto/rc4/Makefile.ssl
@@ -0,0 +1,108 @@
+#
+# SSLeay/crypto/rc4/Makefile
+#
+
+DIR=    rc4
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+RC4_ENC=rc4_enc.o
+# or use
+#RC4_ENC=asm/rx86-elf.o
+#RC4_ENC=asm/rx86-out.o
+#RC4_ENC=asm/rx86-sol.o
+#RC4_ENC=asm/rx86bdsi.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rc4test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=rc4_skey.c rc4_enc.c
+LIBOBJ=rc4_skey.o $(RC4_ENC)
+
+SRC= $(LIBSRC)
+
+EXHEADER= rc4.h
+HEADER= $(EXHEADER) rc4_locl.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/rx86-elf.o: asm/rx86unix.cpp
+        $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o
+
+# solaris
+asm/rx86-sol.o: asm/rx86unix.cpp
+        $(CC) -E -DSOL asm/rx86unix.cpp | sed 's/^#.*//' > asm/rx86-sol.s
+        as -o asm/rx86-sol.o asm/rx86-sol.s
+        rm -f asm/rx86-sol.s
+
+# a.out
+asm/rx86-out.o: asm/rx86unix.cpp
+        $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o
+
+# bsdi
+asm/rx86bsdi.o: asm/rx86unix.cpp
+        $(CPP) -DBSDI asm/rx86unix.cpp | as -o asm/rx86bsdi.o
+
+asm/rx86unix.cpp:
+        (cd asm; perl rc4-586.pl cpp >rx86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rc4/Makefile.uni b/src/lib/libcrypto/rc4/Makefile.uni
new file mode 100644
index 0000000000..79dc17b8d1
--- /dev/null
+++ b/src/lib/libcrypto/rc4/Makefile.uni
@@ -0,0 +1,102 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+DIR=    rc4
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+RC4_ENC=rc4_enc.o
+# or use
+#RC4_ENC=asm/rx86-elf.o
+#RC4_ENC=asm/rx86-out.o
+#RC4_ENC=asm/rx86-sol.o
+#RC4_ENC=asm/rx86bdsi.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rc4test
+APPS=rc4speed
+
+LIB=librc4.a
+LIBSRC=rc4_skey.c rc4_enc.c
+LIBOBJ=rc4_skey.o $(RC4_ENC)
+
+SRC= $(LIBSRC)
+
+EXHEADER= rc4.h
+HEADER= $(EXHEADER) rc4_locl.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB):    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+
+# elf
+asm/rx86-elf.o: asm/rx86unix.cpp
+        $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o
+
+# solaris
+asm/rx86-sol.o: asm/rx86unix.cpp
+        $(CC) -E -DSOL asm/rx86unix.cpp | sed 's/^#.*//' > asm/rx86-sol.s
+        as -o asm/rx86-sol.o asm/rx86-sol.s
+        rm -f asm/rx86-sol.s
+
+# a.out
+asm/rx86-out.o: asm/rx86unix.cpp
+        $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o
+
+# bsdi
+asm/rx86bsdi.o: asm/rx86unix.cpp
+        $(CPP) -DBSDI asm/rx86unix.cpp | as -o asm/rx86bsdi.o
+
+asm/rx86unix.cpp:
+        (cd asm; perl rc4-586.pl cpp >rx86unix.cpp)
+
+test:   $(TEST)
+        ./$(TEST)
+
+$(TEST): $(TEST).c $(LIB)
+        $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB)
+
+$(APPS): $(APPS).c $(LIB)
+        $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rc4/asm/r4-win32.asm b/src/lib/libcrypto/rc4/asm/r4-win32.asm
new file mode 100644
index 0000000000..70b0f7484c
--- /dev/null
+++ b/src/lib/libcrypto/rc4/asm/r4-win32.asm
@@ -0,0 +1,314 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by rc4-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   rc4-586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _RC4
+
+_RC4 PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        mov     ebp,            DWORD PTR 12[esp]
+        mov     ebx,            DWORD PTR 16[esp]
+        push    esi
+        push    edi
+        mov     ecx,            DWORD PTR [ebp]
+        mov     edx,            DWORD PTR 4[ebp]
+        mov     esi,            DWORD PTR 28[esp]
+        inc     ecx
+        sub     esp,            12
+        add     ebp,            8
+        and     ecx,            255
+        lea     ebx,            DWORD PTR [esi+ebx-8]
+        mov     edi,            DWORD PTR 44[esp]
+        mov     DWORD PTR 8[esp],ebx
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        cmp     ebx,            esi
+        jl      $L000end
+L001start:
+        add     esi,            8
+        ; Round 0
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR [esp], bl
+        ; Round 1
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR 1[esp],bl
+        ; Round 2
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR 2[esp],bl
+        ; Round 3
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR 3[esp],bl
+        ; Round 4
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR 4[esp],bl
+        ; Round 5
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR 5[esp],bl
+        ; Round 6
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     BYTE PTR 6[esp],bl
+        ; Round 7
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        add     edi,            8
+        mov     BYTE PTR 7[esp],bl
+        ; apply the cipher text
+        mov     eax,            DWORD PTR [esp]
+        mov     ebx,            DWORD PTR [esi-8]
+        xor     eax,            ebx
+        mov     ebx,            DWORD PTR [esi-4]
+        mov     DWORD PTR [edi-8],eax
+        mov     eax,            DWORD PTR 4[esp]
+        xor     eax,            ebx
+        mov     ebx,            DWORD PTR 8[esp]
+        mov     DWORD PTR [edi-4],eax
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        cmp     esi,            ebx
+        jle     L001start
+$L000end:
+        ; Round 0
+        add     ebx,            8
+        inc     esi
+        cmp     ebx,            esi
+        jl      $L002finished
+        mov     DWORD PTR 8[esp],ebx
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR [edi], bl
+        ; Round 1
+        mov     ebx,            DWORD PTR 8[esp]
+        cmp     ebx,            esi
+        jle     $L002finished
+        inc     esi
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR 1[edi],bl
+        ; Round 2
+        mov     ebx,            DWORD PTR 8[esp]
+        cmp     ebx,            esi
+        jle     $L002finished
+        inc     esi
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR 2[edi],bl
+        ; Round 3
+        mov     ebx,            DWORD PTR 8[esp]
+        cmp     ebx,            esi
+        jle     $L002finished
+        inc     esi
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR 3[edi],bl
+        ; Round 4
+        mov     ebx,            DWORD PTR 8[esp]
+        cmp     ebx,            esi
+        jle     $L002finished
+        inc     esi
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR 4[edi],bl
+        ; Round 5
+        mov     ebx,            DWORD PTR 8[esp]
+        cmp     ebx,            esi
+        jle     $L002finished
+        inc     esi
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     eax,            DWORD PTR [ecx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR 5[edi],bl
+        ; Round 6
+        mov     ebx,            DWORD PTR 8[esp]
+        cmp     ebx,            esi
+        jle     $L002finished
+        inc     esi
+        add     edx,            eax
+        and     edx,            255
+        inc     ecx
+        mov     ebx,            DWORD PTR [edx*4+ebp]
+        mov     DWORD PTR [ecx*4+ebp-4],ebx
+        add     ebx,            eax
+        and     ecx,            255
+        and     ebx,            255
+        mov     DWORD PTR [edx*4+ebp],eax
+        nop
+        mov     ebx,            DWORD PTR [ebx*4+ebp]
+        mov     bh,             BYTE PTR [esi-1]
+        xor     bl,             bh
+        mov     BYTE PTR 6[edi],bl
+$L002finished:
+        dec     ecx
+        add     esp,            12
+        mov     DWORD PTR [ebp-4],edx
+        mov     BYTE PTR [ebp-8],cl
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+_RC4 ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/rc4/asm/rx86unix.cpp b/src/lib/libcrypto/rc4/asm/rx86unix.cpp
new file mode 100644
index 0000000000..ec1d72a110
--- /dev/null
+++ b/src/lib/libcrypto/rc4/asm/rx86unix.cpp
@@ -0,0 +1,358 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define RC4 _RC4
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by rc4-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "rc4-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl RC4
+        TYPE(RC4,@function)
+RC4:
+
+        pushl   %ebp
+        pushl   %ebx
+        movl    12(%esp),       %ebp
+        movl    16(%esp),       %ebx
+        pushl   %esi
+        pushl   %edi
+        movl    (%ebp),         %ecx
+        movl    4(%ebp),        %edx
+        movl    28(%esp),       %esi
+        incl    %ecx
+        subl    $12,            %esp
+        addl    $8,             %ebp
+        andl    $255,           %ecx
+        leal    -8(%ebx,%esi,), %ebx
+        movl    44(%esp),       %edi
+        movl    %ebx,           8(%esp)
+        movl    (%ebp,%ecx,4),  %eax
+        cmpl    %esi,           %ebx
+        jl      .L000end
+.L001start:
+        addl    $8,             %esi
+        /* Round 0 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            (%esp)
+        /* Round 1 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            1(%esp)
+        /* Round 2 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            2(%esp)
+        /* Round 3 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            3(%esp)
+        /* Round 4 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            4(%esp)
+        /* Round 5 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            5(%esp)
+        /* Round 6 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    %bl,            6(%esp)
+        /* Round 7 */
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        addl    $8,             %edi
+        movb    %bl,            7(%esp)
+        /* apply the cipher text */
+        movl    (%esp),         %eax
+        movl    -8(%esi),       %ebx
+        xorl    %ebx,           %eax
+        movl    -4(%esi),       %ebx
+        movl    %eax,           -8(%edi)
+        movl    4(%esp),        %eax
+        xorl    %ebx,           %eax
+        movl    8(%esp),        %ebx
+        movl    %eax,           -4(%edi)
+        movl    (%ebp,%ecx,4),  %eax
+        cmpl    %ebx,           %esi
+        jle     .L001start
+.L000end:
+        /* Round 0 */
+        addl    $8,             %ebx
+        incl    %esi
+        cmpl    %esi,           %ebx
+        jl      .L002finished
+        movl    %ebx,           8(%esp)
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            (%edi)
+        /* Round 1 */
+        movl    8(%esp),        %ebx
+        cmpl    %esi,           %ebx
+        jle     .L002finished
+        incl    %esi
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            1(%edi)
+        /* Round 2 */
+        movl    8(%esp),        %ebx
+        cmpl    %esi,           %ebx
+        jle     .L002finished
+        incl    %esi
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            2(%edi)
+        /* Round 3 */
+        movl    8(%esp),        %ebx
+        cmpl    %esi,           %ebx
+        jle     .L002finished
+        incl    %esi
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            3(%edi)
+        /* Round 4 */
+        movl    8(%esp),        %ebx
+        cmpl    %esi,           %ebx
+        jle     .L002finished
+        incl    %esi
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            4(%edi)
+        /* Round 5 */
+        movl    8(%esp),        %ebx
+        cmpl    %esi,           %ebx
+        jle     .L002finished
+        incl    %esi
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movl    (%ebp,%ecx,4),  %eax
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            5(%edi)
+        /* Round 6 */
+        movl    8(%esp),        %ebx
+        cmpl    %esi,           %ebx
+        jle     .L002finished
+        incl    %esi
+        addl    %eax,           %edx
+        andl    $255,           %edx
+        incl    %ecx
+        movl    (%ebp,%edx,4),  %ebx
+        movl    %ebx,           -4(%ebp,%ecx,4)
+        addl    %eax,           %ebx
+        andl    $255,           %ecx
+        andl    $255,           %ebx
+        movl    %eax,           (%ebp,%edx,4)
+        nop
+        movl    (%ebp,%ebx,4),  %ebx
+        movb    -1(%esi),       %bh
+        xorb    %bh,            %bl
+        movb    %bl,            6(%edi)
+.L002finished:
+        decl    %ecx
+        addl    $12,            %esp
+        movl    %edx,           -4(%ebp)
+        movb    %cl,            -8(%ebp)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.RC4_end:
+        SIZE(RC4,.RC4_end-RC4)
+.ident  "RC4"
diff --git a/src/lib/libcrypto/rc4/rc4.org b/src/lib/libcrypto/rc4/rc4.org
new file mode 100644
index 0000000000..c558651af8
--- /dev/null
+++ b/src/lib/libcrypto/rc4/rc4.org
@@ -0,0 +1,103 @@
+/* crypto/rc4/rc4.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *
+ * Always modify rc4.org since rc4.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
+ */
+
+#ifndef HEADER_RC4_H
+#define HEADER_RC4_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* using int types make the structure larger but make the code faster
+ * on most boxes I have tested - up to %20 faster. */
+#define RC4_INT unsigned int
+
+typedef struct rc4_key_st
+        {
+        RC4_INT x,y;
+        RC4_INT data[256];
+        } RC4_KEY;
+
+#ifndef NOPROTO
+ 
+char *RC4_options(void);
+void RC4_set_key(RC4_KEY *key, int len, unsigned char *data);
+void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata,
+                unsigned char *outdata);
+
+#else
+
+char *RC4_options();
+void RC4_set_key();
+void RC4();
+
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/lib/libcrypto/rc4/rc4_locl.org b/src/lib/libcrypto/rc4/rc4_locl.org
new file mode 100644
index 0000000000..1ef4455fb7
--- /dev/null
+++ b/src/lib/libcrypto/rc4/rc4_locl.org
@@ -0,0 +1,70 @@
+/* crypto/rc4/rc4_locl.org */
+/* 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.]
+ */
+
+/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ *
+ * Always modify bf_locl.org since bf_locl.h is automatically generated from
+ * it during SSLeay configuration.
+ *
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+ */
+
+/* if this is defined data[i] is used instead of *data, this is a %20
+ * speedup on x86 */
+#undef RC4_INDEX
+
diff --git a/src/lib/libcrypto/rc5/Makefile.ssl b/src/lib/libcrypto/rc5/Makefile.ssl
new file mode 100644
index 0000000000..5e98ee2348
--- /dev/null
+++ b/src/lib/libcrypto/rc5/Makefile.ssl
@@ -0,0 +1,107 @@
+#
+# SSLeay/crypto/rc5/Makefile
+#
+
+DIR=    rc5
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+RC5_ENC=                rc5_enc.o
+# or use
+#DES_ENC=       r586-elf.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rc5test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c 
+LIBOBJ=rc5_skey.o rc5_ecb.o $(RC5_ENC) rc5cfb64.o rc5ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= rc5.h
+HEADER= rc5_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/r586-elf.o: asm/r586unix.cpp
+        $(CPP) -DELF asm/r586unix.cpp | as -o asm/r586-elf.o
+
+# solaris
+asm/r586-sol.o: asm/r586unix.cpp
+        $(CC) -E -DSOL asm/r586unix.cpp | sed 's/^#.*//' > asm/r586-sol.s
+        as -o asm/r586-sol.o asm/r586-sol.s
+        rm -f asm/r586-sol.s
+
+# a.out
+asm/r586-out.o: asm/r586unix.cpp
+        $(CPP) -DOUT asm/r586unix.cpp | as -o asm/r586-out.o
+
+# bsdi
+asm/r586bsdi.o: asm/r586unix.cpp
+        $(CPP) -DBSDI asm/r586unix.cpp | as -o asm/r586bsdi.o
+
+asm/r586unix.cpp:
+        (cd asm; perl rc5-586.pl cpp >r586unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/point.sh ../../doc/rc5.doc rc5.doc ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rc5/Makefile.uni b/src/lib/libcrypto/rc5/Makefile.uni
new file mode 100644
index 0000000000..e50b3f2d19
--- /dev/null
+++ b/src/lib/libcrypto/rc5/Makefile.uni
@@ -0,0 +1,72 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+
+DIR=    rc2
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+IDEA_ENC=rc2_cbc.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rc2test
+APPS=rc2speed
+
+LIB=librc2.a
+LIBSRC=rc2_skey.c rc2_ecb.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+LIBOBJ=rc2_skey.o rc2_ecb.o $(IDEA_ENC) rc2cfb64.o rc2ofb64.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= rc2.h
+HEADER= rc2_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB):    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+
+test:   $(TEST)
+        ./$(TEST)
+
+$(TEST): $(TEST).c $(LIB)
+        $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB)
+
+$(APPS): $(APPS).c $(LIB)
+        $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rc5/asm/r5-win32.asm b/src/lib/libcrypto/rc5/asm/r5-win32.asm
new file mode 100644
index 0000000000..f43d3711f0
--- /dev/null
+++ b/src/lib/libcrypto/rc5/asm/r5-win32.asm
@@ -0,0 +1,574 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by rc5-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   rc5-586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _RC5_32_encrypt
+
+_RC5_32_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    esi
+        push    edi
+        mov     edx,            DWORD PTR 16[esp]
+        mov     ebp,            DWORD PTR 20[esp]
+        ; Load the 2 words
+        mov     edi,            DWORD PTR [edx]
+        mov     esi,            DWORD PTR 4[edx]
+        push    ebx
+        mov     ebx,            DWORD PTR [ebp]
+        add     edi,            DWORD PTR 4[ebp]
+        add     esi,            DWORD PTR 8[ebp]
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 12[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 16[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 20[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 24[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 28[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 32[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 36[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 40[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 44[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 48[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 52[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 56[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 60[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 64[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 68[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 72[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        cmp     ebx,            8
+        je      $L000rc5_exit
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 76[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 80[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 84[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 88[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 92[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 96[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 100[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 104[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        cmp     ebx,            12
+        je      $L000rc5_exit
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 108[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 112[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 116[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 120[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 124[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 128[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 132[ebp]
+        mov     ecx,            esi
+        rol     edi,            cl
+        add     edi,            eax
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 136[ebp]
+        mov     ecx,            edi
+        rol     esi,            cl
+        add     esi,            eax
+$L000rc5_exit:
+        mov     DWORD PTR [edx],edi
+        mov     DWORD PTR 4[edx],esi
+        pop     ebx
+        pop     edi
+        pop     esi
+        pop     ebp
+        ret
+_RC5_32_encrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _RC5_32_decrypt
+
+_RC5_32_decrypt PROC NEAR
+        ; 
+        push    ebp
+        push    esi
+        push    edi
+        mov     edx,            DWORD PTR 16[esp]
+        mov     ebp,            DWORD PTR 20[esp]
+        ; Load the 2 words
+        mov     edi,            DWORD PTR [edx]
+        mov     esi,            DWORD PTR 4[edx]
+        push    ebx
+        mov     ebx,            DWORD PTR [ebp]
+        cmp     ebx,            12
+        je      $L001rc5_dec_12
+        cmp     ebx,            8
+        je      $L002rc5_dec_8
+        mov     eax,            DWORD PTR 136[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 132[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 128[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 124[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 120[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 116[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 112[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 108[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+$L001rc5_dec_12:
+        mov     eax,            DWORD PTR 104[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 100[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 96[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 92[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 88[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 84[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 80[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 76[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+$L002rc5_dec_8:
+        mov     eax,            DWORD PTR 72[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 68[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 64[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 60[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 56[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 52[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 48[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 44[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 40[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 36[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 32[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 28[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 24[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 20[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        mov     eax,            DWORD PTR 16[ebp]
+        sub     esi,            eax
+        mov     ecx,            edi
+        ror     esi,            cl
+        xor     esi,            edi
+        mov     eax,            DWORD PTR 12[ebp]
+        sub     edi,            eax
+        mov     ecx,            esi
+        ror     edi,            cl
+        xor     edi,            esi
+        sub     esi,            DWORD PTR 8[ebp]
+        sub     edi,            DWORD PTR 4[ebp]
+L003rc5_exit:
+        mov     DWORD PTR [edx],edi
+        mov     DWORD PTR 4[edx],esi
+        pop     ebx
+        pop     edi
+        pop     esi
+        pop     ebp
+        ret
+_RC5_32_decrypt ENDP
+_TEXT   ENDS
+_TEXT   SEGMENT
+PUBLIC  _RC5_32_cbc_encrypt
+
+_RC5_32_cbc_encrypt PROC NEAR
+        ; 
+        push    ebp
+        push    ebx
+        push    esi
+        push    edi
+        mov     ebp,            DWORD PTR 28[esp]
+        ; getting iv ptr from parameter 4
+        mov     ebx,            DWORD PTR 36[esp]
+        mov     esi,            DWORD PTR [ebx]
+        mov     edi,            DWORD PTR 4[ebx]
+        push    edi
+        push    esi
+        push    edi
+        push    esi
+        mov     ebx,            esp
+        mov     esi,            DWORD PTR 36[esp]
+        mov     edi,            DWORD PTR 40[esp]
+        ; getting encrypt flag from parameter 5
+        mov     ecx,            DWORD PTR 56[esp]
+        ; get and push parameter 3
+        mov     eax,            DWORD PTR 48[esp]
+        push    eax
+        push    ebx
+        cmp     ecx,            0
+        jz      $L004decrypt
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        jz      $L005encrypt_finish
+L006encrypt_loop:
+        mov     ecx,            DWORD PTR [esi]
+        mov     edx,            DWORD PTR 4[esi]
+        xor     eax,            ecx
+        xor     ebx,            edx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _RC5_32_encrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L006encrypt_loop
+$L005encrypt_finish:
+        mov     ebp,            DWORD PTR 52[esp]
+        and     ebp,            7
+        jz      $L007finish
+        xor     ecx,            ecx
+        xor     edx,            edx
+        mov     ebp,            DWORD PTR $L008cbc_enc_jmp_table[ebp*4]
+        jmp      ebp
+L009ej7:
+        mov     dh,             BYTE PTR 6[esi]
+        shl     edx,            8
+L010ej6:
+        mov     dh,             BYTE PTR 5[esi]
+L011ej5:
+        mov     dl,             BYTE PTR 4[esi]
+L012ej4:
+        mov     ecx,            DWORD PTR [esi]
+        jmp     $L013ejend
+L014ej3:
+        mov     ch,             BYTE PTR 2[esi]
+        shl     ecx,            8
+L015ej2:
+        mov     ch,             BYTE PTR 1[esi]
+L016ej1:
+        mov     cl,             BYTE PTR [esi]
+$L013ejend:
+        xor     eax,            ecx
+        xor     ebx,            edx
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _RC5_32_encrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     DWORD PTR [edi],eax
+        mov     DWORD PTR 4[edi],ebx
+        jmp     $L007finish
+$L004decrypt:
+        and     ebp,            4294967288
+        mov     eax,            DWORD PTR 16[esp]
+        mov     ebx,            DWORD PTR 20[esp]
+        jz      $L017decrypt_finish
+L018decrypt_loop:
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _RC5_32_decrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     ecx,            DWORD PTR 16[esp]
+        mov     edx,            DWORD PTR 20[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR [edi],ecx
+        mov     DWORD PTR 4[edi],edx
+        mov     DWORD PTR 16[esp],eax
+        mov     DWORD PTR 20[esp],ebx
+        add     esi,            8
+        add     edi,            8
+        sub     ebp,            8
+        jnz     L018decrypt_loop
+$L017decrypt_finish:
+        mov     ebp,            DWORD PTR 52[esp]
+        and     ebp,            7
+        jz      $L007finish
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 8[esp],eax
+        mov     DWORD PTR 12[esp],ebx
+        call    _RC5_32_decrypt
+        mov     eax,            DWORD PTR 8[esp]
+        mov     ebx,            DWORD PTR 12[esp]
+        mov     ecx,            DWORD PTR 16[esp]
+        mov     edx,            DWORD PTR 20[esp]
+        xor     ecx,            eax
+        xor     edx,            ebx
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+L019dj7:
+        ror     edx,            16
+        mov     BYTE PTR 6[edi],dl
+        shr     edx,            16
+L020dj6:
+        mov     BYTE PTR 5[edi],dh
+L021dj5:
+        mov     BYTE PTR 4[edi],dl
+L022dj4:
+        mov     DWORD PTR [edi],ecx
+        jmp     $L023djend
+L024dj3:
+        ror     ecx,            16
+        mov     BYTE PTR 2[edi],cl
+        shl     ecx,            16
+L025dj2:
+        mov     BYTE PTR 1[esi],ch
+L026dj1:
+        mov     BYTE PTR [esi], cl
+$L023djend:
+        jmp     $L007finish
+$L007finish:
+        mov     ecx,            DWORD PTR 60[esp]
+        add     esp,            24
+        mov     DWORD PTR [ecx],eax
+        mov     DWORD PTR 4[ecx],ebx
+        pop     edi
+        pop     esi
+        pop     ebx
+        pop     ebp
+        ret
+$L008cbc_enc_jmp_table:
+        DD      0
+        DD      L016ej1
+        DD      L015ej2
+        DD      L014ej3
+        DD      L012ej4
+        DD      L011ej5
+        DD      L010ej6
+        DD      L009ej7
+L027cbc_dec_jmp_table:
+        DD      0
+        DD      L026dj1
+        DD      L025dj2
+        DD      L024dj3
+        DD      L022dj4
+        DD      L021dj5
+        DD      L020dj6
+        DD      L019dj7
+_RC5_32_cbc_encrypt ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/rc5/asm/r586unix.cpp b/src/lib/libcrypto/rc5/asm/r586unix.cpp
new file mode 100644
index 0000000000..a25dd5a9a4
--- /dev/null
+++ b/src/lib/libcrypto/rc5/asm/r586unix.cpp
@@ -0,0 +1,628 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define RC5_32_encrypt _RC5_32_encrypt
+#define RC5_32_decrypt _RC5_32_decrypt
+#define RC5_32_cbc_encrypt _RC5_32_cbc_encrypt
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by rc5-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "rc5-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl RC5_32_encrypt
+        TYPE(RC5_32_encrypt,@function)
+RC5_32_encrypt:
+
+        pushl   %ebp
+        pushl   %esi
+        pushl   %edi
+        movl    16(%esp),       %edx
+        movl    20(%esp),       %ebp
+        /* Load the 2 words */
+        movl    (%edx),         %edi
+        movl    4(%edx),        %esi
+        pushl   %ebx
+        movl    (%ebp),         %ebx
+        addl    4(%ebp),        %edi
+        addl    8(%ebp),        %esi
+        xorl    %esi,           %edi
+        movl    12(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    16(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    20(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    24(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    28(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    32(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    36(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    40(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    44(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    48(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    52(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    56(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    60(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    64(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    68(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    72(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        cmpl    $8,             %ebx
+        je      .L000rc5_exit
+        xorl    %esi,           %edi
+        movl    76(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    80(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    84(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    88(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    92(%ebp),       %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    96(%ebp),       %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    100(%ebp),      %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    104(%ebp),      %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        cmpl    $12,            %ebx
+        je      .L000rc5_exit
+        xorl    %esi,           %edi
+        movl    108(%ebp),      %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    112(%ebp),      %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    116(%ebp),      %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    120(%ebp),      %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    124(%ebp),      %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    128(%ebp),      %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+        xorl    %esi,           %edi
+        movl    132(%ebp),      %eax
+        movl    %esi,           %ecx
+        roll    %cl,            %edi
+        addl    %eax,           %edi
+        xorl    %edi,           %esi
+        movl    136(%ebp),      %eax
+        movl    %edi,           %ecx
+        roll    %cl,            %esi
+        addl    %eax,           %esi
+.L000rc5_exit:
+        movl    %edi,           (%edx)
+        movl    %esi,           4(%edx)
+        popl    %ebx
+        popl    %edi
+        popl    %esi
+        popl    %ebp
+        ret
+.RC5_32_encrypt_end:
+        SIZE(RC5_32_encrypt,.RC5_32_encrypt_end-RC5_32_encrypt)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.globl RC5_32_decrypt
+        TYPE(RC5_32_decrypt,@function)
+RC5_32_decrypt:
+
+        pushl   %ebp
+        pushl   %esi
+        pushl   %edi
+        movl    16(%esp),       %edx
+        movl    20(%esp),       %ebp
+        /* Load the 2 words */
+        movl    (%edx),         %edi
+        movl    4(%edx),        %esi
+        pushl   %ebx
+        movl    (%ebp),         %ebx
+        cmpl    $12,            %ebx
+        je      .L001rc5_dec_12
+        cmpl    $8,             %ebx
+        je      .L002rc5_dec_8
+        movl    136(%ebp),      %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    132(%ebp),      %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    128(%ebp),      %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    124(%ebp),      %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    120(%ebp),      %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    116(%ebp),      %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    112(%ebp),      %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    108(%ebp),      %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+.L001rc5_dec_12:
+        movl    104(%ebp),      %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    100(%ebp),      %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    96(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    92(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    88(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    84(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    80(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    76(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+.L002rc5_dec_8:
+        movl    72(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    68(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    64(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    60(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    56(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    52(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    48(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    44(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    40(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    36(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    32(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    28(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    24(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    20(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        movl    16(%ebp),       %eax
+        subl    %eax,           %esi
+        movl    %edi,           %ecx
+        rorl    %cl,            %esi
+        xorl    %edi,           %esi
+        movl    12(%ebp),       %eax
+        subl    %eax,           %edi
+        movl    %esi,           %ecx
+        rorl    %cl,            %edi
+        xorl    %esi,           %edi
+        subl    8(%ebp),        %esi
+        subl    4(%ebp),        %edi
+.L003rc5_exit:
+        movl    %edi,           (%edx)
+        movl    %esi,           4(%edx)
+        popl    %ebx
+        popl    %edi
+        popl    %esi
+        popl    %ebp
+        ret
+.RC5_32_decrypt_end:
+        SIZE(RC5_32_decrypt,.RC5_32_decrypt_end-RC5_32_decrypt)
+.ident  "desasm.pl"
+.text
+        .align ALIGN
+.globl RC5_32_cbc_encrypt
+        TYPE(RC5_32_cbc_encrypt,@function)
+RC5_32_cbc_encrypt:
+
+        pushl   %ebp
+        pushl   %ebx
+        pushl   %esi
+        pushl   %edi
+        movl    28(%esp),       %ebp
+        /* getting iv ptr from parameter 4 */
+        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
+        /* getting encrypt flag from parameter 5 */
+        movl    56(%esp),       %ecx
+        /* get and push parameter 3 */
+        movl    48(%esp),       %eax
+        pushl   %eax
+        pushl   %ebx
+        cmpl    $0,             %ecx
+        jz      .L004decrypt
+        andl    $4294967288,    %ebp
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        jz      .L005encrypt_finish
+.L006encrypt_loop:
+        movl    (%esi),         %ecx
+        movl    4(%esi),        %edx
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    RC5_32_encrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        addl    $8,             %esi
+        addl    $8,             %edi
+        subl    $8,             %ebp
+        jnz     .L006encrypt_loop
+.L005encrypt_finish:
+        movl    52(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L007finish
+        xorl    %ecx,           %ecx
+        xorl    %edx,           %edx
+        movl    .L008cbc_enc_jmp_table(,%ebp,4),%ebp
+        jmp     *%ebp
+.L009ej7:
+        movb    6(%esi),        %dh
+        sall    $8,             %edx
+.L010ej6:
+        movb    5(%esi),        %dh
+.L011ej5:
+        movb    4(%esi),        %dl
+.L012ej4:
+        movl    (%esi),         %ecx
+        jmp     .L013ejend
+.L014ej3:
+        movb    2(%esi),        %ch
+        sall    $8,             %ecx
+.L015ej2:
+        movb    1(%esi),        %ch
+.L016ej1:
+        movb    (%esi),         %cl
+.L013ejend:
+        xorl    %ecx,           %eax
+        xorl    %edx,           %ebx
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    RC5_32_encrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        movl    %eax,           (%edi)
+        movl    %ebx,           4(%edi)
+        jmp     .L007finish
+.align ALIGN
+.L004decrypt:
+        andl    $4294967288,    %ebp
+        movl    16(%esp),       %eax
+        movl    20(%esp),       %ebx
+        jz      .L017decrypt_finish
+.L018decrypt_loop:
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    RC5_32_decrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        movl    16(%esp),       %ecx
+        movl    20(%esp),       %edx
+        xorl    %eax,           %ecx
+        xorl    %ebx,           %edx
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %ecx,           (%edi)
+        movl    %edx,           4(%edi)
+        movl    %eax,           16(%esp)
+        movl    %ebx,           20(%esp)
+        addl    $8,             %esi
+        addl    $8,             %edi
+        subl    $8,             %ebp
+        jnz     .L018decrypt_loop
+.L017decrypt_finish:
+        movl    52(%esp),       %ebp
+        andl    $7,             %ebp
+        jz      .L007finish
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %eax,           8(%esp)
+        movl    %ebx,           12(%esp)
+        call    RC5_32_decrypt
+        movl    8(%esp),        %eax
+        movl    12(%esp),       %ebx
+        movl    16(%esp),       %ecx
+        movl    20(%esp),       %edx
+        xorl    %eax,           %ecx
+        xorl    %ebx,           %edx
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+.L019dj7:
+        rorl    $16,            %edx
+        movb    %dl,            6(%edi)
+        shrl    $16,            %edx
+.L020dj6:
+        movb    %dh,            5(%edi)
+.L021dj5:
+        movb    %dl,            4(%edi)
+.L022dj4:
+        movl    %ecx,           (%edi)
+        jmp     .L023djend
+.L024dj3:
+        rorl    $16,            %ecx
+        movb    %cl,            2(%edi)
+        sall    $16,            %ecx
+.L025dj2:
+        movb    %ch,            1(%esi)
+.L026dj1:
+        movb    %cl,            (%esi)
+.L023djend:
+        jmp     .L007finish
+.align ALIGN
+.L007finish:
+        movl    60(%esp),       %ecx
+        addl    $24,            %esp
+        movl    %eax,           (%ecx)
+        movl    %ebx,           4(%ecx)
+        popl    %edi
+        popl    %esi
+        popl    %ebx
+        popl    %ebp
+        ret
+.align ALIGN
+.L008cbc_enc_jmp_table:
+        .long 0
+        .long .L016ej1
+        .long .L015ej2
+        .long .L014ej3
+        .long .L012ej4
+        .long .L011ej5
+        .long .L010ej6
+        .long .L009ej7
+.align ALIGN
+.L027cbc_dec_jmp_table:
+        .long 0
+        .long .L026dj1
+        .long .L025dj2
+        .long .L024dj3
+        .long .L022dj4
+        .long .L021dj5
+        .long .L020dj6
+        .long .L019dj7
+.RC5_32_cbc_encrypt_end:
+        SIZE(RC5_32_cbc_encrypt,.RC5_32_cbc_encrypt_end-RC5_32_cbc_encrypt)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/rc5/asm/rc5-586.pl b/src/lib/libcrypto/rc5/asm/rc5-586.pl
new file mode 100644
index 0000000000..172bd9ee1b
--- /dev/null
+++ b/src/lib/libcrypto/rc5/asm/rc5-586.pl
@@ -0,0 +1,109 @@
+#!/usr/bin/perl
+
+push(@INC,"perlasm","../../perlasm");
+require "x86asm.pl";
+require "cbc.pl";
+
+&asm_init($ARGV[0],"rc5-586.pl");
+
+$RC5_MAX_ROUNDS=16;
+$RC5_32_OFF=($RC5_MAX_ROUNDS+2)*4;
+$A="edi";
+$B="esi";
+$S="ebp";
+$tmp1="eax";
+$r="ebx";
+$tmpc="ecx";
+$tmp4="edx";
+
+&RC5_32_encrypt("RC5_32_encrypt",1);
+&RC5_32_encrypt("RC5_32_decrypt",0);
+&cbc("RC5_32_cbc_encrypt","RC5_32_encrypt","RC5_32_decrypt",0,4,5,3,-1,-1);
+&asm_finish();
+
+sub RC5_32_encrypt
+        {
+        local($name,$enc)=@_;
+
+        &function_begin_B($name,"");
+
+        &comment("");
+
+        &push("ebp");
+         &push("esi");
+        &push("edi");
+         &mov($tmp4,&wparam(0));
+        &mov($S,&wparam(1));
+
+        &comment("Load the 2 words");
+         &mov($A,&DWP(0,$tmp4,"",0));
+        &mov($B,&DWP(4,$tmp4,"",0));
+
+        &push($r);
+         &mov($r,       &DWP(0,$S,"",0));
+
+        # encrypting part
+
+        if ($enc)
+                {
+                 &add($A,       &DWP(4+0,$S,"",0));
+                &add($B,        &DWP(4+4,$S,"",0));
+
+                for ($i=0; $i<$RC5_MAX_ROUNDS; $i++)
+                        {
+                         &xor($A,       $B);
+                        &mov($tmp1,     &DWP(12+$i*8,$S,"",0));
+                         &mov($tmpc,    $B);
+                        &rotl($A,       &LB("ecx"));
+                        &add($A,        $tmp1);
+
+                         &xor($B,       $A);
+                        &mov($tmp1,     &DWP(16+$i*8,$S,"",0));
+                         &mov($tmpc,    $A);
+                        &rotl($B,       &LB("ecx"));
+                        &add($B,        $tmp1);
+                        if (($i == 7) || ($i == 11))
+                                {
+                         &cmp($r,       $i+1);
+                        &je(&label("rc5_exit"));
+                                }
+                        }
+                }
+        else
+                {
+                 &cmp($r,       12);
+                &je(&label("rc5_dec_12"));
+                 &cmp($r,       8);
+                &je(&label("rc5_dec_8"));
+                for ($i=$RC5_MAX_ROUNDS; $i > 0; $i--)
+                        {
+                        &set_label("rc5_dec_$i") if ($i == 12) || ($i == 8);
+                         &mov($tmp1,    &DWP($i*8+8,$S,"",0));
+                        &sub($B,        $tmp1);
+                         &mov($tmpc,    $A);
+                        &rotr($B,       &LB("ecx"));
+                        &xor($B,        $A);
+
+                         &mov($tmp1,    &DWP($i*8+4,$S,"",0));
+                        &sub($A,        $tmp1);
+                         &mov($tmpc,    $B);
+                        &rotr($A,       &LB("ecx"));
+                        &xor($A,        $B);
+                        }
+                 &sub($B,       &DWP(4+4,$S,"",0));
+                &sub($A,        &DWP(4+0,$S,"",0));
+                }
+
+        &set_label("rc5_exit");
+         &mov(&DWP(0,$tmp4,"",0),$A);
+        &mov(&DWP(4,$tmp4,"",0),$B);
+
+         &pop("ebx");
+        &pop("edi");
+         &pop("esi");
+        &pop("ebp");
+         &ret();
+        &function_end_B($name);
+        }
+
+
diff --git a/src/lib/libcrypto/ripemd/Makefile.ssl b/src/lib/libcrypto/ripemd/Makefile.ssl
new file mode 100644
index 0000000000..67d47ceb2c
--- /dev/null
+++ b/src/lib/libcrypto/ripemd/Makefile.ssl
@@ -0,0 +1,104 @@
+#
+# SSLeay/crypto/ripemd/Makefile
+#
+
+DIR=    ripemd
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+RIP_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=rmdtest.c
+APPS=rmd160.c
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=rmd_dgst.c rmd_one.c
+LIBOBJ=rmd_dgst.o rmd_one.o $(RMD160_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= ripemd.h
+HEADER= rmd_locl.h rmdconst.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/rm86-elf.o: asm/rm86unix.cpp
+        $(CPP) -DELF asm/rm86unix.cpp | as -o asm/rm86-elf.o
+
+# solaris
+asm/rm86-sol.o: asm/rm86unix.cpp
+        $(CC) -E -DSOL asm/rm86unix.cpp | sed 's/^#.*//' > asm/rm86-sol.s
+        as -o asm/rm86-sol.o asm/rm86-sol.s
+        rm -f asm/rm86-sol.s
+
+# a.out
+asm/rm86-out.o: asm/rm86unix.cpp
+        $(CPP) -DOUT asm/rm86unix.cpp | as -o asm/rm86-out.o
+
+# bsdi
+asm/rm86bsdi.o: asm/rm86unix.cpp
+        $(CPP) -DBSDI asm/rm86unix.cpp | as -o asm/rm86bsdi.o
+
+asm/rm86unix.cpp:
+        (cd asm; perl rmd-586.pl cpp >rm86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/ripemd/Makefile.uni b/src/lib/libcrypto/ripemd/Makefile.uni
new file mode 100644
index 0000000000..54685712db
--- /dev/null
+++ b/src/lib/libcrypto/ripemd/Makefile.uni
@@ -0,0 +1,109 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+DIR=    md5
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+MD5_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=md5test
+APPS=md5
+
+LIB=libmd5.a
+LIBSRC=md5_dgst.c md5_one.c
+LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= md5.h
+HEADER= md5_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB):    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+
+# elf
+asm/mx86-elf.o: asm/mx86unix.cpp
+        $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o
+
+# solaris
+asm/mx86-sol.o: asm/mx86unix.cpp
+        $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s
+        as -o asm/mx86-sol.o asm/mx86-sol.s
+        rm -f asm/mx86-sol.s
+
+# a.out
+asm/mx86-out.o: asm/mx86unix.cpp
+        $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
+
+# bsdi
+asm/mx86bsdi.o: asm/mx86unix.cpp
+        $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o
+
+asm/mx86unix.cpp:
+        (cd asm; perl md5-586.pl cpp >mx86unix.cpp)
+
+test:   $(TEST)
+        ./$(TEST)
+
+$(TEST): $(TEST).c $(LIB)
+        $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB)
+
+$(APPS): $(APPS).c $(LIB)
+        $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) MD5_ASM_OBJ="" CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) MD5_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+x86-elf:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-elf.o" CFLAG="-DELF -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-out:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-out.o" CFLAG="-DOUT -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-solaris:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-sol.o" CFLAG="-DSOL -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-bdsi:
+        $(MAKE) MD5_ASM_OBJ="asm/mx86-bdsi.o" CFLAG="-DBDSI -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/ripemd/asm/rm-win32.asm b/src/lib/libcrypto/ripemd/asm/rm-win32.asm
new file mode 100644
index 0000000000..bd38791c13
--- /dev/null
+++ b/src/lib/libcrypto/ripemd/asm/rm-win32.asm
@@ -0,0 +1,1972 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by rmd-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   rmd-586.asm
+        .386
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _ripemd160_block_x86
+
+_ripemd160_block_x86 PROC NEAR
+        push    esi
+        mov     ecx,            DWORD PTR 16[esp]
+        push    edi
+        mov     esi,            DWORD PTR 16[esp]
+        push    ebp
+        add     ecx,            esi
+        push    ebx
+        sub     ecx,            64
+        sub     esp,            88
+        mov     DWORD PTR [esp],ecx
+        mov     edi,            DWORD PTR 108[esp]
+L000start:
+        ; 
+        mov     eax,            DWORD PTR [esi]
+        mov     ebx,            DWORD PTR 4[esi]
+        mov     DWORD PTR 4[esp],eax
+        mov     DWORD PTR 8[esp],ebx
+        mov     eax,            DWORD PTR 8[esi]
+        mov     ebx,            DWORD PTR 12[esi]
+        mov     DWORD PTR 12[esp],eax
+        mov     DWORD PTR 16[esp],ebx
+        mov     eax,            DWORD PTR 16[esi]
+        mov     ebx,            DWORD PTR 20[esi]
+        mov     DWORD PTR 20[esp],eax
+        mov     DWORD PTR 24[esp],ebx
+        mov     eax,            DWORD PTR 24[esi]
+        mov     ebx,            DWORD PTR 28[esi]
+        mov     DWORD PTR 28[esp],eax
+        mov     DWORD PTR 32[esp],ebx
+        mov     eax,            DWORD PTR 32[esi]
+        mov     ebx,            DWORD PTR 36[esi]
+        mov     DWORD PTR 36[esp],eax
+        mov     DWORD PTR 40[esp],ebx
+        mov     eax,            DWORD PTR 40[esi]
+        mov     ebx,            DWORD PTR 44[esi]
+        mov     DWORD PTR 44[esp],eax
+        mov     DWORD PTR 48[esp],ebx
+        mov     eax,            DWORD PTR 48[esi]
+        mov     ebx,            DWORD PTR 52[esi]
+        mov     DWORD PTR 52[esp],eax
+        mov     DWORD PTR 56[esp],ebx
+        mov     eax,            DWORD PTR 56[esi]
+        mov     ebx,            DWORD PTR 60[esi]
+        mov     DWORD PTR 60[esp],eax
+        mov     DWORD PTR 64[esp],ebx
+        add     esi,            64
+        mov     eax,            DWORD PTR [edi]
+        mov     DWORD PTR 112[esp],esi
+        mov     ebx,            DWORD PTR 4[edi]
+        mov     ecx,            DWORD PTR 8[edi]
+        mov     edx,            DWORD PTR 12[edi]
+        mov     ebp,            DWORD PTR 16[edi]
+        ; 0
+        mov     esi,            ecx
+        xor     esi,            edx
+        mov     edi,            DWORD PTR 4[esp]
+        xor     esi,            ebx
+        add     eax,            edi
+        rol     ecx,            10
+        add     eax,            esi
+        mov     esi,            ebx
+        rol     eax,            11
+        add     eax,            ebp
+        ; 1
+        xor     esi,            ecx
+        mov     edi,            DWORD PTR 8[esp]
+        xor     esi,            eax
+        add     ebp,            esi
+        mov     esi,            eax
+        rol     ebx,            10
+        add     ebp,            edi
+        xor     esi,            ebx
+        rol     ebp,            14
+        add     ebp,            edx
+        ; 2
+        mov     edi,            DWORD PTR 12[esp]
+        xor     esi,            ebp
+        add     edx,            edi
+        rol     eax,            10
+        add     edx,            esi
+        mov     esi,            ebp
+        rol     edx,            15
+        add     edx,            ecx
+        ; 3
+        xor     esi,            eax
+        mov     edi,            DWORD PTR 16[esp]
+        xor     esi,            edx
+        add     ecx,            esi
+        mov     esi,            edx
+        rol     ebp,            10
+        add     ecx,            edi
+        xor     esi,            ebp
+        rol     ecx,            12
+        add     ecx,            ebx
+        ; 4
+        mov     edi,            DWORD PTR 20[esp]
+        xor     esi,            ecx
+        add     ebx,            edi
+        rol     edx,            10
+        add     ebx,            esi
+        mov     esi,            ecx
+        rol     ebx,            5
+        add     ebx,            eax
+        ; 5
+        xor     esi,            edx
+        mov     edi,            DWORD PTR 24[esp]
+        xor     esi,            ebx
+        add     eax,            esi
+        mov     esi,            ebx
+        rol     ecx,            10
+        add     eax,            edi
+        xor     esi,            ecx
+        rol     eax,            8
+        add     eax,            ebp
+        ; 6
+        mov     edi,            DWORD PTR 28[esp]
+        xor     esi,            eax
+        add     ebp,            edi
+        rol     ebx,            10
+        add     ebp,            esi
+        mov     esi,            eax
+        rol     ebp,            7
+        add     ebp,            edx
+        ; 7
+        xor     esi,            ebx
+        mov     edi,            DWORD PTR 32[esp]
+        xor     esi,            ebp
+        add     edx,            esi
+        mov     esi,            ebp
+        rol     eax,            10
+        add     edx,            edi
+        xor     esi,            eax
+        rol     edx,            9
+        add     edx,            ecx
+        ; 8
+        mov     edi,            DWORD PTR 36[esp]
+        xor     esi,            edx
+        add     ecx,            edi
+        rol     ebp,            10
+        add     ecx,            esi
+        mov     esi,            edx
+        rol     ecx,            11
+        add     ecx,            ebx
+        ; 9
+        xor     esi,            ebp
+        mov     edi,            DWORD PTR 40[esp]
+        xor     esi,            ecx
+        add     ebx,            esi
+        mov     esi,            ecx
+        rol     edx,            10
+        add     ebx,            edi
+        xor     esi,            edx
+        rol     ebx,            13
+        add     ebx,            eax
+        ; 10
+        mov     edi,            DWORD PTR 44[esp]
+        xor     esi,            ebx
+        add     eax,            edi
+        rol     ecx,            10
+        add     eax,            esi
+        mov     esi,            ebx
+        rol     eax,            14
+        add     eax,            ebp
+        ; 11
+        xor     esi,            ecx
+        mov     edi,            DWORD PTR 48[esp]
+        xor     esi,            eax
+        add     ebp,            esi
+        mov     esi,            eax
+        rol     ebx,            10
+        add     ebp,            edi
+        xor     esi,            ebx
+        rol     ebp,            15
+        add     ebp,            edx
+        ; 12
+        mov     edi,            DWORD PTR 52[esp]
+        xor     esi,            ebp
+        add     edx,            edi
+        rol     eax,            10
+        add     edx,            esi
+        mov     esi,            ebp
+        rol     edx,            6
+        add     edx,            ecx
+        ; 13
+        xor     esi,            eax
+        mov     edi,            DWORD PTR 56[esp]
+        xor     esi,            edx
+        add     ecx,            esi
+        mov     esi,            edx
+        rol     ebp,            10
+        add     ecx,            edi
+        xor     esi,            ebp
+        rol     ecx,            7
+        add     ecx,            ebx
+        ; 14
+        mov     edi,            DWORD PTR 60[esp]
+        xor     esi,            ecx
+        add     ebx,            edi
+        rol     edx,            10
+        add     ebx,            esi
+        mov     esi,            ecx
+        rol     ebx,            9
+        add     ebx,            eax
+        ; 15
+        xor     esi,            edx
+        mov     edi,            DWORD PTR 64[esp]
+        xor     esi,            ebx
+        add     eax,            esi
+        mov     esi,            -1
+        rol     ecx,            10
+        add     eax,            edi
+        mov     edi,            DWORD PTR 32[esp]
+        rol     eax,            8
+        add     eax,            ebp
+        ; 16
+        add     ebp,            edi
+        mov     edi,            ebx
+        sub     esi,            eax
+        and     edi,            eax
+        and     esi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 20[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1518500249[edi*1+ebp]
+        mov     edi,            -1
+        rol     ebp,            7
+        add     ebp,            edx
+        ; 17
+        add     edx,            esi
+        mov     esi,            eax
+        sub     edi,            ebp
+        and     esi,            ebp
+        and     edi,            ebx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 56[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1518500249[esi*1+edx]
+        mov     esi,            -1
+        rol     edx,            6
+        add     edx,            ecx
+        ; 18
+        add     ecx,            edi
+        mov     edi,            ebp
+        sub     esi,            edx
+        and     edi,            edx
+        and     esi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 8[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1518500249[edi*1+ecx]
+        mov     edi,            -1
+        rol     ecx,            8
+        add     ecx,            ebx
+        ; 19
+        add     ebx,            esi
+        mov     esi,            edx
+        sub     edi,            ecx
+        and     esi,            ecx
+        and     edi,            ebp
+        or      esi,            edi
+        mov     edi,            DWORD PTR 44[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1518500249[esi*1+ebx]
+        mov     esi,            -1
+        rol     ebx,            13
+        add     ebx,            eax
+        ; 20
+        add     eax,            edi
+        mov     edi,            ecx
+        sub     esi,            ebx
+        and     edi,            ebx
+        and     esi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 28[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1518500249[edi*1+eax]
+        mov     edi,            -1
+        rol     eax,            11
+        add     eax,            ebp
+        ; 21
+        add     ebp,            esi
+        mov     esi,            ebx
+        sub     edi,            eax
+        and     esi,            eax
+        and     edi,            ecx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 64[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1518500249[esi*1+ebp]
+        mov     esi,            -1
+        rol     ebp,            9
+        add     ebp,            edx
+        ; 22
+        add     edx,            edi
+        mov     edi,            eax
+        sub     esi,            ebp
+        and     edi,            ebp
+        and     esi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 16[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1518500249[edi*1+edx]
+        mov     edi,            -1
+        rol     edx,            7
+        add     edx,            ecx
+        ; 23
+        add     ecx,            esi
+        mov     esi,            ebp
+        sub     edi,            edx
+        and     esi,            edx
+        and     edi,            eax
+        or      esi,            edi
+        mov     edi,            DWORD PTR 52[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1518500249[esi*1+ecx]
+        mov     esi,            -1
+        rol     ecx,            15
+        add     ecx,            ebx
+        ; 24
+        add     ebx,            edi
+        mov     edi,            edx
+        sub     esi,            ecx
+        and     edi,            ecx
+        and     esi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 4[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1518500249[edi*1+ebx]
+        mov     edi,            -1
+        rol     ebx,            7
+        add     ebx,            eax
+        ; 25
+        add     eax,            esi
+        mov     esi,            ecx
+        sub     edi,            ebx
+        and     esi,            ebx
+        and     edi,            edx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 40[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1518500249[esi*1+eax]
+        mov     esi,            -1
+        rol     eax,            12
+        add     eax,            ebp
+        ; 26
+        add     ebp,            edi
+        mov     edi,            ebx
+        sub     esi,            eax
+        and     edi,            eax
+        and     esi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 24[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1518500249[edi*1+ebp]
+        mov     edi,            -1
+        rol     ebp,            15
+        add     ebp,            edx
+        ; 27
+        add     edx,            esi
+        mov     esi,            eax
+        sub     edi,            ebp
+        and     esi,            ebp
+        and     edi,            ebx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 12[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1518500249[esi*1+edx]
+        mov     esi,            -1
+        rol     edx,            9
+        add     edx,            ecx
+        ; 28
+        add     ecx,            edi
+        mov     edi,            ebp
+        sub     esi,            edx
+        and     edi,            edx
+        and     esi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 60[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1518500249[edi*1+ecx]
+        mov     edi,            -1
+        rol     ecx,            11
+        add     ecx,            ebx
+        ; 29
+        add     ebx,            esi
+        mov     esi,            edx
+        sub     edi,            ecx
+        and     esi,            ecx
+        and     edi,            ebp
+        or      esi,            edi
+        mov     edi,            DWORD PTR 48[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1518500249[esi*1+ebx]
+        mov     esi,            -1
+        rol     ebx,            7
+        add     ebx,            eax
+        ; 30
+        add     eax,            edi
+        mov     edi,            ecx
+        sub     esi,            ebx
+        and     edi,            ebx
+        and     esi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 36[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1518500249[edi*1+eax]
+        mov     edi,            -1
+        rol     eax,            13
+        add     eax,            ebp
+        ; 31
+        add     ebp,            esi
+        mov     esi,            ebx
+        sub     edi,            eax
+        and     esi,            eax
+        and     edi,            ecx
+        or      esi,            edi
+        mov     edi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1518500249[esi*1+ebp]
+        sub     edi,            eax
+        rol     ebp,            12
+        add     ebp,            edx
+        ; 32
+        mov     esi,            DWORD PTR 16[esp]
+        or      edi,            ebp
+        add     edx,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1859775393[edi*1+edx]
+        sub     esi,            ebp
+        rol     edx,            11
+        add     edx,            ecx
+        ; 33
+        mov     edi,            DWORD PTR 44[esp]
+        or      esi,            edx
+        add     ecx,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1859775393[esi*1+ecx]
+        sub     edi,            edx
+        rol     ecx,            13
+        add     ecx,            ebx
+        ; 34
+        mov     esi,            DWORD PTR 60[esp]
+        or      edi,            ecx
+        add     ebx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1859775393[edi*1+ebx]
+        sub     esi,            ecx
+        rol     ebx,            6
+        add     ebx,            eax
+        ; 35
+        mov     edi,            DWORD PTR 20[esp]
+        or      esi,            ebx
+        add     eax,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1859775393[esi*1+eax]
+        sub     edi,            ebx
+        rol     eax,            7
+        add     eax,            ebp
+        ; 36
+        mov     esi,            DWORD PTR 40[esp]
+        or      edi,            eax
+        add     ebp,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1859775393[edi*1+ebp]
+        sub     esi,            eax
+        rol     ebp,            14
+        add     ebp,            edx
+        ; 37
+        mov     edi,            DWORD PTR 64[esp]
+        or      esi,            ebp
+        add     edx,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1859775393[esi*1+edx]
+        sub     edi,            ebp
+        rol     edx,            9
+        add     edx,            ecx
+        ; 38
+        mov     esi,            DWORD PTR 36[esp]
+        or      edi,            edx
+        add     ecx,            esi
+        xor     edi,            eax
+        mov     esi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1859775393[edi*1+ecx]
+        sub     esi,            edx
+        rol     ecx,            13
+        add     ecx,            ebx
+        ; 39
+        mov     edi,            DWORD PTR 8[esp]
+        or      esi,            ecx
+        add     ebx,            edi
+        xor     esi,            ebp
+        mov     edi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1859775393[esi*1+ebx]
+        sub     edi,            ecx
+        rol     ebx,            15
+        add     ebx,            eax
+        ; 40
+        mov     esi,            DWORD PTR 12[esp]
+        or      edi,            ebx
+        add     eax,            esi
+        xor     edi,            edx
+        mov     esi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1859775393[edi*1+eax]
+        sub     esi,            ebx
+        rol     eax,            14
+        add     eax,            ebp
+        ; 41
+        mov     edi,            DWORD PTR 32[esp]
+        or      esi,            eax
+        add     ebp,            edi
+        xor     esi,            ecx
+        mov     edi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1859775393[esi*1+ebp]
+        sub     edi,            eax
+        rol     ebp,            8
+        add     ebp,            edx
+        ; 42
+        mov     esi,            DWORD PTR 4[esp]
+        or      edi,            ebp
+        add     edx,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1859775393[edi*1+edx]
+        sub     esi,            ebp
+        rol     edx,            13
+        add     edx,            ecx
+        ; 43
+        mov     edi,            DWORD PTR 28[esp]
+        or      esi,            edx
+        add     ecx,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1859775393[esi*1+ecx]
+        sub     edi,            edx
+        rol     ecx,            6
+        add     ecx,            ebx
+        ; 44
+        mov     esi,            DWORD PTR 56[esp]
+        or      edi,            ecx
+        add     ebx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1859775393[edi*1+ebx]
+        sub     esi,            ecx
+        rol     ebx,            5
+        add     ebx,            eax
+        ; 45
+        mov     edi,            DWORD PTR 48[esp]
+        or      esi,            ebx
+        add     eax,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1859775393[esi*1+eax]
+        sub     edi,            ebx
+        rol     eax,            12
+        add     eax,            ebp
+        ; 46
+        mov     esi,            DWORD PTR 24[esp]
+        or      edi,            eax
+        add     ebp,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1859775393[edi*1+ebp]
+        sub     esi,            eax
+        rol     ebp,            7
+        add     ebp,            edx
+        ; 47
+        mov     edi,            DWORD PTR 52[esp]
+        or      esi,            ebp
+        add     edx,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1859775393[esi*1+edx]
+        mov     esi,            eax
+        rol     edx,            5
+        add     edx,            ecx
+        ; 48
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 8[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2400959708[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        mov     esi,            ebp
+        rol     ecx,            11
+        add     ecx,            ebx
+        ; 49
+        sub     edi,            ebp
+        and     esi,            ecx
+        and     edi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 40[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2400959708[edi+ebx]
+        mov     edi,            -1
+        add     ebx,            esi
+        mov     esi,            edx
+        rol     ebx,            12
+        add     ebx,            eax
+        ; 50
+        sub     edi,            edx
+        and     esi,            ebx
+        and     edi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 48[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2400959708[edi+eax]
+        mov     edi,            -1
+        add     eax,            esi
+        mov     esi,            ecx
+        rol     eax,            14
+        add     eax,            ebp
+        ; 51
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 44[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2400959708[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        mov     esi,            ebx
+        rol     ebp,            15
+        add     ebp,            edx
+        ; 52
+        sub     edi,            ebx
+        and     esi,            ebp
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 4[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2400959708[edi+edx]
+        mov     edi,            -1
+        add     edx,            esi
+        mov     esi,            eax
+        rol     edx,            14
+        add     edx,            ecx
+        ; 53
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 36[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2400959708[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        mov     esi,            ebp
+        rol     ecx,            15
+        add     ecx,            ebx
+        ; 54
+        sub     edi,            ebp
+        and     esi,            ecx
+        and     edi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 52[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2400959708[edi+ebx]
+        mov     edi,            -1
+        add     ebx,            esi
+        mov     esi,            edx
+        rol     ebx,            9
+        add     ebx,            eax
+        ; 55
+        sub     edi,            edx
+        and     esi,            ebx
+        and     edi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 20[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2400959708[edi+eax]
+        mov     edi,            -1
+        add     eax,            esi
+        mov     esi,            ecx
+        rol     eax,            8
+        add     eax,            ebp
+        ; 56
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 56[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2400959708[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        mov     esi,            ebx
+        rol     ebp,            9
+        add     ebp,            edx
+        ; 57
+        sub     edi,            ebx
+        and     esi,            ebp
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 16[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2400959708[edi+edx]
+        mov     edi,            -1
+        add     edx,            esi
+        mov     esi,            eax
+        rol     edx,            14
+        add     edx,            ecx
+        ; 58
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 32[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2400959708[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        mov     esi,            ebp
+        rol     ecx,            5
+        add     ecx,            ebx
+        ; 59
+        sub     edi,            ebp
+        and     esi,            ecx
+        and     edi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 64[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2400959708[edi+ebx]
+        mov     edi,            -1
+        add     ebx,            esi
+        mov     esi,            edx
+        rol     ebx,            6
+        add     ebx,            eax
+        ; 60
+        sub     edi,            edx
+        and     esi,            ebx
+        and     edi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 60[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2400959708[edi+eax]
+        mov     edi,            -1
+        add     eax,            esi
+        mov     esi,            ecx
+        rol     eax,            8
+        add     eax,            ebp
+        ; 61
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 24[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2400959708[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        mov     esi,            ebx
+        rol     ebp,            6
+        add     ebp,            edx
+        ; 62
+        sub     edi,            ebx
+        and     esi,            ebp
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 28[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2400959708[edi+edx]
+        mov     edi,            -1
+        add     edx,            esi
+        mov     esi,            eax
+        rol     edx,            5
+        add     edx,            ecx
+        ; 63
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 12[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2400959708[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        sub     edi,            ebp
+        rol     ecx,            12
+        add     ecx,            ebx
+        ; 64
+        mov     esi,            DWORD PTR 20[esp]
+        or      edi,            edx
+        add     ebx,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2840853838[edi*1+ebx]
+        sub     esi,            edx
+        rol     ebx,            9
+        add     ebx,            eax
+        ; 65
+        mov     edi,            DWORD PTR 4[esp]
+        or      esi,            ecx
+        add     eax,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2840853838[esi*1+eax]
+        sub     edi,            ecx
+        rol     eax,            15
+        add     eax,            ebp
+        ; 66
+        mov     esi,            DWORD PTR 24[esp]
+        or      edi,            ebx
+        add     ebp,            esi
+        xor     edi,            eax
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2840853838[edi*1+ebp]
+        sub     esi,            ebx
+        rol     ebp,            5
+        add     ebp,            edx
+        ; 67
+        mov     edi,            DWORD PTR 40[esp]
+        or      esi,            eax
+        add     edx,            edi
+        xor     esi,            ebp
+        mov     edi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2840853838[esi*1+edx]
+        sub     edi,            eax
+        rol     edx,            11
+        add     edx,            ecx
+        ; 68
+        mov     esi,            DWORD PTR 32[esp]
+        or      edi,            ebp
+        add     ecx,            esi
+        xor     edi,            edx
+        mov     esi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2840853838[edi*1+ecx]
+        sub     esi,            ebp
+        rol     ecx,            6
+        add     ecx,            ebx
+        ; 69
+        mov     edi,            DWORD PTR 52[esp]
+        or      esi,            edx
+        add     ebx,            edi
+        xor     esi,            ecx
+        mov     edi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2840853838[esi*1+ebx]
+        sub     edi,            edx
+        rol     ebx,            8
+        add     ebx,            eax
+        ; 70
+        mov     esi,            DWORD PTR 12[esp]
+        or      edi,            ecx
+        add     eax,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2840853838[edi*1+eax]
+        sub     esi,            ecx
+        rol     eax,            13
+        add     eax,            ebp
+        ; 71
+        mov     edi,            DWORD PTR 44[esp]
+        or      esi,            ebx
+        add     ebp,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2840853838[esi*1+ebp]
+        sub     edi,            ebx
+        rol     ebp,            12
+        add     ebp,            edx
+        ; 72
+        mov     esi,            DWORD PTR 60[esp]
+        or      edi,            eax
+        add     edx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2840853838[edi*1+edx]
+        sub     esi,            eax
+        rol     edx,            5
+        add     edx,            ecx
+        ; 73
+        mov     edi,            DWORD PTR 8[esp]
+        or      esi,            ebp
+        add     ecx,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2840853838[esi*1+ecx]
+        sub     edi,            ebp
+        rol     ecx,            12
+        add     ecx,            ebx
+        ; 74
+        mov     esi,            DWORD PTR 16[esp]
+        or      edi,            edx
+        add     ebx,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2840853838[edi*1+ebx]
+        sub     esi,            edx
+        rol     ebx,            13
+        add     ebx,            eax
+        ; 75
+        mov     edi,            DWORD PTR 36[esp]
+        or      esi,            ecx
+        add     eax,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2840853838[esi*1+eax]
+        sub     edi,            ecx
+        rol     eax,            14
+        add     eax,            ebp
+        ; 76
+        mov     esi,            DWORD PTR 48[esp]
+        or      edi,            ebx
+        add     ebp,            esi
+        xor     edi,            eax
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2840853838[edi*1+ebp]
+        sub     esi,            ebx
+        rol     ebp,            11
+        add     ebp,            edx
+        ; 77
+        mov     edi,            DWORD PTR 28[esp]
+        or      esi,            eax
+        add     edx,            edi
+        xor     esi,            ebp
+        mov     edi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2840853838[esi*1+edx]
+        sub     edi,            eax
+        rol     edx,            8
+        add     edx,            ecx
+        ; 78
+        mov     esi,            DWORD PTR 64[esp]
+        or      edi,            ebp
+        add     ecx,            esi
+        xor     edi,            edx
+        mov     esi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2840853838[edi*1+ecx]
+        sub     esi,            ebp
+        rol     ecx,            5
+        add     ecx,            ebx
+        ; 79
+        mov     edi,            DWORD PTR 56[esp]
+        or      esi,            edx
+        add     ebx,            edi
+        xor     esi,            ecx
+        mov     edi,            DWORD PTR 108[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2840853838[esi*1+ebx]
+        mov     DWORD PTR 68[esp],eax
+        rol     ebx,            6
+        add     ebx,            eax
+        mov     eax,            DWORD PTR [edi]
+        mov     DWORD PTR 72[esp],ebx
+        mov     DWORD PTR 76[esp],ecx
+        mov     ebx,            DWORD PTR 4[edi]
+        mov     DWORD PTR 80[esp],edx
+        mov     ecx,            DWORD PTR 8[edi]
+        mov     DWORD PTR 84[esp],ebp
+        mov     edx,            DWORD PTR 12[edi]
+        mov     ebp,            DWORD PTR 16[edi]
+        ; 80
+        mov     edi,            -1
+        sub     edi,            edx
+        mov     esi,            DWORD PTR 24[esp]
+        or      edi,            ecx
+        add     eax,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1352829926[edi*1+eax]
+        sub     esi,            ecx
+        rol     eax,            8
+        add     eax,            ebp
+        ; 81
+        mov     edi,            DWORD PTR 60[esp]
+        or      esi,            ebx
+        add     ebp,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1352829926[esi*1+ebp]
+        sub     edi,            ebx
+        rol     ebp,            9
+        add     ebp,            edx
+        ; 82
+        mov     esi,            DWORD PTR 32[esp]
+        or      edi,            eax
+        add     edx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1352829926[edi*1+edx]
+        sub     esi,            eax
+        rol     edx,            9
+        add     edx,            ecx
+        ; 83
+        mov     edi,            DWORD PTR 4[esp]
+        or      esi,            ebp
+        add     ecx,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1352829926[esi*1+ecx]
+        sub     edi,            ebp
+        rol     ecx,            11
+        add     ecx,            ebx
+        ; 84
+        mov     esi,            DWORD PTR 40[esp]
+        or      edi,            edx
+        add     ebx,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1352829926[edi*1+ebx]
+        sub     esi,            edx
+        rol     ebx,            13
+        add     ebx,            eax
+        ; 85
+        mov     edi,            DWORD PTR 12[esp]
+        or      esi,            ecx
+        add     eax,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1352829926[esi*1+eax]
+        sub     edi,            ecx
+        rol     eax,            15
+        add     eax,            ebp
+        ; 86
+        mov     esi,            DWORD PTR 48[esp]
+        or      edi,            ebx
+        add     ebp,            esi
+        xor     edi,            eax
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1352829926[edi*1+ebp]
+        sub     esi,            ebx
+        rol     ebp,            15
+        add     ebp,            edx
+        ; 87
+        mov     edi,            DWORD PTR 20[esp]
+        or      esi,            eax
+        add     edx,            edi
+        xor     esi,            ebp
+        mov     edi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1352829926[esi*1+edx]
+        sub     edi,            eax
+        rol     edx,            5
+        add     edx,            ecx
+        ; 88
+        mov     esi,            DWORD PTR 56[esp]
+        or      edi,            ebp
+        add     ecx,            esi
+        xor     edi,            edx
+        mov     esi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1352829926[edi*1+ecx]
+        sub     esi,            ebp
+        rol     ecx,            7
+        add     ecx,            ebx
+        ; 89
+        mov     edi,            DWORD PTR 28[esp]
+        or      esi,            edx
+        add     ebx,            edi
+        xor     esi,            ecx
+        mov     edi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1352829926[esi*1+ebx]
+        sub     edi,            edx
+        rol     ebx,            7
+        add     ebx,            eax
+        ; 90
+        mov     esi,            DWORD PTR 64[esp]
+        or      edi,            ecx
+        add     eax,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1352829926[edi*1+eax]
+        sub     esi,            ecx
+        rol     eax,            8
+        add     eax,            ebp
+        ; 91
+        mov     edi,            DWORD PTR 36[esp]
+        or      esi,            ebx
+        add     ebp,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1352829926[esi*1+ebp]
+        sub     edi,            ebx
+        rol     ebp,            11
+        add     ebp,            edx
+        ; 92
+        mov     esi,            DWORD PTR 8[esp]
+        or      edi,            eax
+        add     edx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1352829926[edi*1+edx]
+        sub     esi,            eax
+        rol     edx,            14
+        add     edx,            ecx
+        ; 93
+        mov     edi,            DWORD PTR 44[esp]
+        or      esi,            ebp
+        add     ecx,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1352829926[esi*1+ecx]
+        sub     edi,            ebp
+        rol     ecx,            14
+        add     ecx,            ebx
+        ; 94
+        mov     esi,            DWORD PTR 16[esp]
+        or      edi,            edx
+        add     ebx,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1352829926[edi*1+ebx]
+        sub     esi,            edx
+        rol     ebx,            12
+        add     ebx,            eax
+        ; 95
+        mov     edi,            DWORD PTR 52[esp]
+        or      esi,            ecx
+        add     eax,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1352829926[esi*1+eax]
+        mov     esi,            ecx
+        rol     eax,            6
+        add     eax,            ebp
+        ; 96
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 28[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1548603684[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        mov     esi,            ebx
+        rol     ebp,            9
+        add     ebp,            edx
+        ; 97
+        sub     edi,            ebx
+        and     esi,            ebp
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 48[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1548603684[edi+edx]
+        mov     edi,            -1
+        add     edx,            esi
+        mov     esi,            eax
+        rol     edx,            13
+        add     edx,            ecx
+        ; 98
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 16[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1548603684[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        mov     esi,            ebp
+        rol     ecx,            15
+        add     ecx,            ebx
+        ; 99
+        sub     edi,            ebp
+        and     esi,            ecx
+        and     edi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 32[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1548603684[edi+ebx]
+        mov     edi,            -1
+        add     ebx,            esi
+        mov     esi,            edx
+        rol     ebx,            7
+        add     ebx,            eax
+        ; 100
+        sub     edi,            edx
+        and     esi,            ebx
+        and     edi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 4[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1548603684[edi+eax]
+        mov     edi,            -1
+        add     eax,            esi
+        mov     esi,            ecx
+        rol     eax,            12
+        add     eax,            ebp
+        ; 101
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 56[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1548603684[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        mov     esi,            ebx
+        rol     ebp,            8
+        add     ebp,            edx
+        ; 102
+        sub     edi,            ebx
+        and     esi,            ebp
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 24[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1548603684[edi+edx]
+        mov     edi,            -1
+        add     edx,            esi
+        mov     esi,            eax
+        rol     edx,            9
+        add     edx,            ecx
+        ; 103
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 44[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1548603684[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        mov     esi,            ebp
+        rol     ecx,            11
+        add     ecx,            ebx
+        ; 104
+        sub     edi,            ebp
+        and     esi,            ecx
+        and     edi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 60[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1548603684[edi+ebx]
+        mov     edi,            -1
+        add     ebx,            esi
+        mov     esi,            edx
+        rol     ebx,            7
+        add     ebx,            eax
+        ; 105
+        sub     edi,            edx
+        and     esi,            ebx
+        and     edi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 64[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1548603684[edi+eax]
+        mov     edi,            -1
+        add     eax,            esi
+        mov     esi,            ecx
+        rol     eax,            7
+        add     eax,            ebp
+        ; 106
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 36[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1548603684[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        mov     esi,            ebx
+        rol     ebp,            12
+        add     ebp,            edx
+        ; 107
+        sub     edi,            ebx
+        and     esi,            ebp
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 52[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1548603684[edi+edx]
+        mov     edi,            -1
+        add     edx,            esi
+        mov     esi,            eax
+        rol     edx,            7
+        add     edx,            ecx
+        ; 108
+        sub     edi,            eax
+        and     esi,            edx
+        and     edi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 20[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1548603684[edi+ecx]
+        mov     edi,            -1
+        add     ecx,            esi
+        mov     esi,            ebp
+        rol     ecx,            6
+        add     ecx,            ebx
+        ; 109
+        sub     edi,            ebp
+        and     esi,            ecx
+        and     edi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 40[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1548603684[edi+ebx]
+        mov     edi,            -1
+        add     ebx,            esi
+        mov     esi,            edx
+        rol     ebx,            15
+        add     ebx,            eax
+        ; 110
+        sub     edi,            edx
+        and     esi,            ebx
+        and     edi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 8[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1548603684[edi+eax]
+        mov     edi,            -1
+        add     eax,            esi
+        mov     esi,            ecx
+        rol     eax,            13
+        add     eax,            ebp
+        ; 111
+        sub     edi,            ecx
+        and     esi,            eax
+        and     edi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 12[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1548603684[edi+ebp]
+        mov     edi,            -1
+        add     ebp,            esi
+        sub     edi,            eax
+        rol     ebp,            11
+        add     ebp,            edx
+        ; 112
+        mov     esi,            DWORD PTR 64[esp]
+        or      edi,            ebp
+        add     edx,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1836072691[edi*1+edx]
+        sub     esi,            ebp
+        rol     edx,            9
+        add     edx,            ecx
+        ; 113
+        mov     edi,            DWORD PTR 24[esp]
+        or      esi,            edx
+        add     ecx,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1836072691[esi*1+ecx]
+        sub     edi,            edx
+        rol     ecx,            7
+        add     ecx,            ebx
+        ; 114
+        mov     esi,            DWORD PTR 8[esp]
+        or      edi,            ecx
+        add     ebx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1836072691[edi*1+ebx]
+        sub     esi,            ecx
+        rol     ebx,            15
+        add     ebx,            eax
+        ; 115
+        mov     edi,            DWORD PTR 16[esp]
+        or      esi,            ebx
+        add     eax,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1836072691[esi*1+eax]
+        sub     edi,            ebx
+        rol     eax,            11
+        add     eax,            ebp
+        ; 116
+        mov     esi,            DWORD PTR 32[esp]
+        or      edi,            eax
+        add     ebp,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1836072691[edi*1+ebp]
+        sub     esi,            eax
+        rol     ebp,            8
+        add     ebp,            edx
+        ; 117
+        mov     edi,            DWORD PTR 60[esp]
+        or      esi,            ebp
+        add     edx,            edi
+        xor     esi,            ebx
+        mov     edi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1836072691[esi*1+edx]
+        sub     edi,            ebp
+        rol     edx,            6
+        add     edx,            ecx
+        ; 118
+        mov     esi,            DWORD PTR 28[esp]
+        or      edi,            edx
+        add     ecx,            esi
+        xor     edi,            eax
+        mov     esi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1836072691[edi*1+ecx]
+        sub     esi,            edx
+        rol     ecx,            6
+        add     ecx,            ebx
+        ; 119
+        mov     edi,            DWORD PTR 40[esp]
+        or      esi,            ecx
+        add     ebx,            edi
+        xor     esi,            ebp
+        mov     edi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1836072691[esi*1+ebx]
+        sub     edi,            ecx
+        rol     ebx,            14
+        add     ebx,            eax
+        ; 120
+        mov     esi,            DWORD PTR 48[esp]
+        or      edi,            ebx
+        add     eax,            esi
+        xor     edi,            edx
+        mov     esi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1836072691[edi*1+eax]
+        sub     esi,            ebx
+        rol     eax,            12
+        add     eax,            ebp
+        ; 121
+        mov     edi,            DWORD PTR 36[esp]
+        or      esi,            eax
+        add     ebp,            edi
+        xor     esi,            ecx
+        mov     edi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1836072691[esi*1+ebp]
+        sub     edi,            eax
+        rol     ebp,            13
+        add     ebp,            edx
+        ; 122
+        mov     esi,            DWORD PTR 52[esp]
+        or      edi,            ebp
+        add     edx,            esi
+        xor     edi,            ebx
+        mov     esi,            -1
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1836072691[edi*1+edx]
+        sub     esi,            ebp
+        rol     edx,            5
+        add     edx,            ecx
+        ; 123
+        mov     edi,            DWORD PTR 12[esp]
+        or      esi,            edx
+        add     ecx,            edi
+        xor     esi,            eax
+        mov     edi,            -1
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 1836072691[esi*1+ecx]
+        sub     edi,            edx
+        rol     ecx,            14
+        add     ecx,            ebx
+        ; 124
+        mov     esi,            DWORD PTR 44[esp]
+        or      edi,            ecx
+        add     ebx,            esi
+        xor     edi,            ebp
+        mov     esi,            -1
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 1836072691[edi*1+ebx]
+        sub     esi,            ecx
+        rol     ebx,            13
+        add     ebx,            eax
+        ; 125
+        mov     edi,            DWORD PTR 4[esp]
+        or      esi,            ebx
+        add     eax,            edi
+        xor     esi,            edx
+        mov     edi,            -1
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 1836072691[esi*1+eax]
+        sub     edi,            ebx
+        rol     eax,            13
+        add     eax,            ebp
+        ; 126
+        mov     esi,            DWORD PTR 20[esp]
+        or      edi,            eax
+        add     ebp,            esi
+        xor     edi,            ecx
+        mov     esi,            -1
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 1836072691[edi*1+ebp]
+        sub     esi,            eax
+        rol     ebp,            7
+        add     ebp,            edx
+        ; 127
+        mov     edi,            DWORD PTR 56[esp]
+        or      esi,            ebp
+        add     edx,            edi
+        xor     esi,            ebx
+        mov     edi,            DWORD PTR 36[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 1836072691[esi*1+edx]
+        mov     esi,            -1
+        rol     edx,            5
+        add     edx,            ecx
+        ; 128
+        add     ecx,            edi
+        mov     edi,            ebp
+        sub     esi,            edx
+        and     edi,            edx
+        and     esi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 28[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2053994217[edi*1+ecx]
+        mov     edi,            -1
+        rol     ecx,            15
+        add     ecx,            ebx
+        ; 129
+        add     ebx,            esi
+        mov     esi,            edx
+        sub     edi,            ecx
+        and     esi,            ecx
+        and     edi,            ebp
+        or      esi,            edi
+        mov     edi,            DWORD PTR 20[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2053994217[esi*1+ebx]
+        mov     esi,            -1
+        rol     ebx,            5
+        add     ebx,            eax
+        ; 130
+        add     eax,            edi
+        mov     edi,            ecx
+        sub     esi,            ebx
+        and     edi,            ebx
+        and     esi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 8[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2053994217[edi*1+eax]
+        mov     edi,            -1
+        rol     eax,            8
+        add     eax,            ebp
+        ; 131
+        add     ebp,            esi
+        mov     esi,            ebx
+        sub     edi,            eax
+        and     esi,            eax
+        and     edi,            ecx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 16[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2053994217[esi*1+ebp]
+        mov     esi,            -1
+        rol     ebp,            11
+        add     ebp,            edx
+        ; 132
+        add     edx,            edi
+        mov     edi,            eax
+        sub     esi,            ebp
+        and     edi,            ebp
+        and     esi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 48[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2053994217[edi*1+edx]
+        mov     edi,            -1
+        rol     edx,            14
+        add     edx,            ecx
+        ; 133
+        add     ecx,            esi
+        mov     esi,            ebp
+        sub     edi,            edx
+        and     esi,            edx
+        and     edi,            eax
+        or      esi,            edi
+        mov     edi,            DWORD PTR 64[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2053994217[esi*1+ecx]
+        mov     esi,            -1
+        rol     ecx,            14
+        add     ecx,            ebx
+        ; 134
+        add     ebx,            edi
+        mov     edi,            edx
+        sub     esi,            ecx
+        and     edi,            ecx
+        and     esi,            ebp
+        or      edi,            esi
+        mov     esi,            DWORD PTR 4[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2053994217[edi*1+ebx]
+        mov     edi,            -1
+        rol     ebx,            6
+        add     ebx,            eax
+        ; 135
+        add     eax,            esi
+        mov     esi,            ecx
+        sub     edi,            ebx
+        and     esi,            ebx
+        and     edi,            edx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 24[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2053994217[esi*1+eax]
+        mov     esi,            -1
+        rol     eax,            14
+        add     eax,            ebp
+        ; 136
+        add     ebp,            edi
+        mov     edi,            ebx
+        sub     esi,            eax
+        and     edi,            eax
+        and     esi,            ecx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 52[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2053994217[edi*1+ebp]
+        mov     edi,            -1
+        rol     ebp,            6
+        add     ebp,            edx
+        ; 137
+        add     edx,            esi
+        mov     esi,            eax
+        sub     edi,            ebp
+        and     esi,            ebp
+        and     edi,            ebx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 12[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2053994217[esi*1+edx]
+        mov     esi,            -1
+        rol     edx,            9
+        add     edx,            ecx
+        ; 138
+        add     ecx,            edi
+        mov     edi,            ebp
+        sub     esi,            edx
+        and     edi,            edx
+        and     esi,            eax
+        or      edi,            esi
+        mov     esi,            DWORD PTR 56[esp]
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2053994217[edi*1+ecx]
+        mov     edi,            -1
+        rol     ecx,            12
+        add     ecx,            ebx
+        ; 139
+        add     ebx,            esi
+        mov     esi,            edx
+        sub     edi,            ecx
+        and     esi,            ecx
+        and     edi,            ebp
+        or      esi,            edi
+        mov     edi,            DWORD PTR 40[esp]
+        rol     edx,            10
+        lea     ebx,            DWORD PTR 2053994217[esi*1+ebx]
+        mov     esi,            -1
+        rol     ebx,            9
+        add     ebx,            eax
+        ; 140
+        add     eax,            edi
+        mov     edi,            ecx
+        sub     esi,            ebx
+        and     edi,            ebx
+        and     esi,            edx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 32[esp]
+        rol     ecx,            10
+        lea     eax,            DWORD PTR 2053994217[edi*1+eax]
+        mov     edi,            -1
+        rol     eax,            12
+        add     eax,            ebp
+        ; 141
+        add     ebp,            esi
+        mov     esi,            ebx
+        sub     edi,            eax
+        and     esi,            eax
+        and     edi,            ecx
+        or      esi,            edi
+        mov     edi,            DWORD PTR 44[esp]
+        rol     ebx,            10
+        lea     ebp,            DWORD PTR 2053994217[esi*1+ebp]
+        mov     esi,            -1
+        rol     ebp,            5
+        add     ebp,            edx
+        ; 142
+        add     edx,            edi
+        mov     edi,            eax
+        sub     esi,            ebp
+        and     edi,            ebp
+        and     esi,            ebx
+        or      edi,            esi
+        mov     esi,            DWORD PTR 60[esp]
+        rol     eax,            10
+        lea     edx,            DWORD PTR 2053994217[edi*1+edx]
+        mov     edi,            -1
+        rol     edx,            15
+        add     edx,            ecx
+        ; 143
+        add     ecx,            esi
+        mov     esi,            ebp
+        sub     edi,            edx
+        and     esi,            edx
+        and     edi,            eax
+        or      edi,            esi
+        mov     esi,            edx
+        rol     ebp,            10
+        lea     ecx,            DWORD PTR 2053994217[edi*1+ecx]
+        xor     esi,            ebp
+        rol     ecx,            8
+        add     ecx,            ebx
+        ; 144
+        mov     edi,            DWORD PTR 52[esp]
+        xor     esi,            ecx
+        add     ebx,            edi
+        rol     edx,            10
+        add     ebx,            esi
+        mov     esi,            ecx
+        rol     ebx,            8
+        add     ebx,            eax
+        ; 145
+        xor     esi,            edx
+        mov     edi,            DWORD PTR 64[esp]
+        xor     esi,            ebx
+        add     eax,            esi
+        mov     esi,            ebx
+        rol     ecx,            10
+        add     eax,            edi
+        xor     esi,            ecx
+        rol     eax,            5
+        add     eax,            ebp
+        ; 146
+        mov     edi,            DWORD PTR 44[esp]
+        xor     esi,            eax
+        add     ebp,            edi
+        rol     ebx,            10
+        add     ebp,            esi
+        mov     esi,            eax
+        rol     ebp,            12
+        add     ebp,            edx
+        ; 147
+        xor     esi,            ebx
+        mov     edi,            DWORD PTR 20[esp]
+        xor     esi,            ebp
+        add     edx,            esi
+        mov     esi,            ebp
+        rol     eax,            10
+        add     edx,            edi
+        xor     esi,            eax
+        rol     edx,            9
+        add     edx,            ecx
+        ; 148
+        mov     edi,            DWORD PTR 8[esp]
+        xor     esi,            edx
+        add     ecx,            edi
+        rol     ebp,            10
+        add     ecx,            esi
+        mov     esi,            edx
+        rol     ecx,            12
+        add     ecx,            ebx
+        ; 149
+        xor     esi,            ebp
+        mov     edi,            DWORD PTR 24[esp]
+        xor     esi,            ecx
+        add     ebx,            esi
+        mov     esi,            ecx
+        rol     edx,            10
+        add     ebx,            edi
+        xor     esi,            edx
+        rol     ebx,            5
+        add     ebx,            eax
+        ; 150
+        mov     edi,            DWORD PTR 36[esp]
+        xor     esi,            ebx
+        add     eax,            edi
+        rol     ecx,            10
+        add     eax,            esi
+        mov     esi,            ebx
+        rol     eax,            14
+        add     eax,            ebp
+        ; 151
+        xor     esi,            ecx
+        mov     edi,            DWORD PTR 32[esp]
+        xor     esi,            eax
+        add     ebp,            esi
+        mov     esi,            eax
+        rol     ebx,            10
+        add     ebp,            edi
+        xor     esi,            ebx
+        rol     ebp,            6
+        add     ebp,            edx
+        ; 152
+        mov     edi,            DWORD PTR 28[esp]
+        xor     esi,            ebp
+        add     edx,            edi
+        rol     eax,            10
+        add     edx,            esi
+        mov     esi,            ebp
+        rol     edx,            8
+        add     edx,            ecx
+        ; 153
+        xor     esi,            eax
+        mov     edi,            DWORD PTR 12[esp]
+        xor     esi,            edx
+        add     ecx,            esi
+        mov     esi,            edx
+        rol     ebp,            10
+        add     ecx,            edi
+        xor     esi,            ebp
+        rol     ecx,            13
+        add     ecx,            ebx
+        ; 154
+        mov     edi,            DWORD PTR 56[esp]
+        xor     esi,            ecx
+        add     ebx,            edi
+        rol     edx,            10
+        add     ebx,            esi
+        mov     esi,            ecx
+        rol     ebx,            6
+        add     ebx,            eax
+        ; 155
+        xor     esi,            edx
+        mov     edi,            DWORD PTR 60[esp]
+        xor     esi,            ebx
+        add     eax,            esi
+        mov     esi,            ebx
+        rol     ecx,            10
+        add     eax,            edi
+        xor     esi,            ecx
+        rol     eax,            5
+        add     eax,            ebp
+        ; 156
+        mov     edi,            DWORD PTR 4[esp]
+        xor     esi,            eax
+        add     ebp,            edi
+        rol     ebx,            10
+        add     ebp,            esi
+        mov     esi,            eax
+        rol     ebp,            15
+        add     ebp,            edx
+        ; 157
+        xor     esi,            ebx
+        mov     edi,            DWORD PTR 16[esp]
+        xor     esi,            ebp
+        add     edx,            esi
+        mov     esi,            ebp
+        rol     eax,            10
+        add     edx,            edi
+        xor     esi,            eax
+        rol     edx,            13
+        add     edx,            ecx
+        ; 158
+        mov     edi,            DWORD PTR 40[esp]
+        xor     esi,            edx
+        add     ecx,            edi
+        rol     ebp,            10
+        add     ecx,            esi
+        mov     esi,            edx
+        rol     ecx,            11
+        add     ecx,            ebx
+        ; 159
+        xor     esi,            ebp
+        mov     edi,            DWORD PTR 48[esp]
+        xor     esi,            ecx
+        add     ebx,            esi
+        rol     edx,            10
+        add     ebx,            edi
+        mov     edi,            DWORD PTR 108[esp]
+        rol     ebx,            11
+        add     ebx,            eax
+        mov     esi,            DWORD PTR 4[edi]
+        add     edx,            esi
+        mov     esi,            DWORD PTR 76[esp]
+        add     edx,            esi
+        mov     esi,            DWORD PTR 8[edi]
+        add     ebp,            esi
+        mov     esi,            DWORD PTR 80[esp]
+        add     ebp,            esi
+        mov     esi,            DWORD PTR 12[edi]
+        add     eax,            esi
+        mov     esi,            DWORD PTR 84[esp]
+        add     eax,            esi
+        mov     esi,            DWORD PTR 16[edi]
+        add     ebx,            esi
+        mov     esi,            DWORD PTR 68[esp]
+        add     ebx,            esi
+        mov     esi,            DWORD PTR [edi]
+        add     ecx,            esi
+        mov     esi,            DWORD PTR 72[esp]
+        add     ecx,            esi
+        mov     DWORD PTR [edi],edx
+        mov     DWORD PTR 4[edi],ebp
+        mov     DWORD PTR 8[edi],eax
+        mov     DWORD PTR 12[edi],ebx
+        mov     DWORD PTR 16[edi],ecx
+        mov     edi,            DWORD PTR [esp]
+        mov     esi,            DWORD PTR 112[esp]
+        cmp     edi,            esi
+        mov     edi,            DWORD PTR 108[esp]
+        jge     L000start
+        add     esp,            88
+        pop     ebx
+        pop     ebp
+        pop     edi
+        pop     esi
+        ret
+_ripemd160_block_x86 ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/ripemd/asm/rm86unix.cpp b/src/lib/libcrypto/ripemd/asm/rm86unix.cpp
new file mode 100644
index 0000000000..f90f6f2fd6
--- /dev/null
+++ b/src/lib/libcrypto/ripemd/asm/rm86unix.cpp
@@ -0,0 +1,2016 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define ripemd160_block_x86 _ripemd160_block_x86
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by rmd-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "rmd-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl ripemd160_block_x86
+        TYPE(ripemd160_block_x86,@function)
+ripemd160_block_x86:
+        pushl   %esi
+        movl    16(%esp),       %ecx
+        pushl   %edi
+        movl    16(%esp),       %esi
+        pushl   %ebp
+        addl    %esi,           %ecx
+        pushl   %ebx
+        subl    $64,            %ecx
+        subl    $88,            %esp
+        movl    %ecx,           (%esp)
+        movl    108(%esp),      %edi
+.L000start:
+
+        movl    (%esi),         %eax
+        movl    4(%esi),        %ebx
+        movl    %eax,           4(%esp)
+        movl    %ebx,           8(%esp)
+        movl    8(%esi),        %eax
+        movl    12(%esi),       %ebx
+        movl    %eax,           12(%esp)
+        movl    %ebx,           16(%esp)
+        movl    16(%esi),       %eax
+        movl    20(%esi),       %ebx
+        movl    %eax,           20(%esp)
+        movl    %ebx,           24(%esp)
+        movl    24(%esi),       %eax
+        movl    28(%esi),       %ebx
+        movl    %eax,           28(%esp)
+        movl    %ebx,           32(%esp)
+        movl    32(%esi),       %eax
+        movl    36(%esi),       %ebx
+        movl    %eax,           36(%esp)
+        movl    %ebx,           40(%esp)
+        movl    40(%esi),       %eax
+        movl    44(%esi),       %ebx
+        movl    %eax,           44(%esp)
+        movl    %ebx,           48(%esp)
+        movl    48(%esi),       %eax
+        movl    52(%esi),       %ebx
+        movl    %eax,           52(%esp)
+        movl    %ebx,           56(%esp)
+        movl    56(%esi),       %eax
+        movl    60(%esi),       %ebx
+        movl    %eax,           60(%esp)
+        movl    %ebx,           64(%esp)
+        addl    $64,            %esi
+        movl    (%edi),         %eax
+        movl    %esi,           112(%esp)
+        movl    4(%edi),        %ebx
+        movl    8(%edi),        %ecx
+        movl    12(%edi),       %edx
+        movl    16(%edi),       %ebp
+        /* 0 */
+        movl    %ecx,           %esi
+        xorl    %edx,           %esi
+        movl    4(%esp),        %edi
+        xorl    %ebx,           %esi
+        addl    %edi,           %eax
+        roll    $10,            %ecx
+        addl    %esi,           %eax
+        movl    %ebx,           %esi
+        roll    $11,            %eax
+        addl    %ebp,           %eax
+        /* 1 */
+        xorl    %ecx,           %esi
+        movl    8(%esp),        %edi
+        xorl    %eax,           %esi
+        addl    %esi,           %ebp
+        movl    %eax,           %esi
+        roll    $10,            %ebx
+        addl    %edi,           %ebp
+        xorl    %ebx,           %esi
+        roll    $14,            %ebp
+        addl    %edx,           %ebp
+        /* 2 */
+        movl    12(%esp),       %edi
+        xorl    %ebp,           %esi
+        addl    %edi,           %edx
+        roll    $10,            %eax
+        addl    %esi,           %edx
+        movl    %ebp,           %esi
+        roll    $15,            %edx
+        addl    %ecx,           %edx
+        /* 3 */
+        xorl    %eax,           %esi
+        movl    16(%esp),       %edi
+        xorl    %edx,           %esi
+        addl    %esi,           %ecx
+        movl    %edx,           %esi
+        roll    $10,            %ebp
+        addl    %edi,           %ecx
+        xorl    %ebp,           %esi
+        roll    $12,            %ecx
+        addl    %ebx,           %ecx
+        /* 4 */
+        movl    20(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %edi,           %ebx
+        roll    $10,            %edx
+        addl    %esi,           %ebx
+        movl    %ecx,           %esi
+        roll    $5,             %ebx
+        addl    %eax,           %ebx
+        /* 5 */
+        xorl    %edx,           %esi
+        movl    24(%esp),       %edi
+        xorl    %ebx,           %esi
+        addl    %esi,           %eax
+        movl    %ebx,           %esi
+        roll    $10,            %ecx
+        addl    %edi,           %eax
+        xorl    %ecx,           %esi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 6 */
+        movl    28(%esp),       %edi
+        xorl    %eax,           %esi
+        addl    %edi,           %ebp
+        roll    $10,            %ebx
+        addl    %esi,           %ebp
+        movl    %eax,           %esi
+        roll    $7,             %ebp
+        addl    %edx,           %ebp
+        /* 7 */
+        xorl    %ebx,           %esi
+        movl    32(%esp),       %edi
+        xorl    %ebp,           %esi
+        addl    %esi,           %edx
+        movl    %ebp,           %esi
+        roll    $10,            %eax
+        addl    %edi,           %edx
+        xorl    %eax,           %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 8 */
+        movl    36(%esp),       %edi
+        xorl    %edx,           %esi
+        addl    %edi,           %ecx
+        roll    $10,            %ebp
+        addl    %esi,           %ecx
+        movl    %edx,           %esi
+        roll    $11,            %ecx
+        addl    %ebx,           %ecx
+        /* 9 */
+        xorl    %ebp,           %esi
+        movl    40(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %esi,           %ebx
+        movl    %ecx,           %esi
+        roll    $10,            %edx
+        addl    %edi,           %ebx
+        xorl    %edx,           %esi
+        roll    $13,            %ebx
+        addl    %eax,           %ebx
+        /* 10 */
+        movl    44(%esp),       %edi
+        xorl    %ebx,           %esi
+        addl    %edi,           %eax
+        roll    $10,            %ecx
+        addl    %esi,           %eax
+        movl    %ebx,           %esi
+        roll    $14,            %eax
+        addl    %ebp,           %eax
+        /* 11 */
+        xorl    %ecx,           %esi
+        movl    48(%esp),       %edi
+        xorl    %eax,           %esi
+        addl    %esi,           %ebp
+        movl    %eax,           %esi
+        roll    $10,            %ebx
+        addl    %edi,           %ebp
+        xorl    %ebx,           %esi
+        roll    $15,            %ebp
+        addl    %edx,           %ebp
+        /* 12 */
+        movl    52(%esp),       %edi
+        xorl    %ebp,           %esi
+        addl    %edi,           %edx
+        roll    $10,            %eax
+        addl    %esi,           %edx
+        movl    %ebp,           %esi
+        roll    $6,             %edx
+        addl    %ecx,           %edx
+        /* 13 */
+        xorl    %eax,           %esi
+        movl    56(%esp),       %edi
+        xorl    %edx,           %esi
+        addl    %esi,           %ecx
+        movl    %edx,           %esi
+        roll    $10,            %ebp
+        addl    %edi,           %ecx
+        xorl    %ebp,           %esi
+        roll    $7,             %ecx
+        addl    %ebx,           %ecx
+        /* 14 */
+        movl    60(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %edi,           %ebx
+        roll    $10,            %edx
+        addl    %esi,           %ebx
+        movl    %ecx,           %esi
+        roll    $9,             %ebx
+        addl    %eax,           %ebx
+        /* 15 */
+        xorl    %edx,           %esi
+        movl    64(%esp),       %edi
+        xorl    %ebx,           %esi
+        addl    %esi,           %eax
+        movl    $-1,            %esi
+        roll    $10,            %ecx
+        addl    %edi,           %eax
+        movl    32(%esp),       %edi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 16 */
+        addl    %edi,           %ebp
+        movl    %ebx,           %edi
+        subl    %eax,           %esi
+        andl    %eax,           %edi
+        andl    %ecx,           %esi
+        orl     %esi,           %edi
+        movl    20(%esp),       %esi
+        roll    $10,            %ebx
+        leal    1518500249(%ebp,%edi,1),%ebp
+        movl    $-1,            %edi
+        roll    $7,             %ebp
+        addl    %edx,           %ebp
+        /* 17 */
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        subl    %ebp,           %edi
+        andl    %ebp,           %esi
+        andl    %ebx,           %edi
+        orl     %edi,           %esi
+        movl    56(%esp),       %edi
+        roll    $10,            %eax
+        leal    1518500249(%edx,%esi,1),%edx
+        movl    $-1,            %esi
+        roll    $6,             %edx
+        addl    %ecx,           %edx
+        /* 18 */
+        addl    %edi,           %ecx
+        movl    %ebp,           %edi
+        subl    %edx,           %esi
+        andl    %edx,           %edi
+        andl    %eax,           %esi
+        orl     %esi,           %edi
+        movl    8(%esp),        %esi
+        roll    $10,            %ebp
+        leal    1518500249(%ecx,%edi,1),%ecx
+        movl    $-1,            %edi
+        roll    $8,             %ecx
+        addl    %ebx,           %ecx
+        /* 19 */
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        subl    %ecx,           %edi
+        andl    %ecx,           %esi
+        andl    %ebp,           %edi
+        orl     %edi,           %esi
+        movl    44(%esp),       %edi
+        roll    $10,            %edx
+        leal    1518500249(%ebx,%esi,1),%ebx
+        movl    $-1,            %esi
+        roll    $13,            %ebx
+        addl    %eax,           %ebx
+        /* 20 */
+        addl    %edi,           %eax
+        movl    %ecx,           %edi
+        subl    %ebx,           %esi
+        andl    %ebx,           %edi
+        andl    %edx,           %esi
+        orl     %esi,           %edi
+        movl    28(%esp),       %esi
+        roll    $10,            %ecx
+        leal    1518500249(%eax,%edi,1),%eax
+        movl    $-1,            %edi
+        roll    $11,            %eax
+        addl    %ebp,           %eax
+        /* 21 */
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        subl    %eax,           %edi
+        andl    %eax,           %esi
+        andl    %ecx,           %edi
+        orl     %edi,           %esi
+        movl    64(%esp),       %edi
+        roll    $10,            %ebx
+        leal    1518500249(%ebp,%esi,1),%ebp
+        movl    $-1,            %esi
+        roll    $9,             %ebp
+        addl    %edx,           %ebp
+        /* 22 */
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        subl    %ebp,           %esi
+        andl    %ebp,           %edi
+        andl    %ebx,           %esi
+        orl     %esi,           %edi
+        movl    16(%esp),       %esi
+        roll    $10,            %eax
+        leal    1518500249(%edx,%edi,1),%edx
+        movl    $-1,            %edi
+        roll    $7,             %edx
+        addl    %ecx,           %edx
+        /* 23 */
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        subl    %edx,           %edi
+        andl    %edx,           %esi
+        andl    %eax,           %edi
+        orl     %edi,           %esi
+        movl    52(%esp),       %edi
+        roll    $10,            %ebp
+        leal    1518500249(%ecx,%esi,1),%ecx
+        movl    $-1,            %esi
+        roll    $15,            %ecx
+        addl    %ebx,           %ecx
+        /* 24 */
+        addl    %edi,           %ebx
+        movl    %edx,           %edi
+        subl    %ecx,           %esi
+        andl    %ecx,           %edi
+        andl    %ebp,           %esi
+        orl     %esi,           %edi
+        movl    4(%esp),        %esi
+        roll    $10,            %edx
+        leal    1518500249(%ebx,%edi,1),%ebx
+        movl    $-1,            %edi
+        roll    $7,             %ebx
+        addl    %eax,           %ebx
+        /* 25 */
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        subl    %ebx,           %edi
+        andl    %ebx,           %esi
+        andl    %edx,           %edi
+        orl     %edi,           %esi
+        movl    40(%esp),       %edi
+        roll    $10,            %ecx
+        leal    1518500249(%eax,%esi,1),%eax
+        movl    $-1,            %esi
+        roll    $12,            %eax
+        addl    %ebp,           %eax
+        /* 26 */
+        addl    %edi,           %ebp
+        movl    %ebx,           %edi
+        subl    %eax,           %esi
+        andl    %eax,           %edi
+        andl    %ecx,           %esi
+        orl     %esi,           %edi
+        movl    24(%esp),       %esi
+        roll    $10,            %ebx
+        leal    1518500249(%ebp,%edi,1),%ebp
+        movl    $-1,            %edi
+        roll    $15,            %ebp
+        addl    %edx,           %ebp
+        /* 27 */
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        subl    %ebp,           %edi
+        andl    %ebp,           %esi
+        andl    %ebx,           %edi
+        orl     %edi,           %esi
+        movl    12(%esp),       %edi
+        roll    $10,            %eax
+        leal    1518500249(%edx,%esi,1),%edx
+        movl    $-1,            %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 28 */
+        addl    %edi,           %ecx
+        movl    %ebp,           %edi
+        subl    %edx,           %esi
+        andl    %edx,           %edi
+        andl    %eax,           %esi
+        orl     %esi,           %edi
+        movl    60(%esp),       %esi
+        roll    $10,            %ebp
+        leal    1518500249(%ecx,%edi,1),%ecx
+        movl    $-1,            %edi
+        roll    $11,            %ecx
+        addl    %ebx,           %ecx
+        /* 29 */
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        subl    %ecx,           %edi
+        andl    %ecx,           %esi
+        andl    %ebp,           %edi
+        orl     %edi,           %esi
+        movl    48(%esp),       %edi
+        roll    $10,            %edx
+        leal    1518500249(%ebx,%esi,1),%ebx
+        movl    $-1,            %esi
+        roll    $7,             %ebx
+        addl    %eax,           %ebx
+        /* 30 */
+        addl    %edi,           %eax
+        movl    %ecx,           %edi
+        subl    %ebx,           %esi
+        andl    %ebx,           %edi
+        andl    %edx,           %esi
+        orl     %esi,           %edi
+        movl    36(%esp),       %esi
+        roll    $10,            %ecx
+        leal    1518500249(%eax,%edi,1),%eax
+        movl    $-1,            %edi
+        roll    $13,            %eax
+        addl    %ebp,           %eax
+        /* 31 */
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        subl    %eax,           %edi
+        andl    %eax,           %esi
+        andl    %ecx,           %edi
+        orl     %edi,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebx
+        leal    1518500249(%ebp,%esi,1),%ebp
+        subl    %eax,           %edi
+        roll    $12,            %ebp
+        addl    %edx,           %ebp
+        /* 32 */
+        movl    16(%esp),       %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %edx
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    1859775393(%edx,%edi,1),%edx
+        subl    %ebp,           %esi
+        roll    $11,            %edx
+        addl    %ecx,           %edx
+        /* 33 */
+        movl    44(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ecx
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    1859775393(%ecx,%esi,1),%ecx
+        subl    %edx,           %edi
+        roll    $13,            %ecx
+        addl    %ebx,           %ecx
+        /* 34 */
+        movl    60(%esp),       %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    1859775393(%ebx,%edi,1),%ebx
+        subl    %ecx,           %esi
+        roll    $6,             %ebx
+        addl    %eax,           %ebx
+        /* 35 */
+        movl    20(%esp),       %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %eax
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    1859775393(%eax,%esi,1),%eax
+        subl    %ebx,           %edi
+        roll    $7,             %eax
+        addl    %ebp,           %eax
+        /* 36 */
+        movl    40(%esp),       %esi
+        orl     %eax,           %edi
+        addl    %esi,           %ebp
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    1859775393(%ebp,%edi,1),%ebp
+        subl    %eax,           %esi
+        roll    $14,            %ebp
+        addl    %edx,           %ebp
+        /* 37 */
+        movl    64(%esp),       %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %edx
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %eax
+        leal    1859775393(%edx,%esi,1),%edx
+        subl    %ebp,           %edi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 38 */
+        movl    36(%esp),       %esi
+        orl     %edx,           %edi
+        addl    %esi,           %ecx
+        xorl    %eax,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebp
+        leal    1859775393(%ecx,%edi,1),%ecx
+        subl    %edx,           %esi
+        roll    $13,            %ecx
+        addl    %ebx,           %ecx
+        /* 39 */
+        movl    8(%esp),        %edi
+        orl     %ecx,           %esi
+        addl    %edi,           %ebx
+        xorl    %ebp,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        leal    1859775393(%ebx,%esi,1),%ebx
+        subl    %ecx,           %edi
+        roll    $15,            %ebx
+        addl    %eax,           %ebx
+        /* 40 */
+        movl    12(%esp),       %esi
+        orl     %ebx,           %edi
+        addl    %esi,           %eax
+        xorl    %edx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ecx
+        leal    1859775393(%eax,%edi,1),%eax
+        subl    %ebx,           %esi
+        roll    $14,            %eax
+        addl    %ebp,           %eax
+        /* 41 */
+        movl    32(%esp),       %edi
+        orl     %eax,           %esi
+        addl    %edi,           %ebp
+        xorl    %ecx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebx
+        leal    1859775393(%ebp,%esi,1),%ebp
+        subl    %eax,           %edi
+        roll    $8,             %ebp
+        addl    %edx,           %ebp
+        /* 42 */
+        movl    4(%esp),        %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %edx
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    1859775393(%edx,%edi,1),%edx
+        subl    %ebp,           %esi
+        roll    $13,            %edx
+        addl    %ecx,           %edx
+        /* 43 */
+        movl    28(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ecx
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    1859775393(%ecx,%esi,1),%ecx
+        subl    %edx,           %edi
+        roll    $6,             %ecx
+        addl    %ebx,           %ecx
+        /* 44 */
+        movl    56(%esp),       %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    1859775393(%ebx,%edi,1),%ebx
+        subl    %ecx,           %esi
+        roll    $5,             %ebx
+        addl    %eax,           %ebx
+        /* 45 */
+        movl    48(%esp),       %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %eax
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    1859775393(%eax,%esi,1),%eax
+        subl    %ebx,           %edi
+        roll    $12,            %eax
+        addl    %ebp,           %eax
+        /* 46 */
+        movl    24(%esp),       %esi
+        orl     %eax,           %edi
+        addl    %esi,           %ebp
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    1859775393(%ebp,%edi,1),%ebp
+        subl    %eax,           %esi
+        roll    $7,             %ebp
+        addl    %edx,           %ebp
+        /* 47 */
+        movl    52(%esp),       %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %edx
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %eax
+        leal    1859775393(%edx,%esi,1),%edx
+        movl    %eax,           %esi
+        roll    $5,             %edx
+        addl    %ecx,           %edx
+        /* 48 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    8(%esp),        %esi
+        roll    $10,            %ebp
+        leal    2400959708(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        roll    $11,            %ecx
+        addl    %ebx,           %ecx
+        /* 49 */
+        subl    %ebp,           %edi
+        andl    %ecx,           %esi
+        andl    %edx,           %edi
+        orl     %esi,           %edi
+        movl    40(%esp),       %esi
+        roll    $10,            %edx
+        leal    2400959708(%ebx,%edi,),%ebx
+        movl    $-1,            %edi
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        roll    $12,            %ebx
+        addl    %eax,           %ebx
+        /* 50 */
+        subl    %edx,           %edi
+        andl    %ebx,           %esi
+        andl    %ecx,           %edi
+        orl     %esi,           %edi
+        movl    48(%esp),       %esi
+        roll    $10,            %ecx
+        leal    2400959708(%eax,%edi,),%eax
+        movl    $-1,            %edi
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        roll    $14,            %eax
+        addl    %ebp,           %eax
+        /* 51 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    44(%esp),       %esi
+        roll    $10,            %ebx
+        leal    2400959708(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $15,            %ebp
+        addl    %edx,           %ebp
+        /* 52 */
+        subl    %ebx,           %edi
+        andl    %ebp,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    4(%esp),        %esi
+        roll    $10,            %eax
+        leal    2400959708(%edx,%edi,),%edx
+        movl    $-1,            %edi
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        roll    $14,            %edx
+        addl    %ecx,           %edx
+        /* 53 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    36(%esp),       %esi
+        roll    $10,            %ebp
+        leal    2400959708(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        roll    $15,            %ecx
+        addl    %ebx,           %ecx
+        /* 54 */
+        subl    %ebp,           %edi
+        andl    %ecx,           %esi
+        andl    %edx,           %edi
+        orl     %esi,           %edi
+        movl    52(%esp),       %esi
+        roll    $10,            %edx
+        leal    2400959708(%ebx,%edi,),%ebx
+        movl    $-1,            %edi
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        roll    $9,             %ebx
+        addl    %eax,           %ebx
+        /* 55 */
+        subl    %edx,           %edi
+        andl    %ebx,           %esi
+        andl    %ecx,           %edi
+        orl     %esi,           %edi
+        movl    20(%esp),       %esi
+        roll    $10,            %ecx
+        leal    2400959708(%eax,%edi,),%eax
+        movl    $-1,            %edi
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 56 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    56(%esp),       %esi
+        roll    $10,            %ebx
+        leal    2400959708(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $9,             %ebp
+        addl    %edx,           %ebp
+        /* 57 */
+        subl    %ebx,           %edi
+        andl    %ebp,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    16(%esp),       %esi
+        roll    $10,            %eax
+        leal    2400959708(%edx,%edi,),%edx
+        movl    $-1,            %edi
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        roll    $14,            %edx
+        addl    %ecx,           %edx
+        /* 58 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    32(%esp),       %esi
+        roll    $10,            %ebp
+        leal    2400959708(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        roll    $5,             %ecx
+        addl    %ebx,           %ecx
+        /* 59 */
+        subl    %ebp,           %edi
+        andl    %ecx,           %esi
+        andl    %edx,           %edi
+        orl     %esi,           %edi
+        movl    64(%esp),       %esi
+        roll    $10,            %edx
+        leal    2400959708(%ebx,%edi,),%ebx
+        movl    $-1,            %edi
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        roll    $6,             %ebx
+        addl    %eax,           %ebx
+        /* 60 */
+        subl    %edx,           %edi
+        andl    %ebx,           %esi
+        andl    %ecx,           %edi
+        orl     %esi,           %edi
+        movl    60(%esp),       %esi
+        roll    $10,            %ecx
+        leal    2400959708(%eax,%edi,),%eax
+        movl    $-1,            %edi
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 61 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    24(%esp),       %esi
+        roll    $10,            %ebx
+        leal    2400959708(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $6,             %ebp
+        addl    %edx,           %ebp
+        /* 62 */
+        subl    %ebx,           %edi
+        andl    %ebp,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    28(%esp),       %esi
+        roll    $10,            %eax
+        leal    2400959708(%edx,%edi,),%edx
+        movl    $-1,            %edi
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        roll    $5,             %edx
+        addl    %ecx,           %edx
+        /* 63 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    12(%esp),       %esi
+        roll    $10,            %ebp
+        leal    2400959708(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        subl    %ebp,           %edi
+        roll    $12,            %ecx
+        addl    %ebx,           %ecx
+        /* 64 */
+        movl    20(%esp),       %esi
+        orl     %edx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    2840853838(%ebx,%edi,1),%ebx
+        subl    %edx,           %esi
+        roll    $9,             %ebx
+        addl    %eax,           %ebx
+        /* 65 */
+        movl    4(%esp),        %edi
+        orl     %ecx,           %esi
+        addl    %edi,           %eax
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    2840853838(%eax,%esi,1),%eax
+        subl    %ecx,           %edi
+        roll    $15,            %eax
+        addl    %ebp,           %eax
+        /* 66 */
+        movl    24(%esp),       %esi
+        orl     %ebx,           %edi
+        addl    %esi,           %ebp
+        xorl    %eax,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    2840853838(%ebp,%edi,1),%ebp
+        subl    %ebx,           %esi
+        roll    $5,             %ebp
+        addl    %edx,           %ebp
+        /* 67 */
+        movl    40(%esp),       %edi
+        orl     %eax,           %esi
+        addl    %edi,           %edx
+        xorl    %ebp,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %eax
+        leal    2840853838(%edx,%esi,1),%edx
+        subl    %eax,           %edi
+        roll    $11,            %edx
+        addl    %ecx,           %edx
+        /* 68 */
+        movl    32(%esp),       %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %ecx
+        xorl    %edx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebp
+        leal    2840853838(%ecx,%edi,1),%ecx
+        subl    %ebp,           %esi
+        roll    $6,             %ecx
+        addl    %ebx,           %ecx
+        /* 69 */
+        movl    52(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ebx
+        xorl    %ecx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        leal    2840853838(%ebx,%esi,1),%ebx
+        subl    %edx,           %edi
+        roll    $8,             %ebx
+        addl    %eax,           %ebx
+        /* 70 */
+        movl    12(%esp),       %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %eax
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ecx
+        leal    2840853838(%eax,%edi,1),%eax
+        subl    %ecx,           %esi
+        roll    $13,            %eax
+        addl    %ebp,           %eax
+        /* 71 */
+        movl    44(%esp),       %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %ebp
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebx
+        leal    2840853838(%ebp,%esi,1),%ebp
+        subl    %ebx,           %edi
+        roll    $12,            %ebp
+        addl    %edx,           %ebp
+        /* 72 */
+        movl    60(%esp),       %esi
+        orl     %eax,           %edi
+        addl    %esi,           %edx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    2840853838(%edx,%edi,1),%edx
+        subl    %eax,           %esi
+        roll    $5,             %edx
+        addl    %ecx,           %edx
+        /* 73 */
+        movl    8(%esp),        %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %ecx
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    2840853838(%ecx,%esi,1),%ecx
+        subl    %ebp,           %edi
+        roll    $12,            %ecx
+        addl    %ebx,           %ecx
+        /* 74 */
+        movl    16(%esp),       %esi
+        orl     %edx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    2840853838(%ebx,%edi,1),%ebx
+        subl    %edx,           %esi
+        roll    $13,            %ebx
+        addl    %eax,           %ebx
+        /* 75 */
+        movl    36(%esp),       %edi
+        orl     %ecx,           %esi
+        addl    %edi,           %eax
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    2840853838(%eax,%esi,1),%eax
+        subl    %ecx,           %edi
+        roll    $14,            %eax
+        addl    %ebp,           %eax
+        /* 76 */
+        movl    48(%esp),       %esi
+        orl     %ebx,           %edi
+        addl    %esi,           %ebp
+        xorl    %eax,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    2840853838(%ebp,%edi,1),%ebp
+        subl    %ebx,           %esi
+        roll    $11,            %ebp
+        addl    %edx,           %ebp
+        /* 77 */
+        movl    28(%esp),       %edi
+        orl     %eax,           %esi
+        addl    %edi,           %edx
+        xorl    %ebp,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %eax
+        leal    2840853838(%edx,%esi,1),%edx
+        subl    %eax,           %edi
+        roll    $8,             %edx
+        addl    %ecx,           %edx
+        /* 78 */
+        movl    64(%esp),       %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %ecx
+        xorl    %edx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebp
+        leal    2840853838(%ecx,%edi,1),%ecx
+        subl    %ebp,           %esi
+        roll    $5,             %ecx
+        addl    %ebx,           %ecx
+        /* 79 */
+        movl    56(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ebx
+        xorl    %ecx,           %esi
+        movl    108(%esp),      %edi
+        roll    $10,            %edx
+        leal    2840853838(%ebx,%esi,1),%ebx
+        movl    %eax,           68(%esp)
+        roll    $6,             %ebx
+        addl    %eax,           %ebx
+        movl    (%edi),         %eax
+        movl    %ebx,           72(%esp)
+        movl    %ecx,           76(%esp)
+        movl    4(%edi),        %ebx
+        movl    %edx,           80(%esp)
+        movl    8(%edi),        %ecx
+        movl    %ebp,           84(%esp)
+        movl    12(%edi),       %edx
+        movl    16(%edi),       %ebp
+        /* 80 */
+        movl    $-1,            %edi
+        subl    %edx,           %edi
+        movl    24(%esp),       %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %eax
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ecx
+        leal    1352829926(%eax,%edi,1),%eax
+        subl    %ecx,           %esi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 81 */
+        movl    60(%esp),       %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %ebp
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebx
+        leal    1352829926(%ebp,%esi,1),%ebp
+        subl    %ebx,           %edi
+        roll    $9,             %ebp
+        addl    %edx,           %ebp
+        /* 82 */
+        movl    32(%esp),       %esi
+        orl     %eax,           %edi
+        addl    %esi,           %edx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    1352829926(%edx,%edi,1),%edx
+        subl    %eax,           %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 83 */
+        movl    4(%esp),        %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %ecx
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    1352829926(%ecx,%esi,1),%ecx
+        subl    %ebp,           %edi
+        roll    $11,            %ecx
+        addl    %ebx,           %ecx
+        /* 84 */
+        movl    40(%esp),       %esi
+        orl     %edx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    1352829926(%ebx,%edi,1),%ebx
+        subl    %edx,           %esi
+        roll    $13,            %ebx
+        addl    %eax,           %ebx
+        /* 85 */
+        movl    12(%esp),       %edi
+        orl     %ecx,           %esi
+        addl    %edi,           %eax
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    1352829926(%eax,%esi,1),%eax
+        subl    %ecx,           %edi
+        roll    $15,            %eax
+        addl    %ebp,           %eax
+        /* 86 */
+        movl    48(%esp),       %esi
+        orl     %ebx,           %edi
+        addl    %esi,           %ebp
+        xorl    %eax,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    1352829926(%ebp,%edi,1),%ebp
+        subl    %ebx,           %esi
+        roll    $15,            %ebp
+        addl    %edx,           %ebp
+        /* 87 */
+        movl    20(%esp),       %edi
+        orl     %eax,           %esi
+        addl    %edi,           %edx
+        xorl    %ebp,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %eax
+        leal    1352829926(%edx,%esi,1),%edx
+        subl    %eax,           %edi
+        roll    $5,             %edx
+        addl    %ecx,           %edx
+        /* 88 */
+        movl    56(%esp),       %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %ecx
+        xorl    %edx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebp
+        leal    1352829926(%ecx,%edi,1),%ecx
+        subl    %ebp,           %esi
+        roll    $7,             %ecx
+        addl    %ebx,           %ecx
+        /* 89 */
+        movl    28(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ebx
+        xorl    %ecx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        leal    1352829926(%ebx,%esi,1),%ebx
+        subl    %edx,           %edi
+        roll    $7,             %ebx
+        addl    %eax,           %ebx
+        /* 90 */
+        movl    64(%esp),       %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %eax
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ecx
+        leal    1352829926(%eax,%edi,1),%eax
+        subl    %ecx,           %esi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 91 */
+        movl    36(%esp),       %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %ebp
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebx
+        leal    1352829926(%ebp,%esi,1),%ebp
+        subl    %ebx,           %edi
+        roll    $11,            %ebp
+        addl    %edx,           %ebp
+        /* 92 */
+        movl    8(%esp),        %esi
+        orl     %eax,           %edi
+        addl    %esi,           %edx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    1352829926(%edx,%edi,1),%edx
+        subl    %eax,           %esi
+        roll    $14,            %edx
+        addl    %ecx,           %edx
+        /* 93 */
+        movl    44(%esp),       %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %ecx
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    1352829926(%ecx,%esi,1),%ecx
+        subl    %ebp,           %edi
+        roll    $14,            %ecx
+        addl    %ebx,           %ecx
+        /* 94 */
+        movl    16(%esp),       %esi
+        orl     %edx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    1352829926(%ebx,%edi,1),%ebx
+        subl    %edx,           %esi
+        roll    $12,            %ebx
+        addl    %eax,           %ebx
+        /* 95 */
+        movl    52(%esp),       %edi
+        orl     %ecx,           %esi
+        addl    %edi,           %eax
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    1352829926(%eax,%esi,1),%eax
+        movl    %ecx,           %esi
+        roll    $6,             %eax
+        addl    %ebp,           %eax
+        /* 96 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    28(%esp),       %esi
+        roll    $10,            %ebx
+        leal    1548603684(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $9,             %ebp
+        addl    %edx,           %ebp
+        /* 97 */
+        subl    %ebx,           %edi
+        andl    %ebp,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    48(%esp),       %esi
+        roll    $10,            %eax
+        leal    1548603684(%edx,%edi,),%edx
+        movl    $-1,            %edi
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        roll    $13,            %edx
+        addl    %ecx,           %edx
+        /* 98 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    16(%esp),       %esi
+        roll    $10,            %ebp
+        leal    1548603684(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        roll    $15,            %ecx
+        addl    %ebx,           %ecx
+        /* 99 */
+        subl    %ebp,           %edi
+        andl    %ecx,           %esi
+        andl    %edx,           %edi
+        orl     %esi,           %edi
+        movl    32(%esp),       %esi
+        roll    $10,            %edx
+        leal    1548603684(%ebx,%edi,),%ebx
+        movl    $-1,            %edi
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        roll    $7,             %ebx
+        addl    %eax,           %ebx
+        /* 100 */
+        subl    %edx,           %edi
+        andl    %ebx,           %esi
+        andl    %ecx,           %edi
+        orl     %esi,           %edi
+        movl    4(%esp),        %esi
+        roll    $10,            %ecx
+        leal    1548603684(%eax,%edi,),%eax
+        movl    $-1,            %edi
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        roll    $12,            %eax
+        addl    %ebp,           %eax
+        /* 101 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    56(%esp),       %esi
+        roll    $10,            %ebx
+        leal    1548603684(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $8,             %ebp
+        addl    %edx,           %ebp
+        /* 102 */
+        subl    %ebx,           %edi
+        andl    %ebp,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    24(%esp),       %esi
+        roll    $10,            %eax
+        leal    1548603684(%edx,%edi,),%edx
+        movl    $-1,            %edi
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 103 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    44(%esp),       %esi
+        roll    $10,            %ebp
+        leal    1548603684(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        roll    $11,            %ecx
+        addl    %ebx,           %ecx
+        /* 104 */
+        subl    %ebp,           %edi
+        andl    %ecx,           %esi
+        andl    %edx,           %edi
+        orl     %esi,           %edi
+        movl    60(%esp),       %esi
+        roll    $10,            %edx
+        leal    1548603684(%ebx,%edi,),%ebx
+        movl    $-1,            %edi
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        roll    $7,             %ebx
+        addl    %eax,           %ebx
+        /* 105 */
+        subl    %edx,           %edi
+        andl    %ebx,           %esi
+        andl    %ecx,           %edi
+        orl     %esi,           %edi
+        movl    64(%esp),       %esi
+        roll    $10,            %ecx
+        leal    1548603684(%eax,%edi,),%eax
+        movl    $-1,            %edi
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        roll    $7,             %eax
+        addl    %ebp,           %eax
+        /* 106 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    36(%esp),       %esi
+        roll    $10,            %ebx
+        leal    1548603684(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $12,            %ebp
+        addl    %edx,           %ebp
+        /* 107 */
+        subl    %ebx,           %edi
+        andl    %ebp,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    52(%esp),       %esi
+        roll    $10,            %eax
+        leal    1548603684(%edx,%edi,),%edx
+        movl    $-1,            %edi
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        roll    $7,             %edx
+        addl    %ecx,           %edx
+        /* 108 */
+        subl    %eax,           %edi
+        andl    %edx,           %esi
+        andl    %ebp,           %edi
+        orl     %esi,           %edi
+        movl    20(%esp),       %esi
+        roll    $10,            %ebp
+        leal    1548603684(%ecx,%edi,),%ecx
+        movl    $-1,            %edi
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        roll    $6,             %ecx
+        addl    %ebx,           %ecx
+        /* 109 */
+        subl    %ebp,           %edi
+        andl    %ecx,           %esi
+        andl    %edx,           %edi
+        orl     %esi,           %edi
+        movl    40(%esp),       %esi
+        roll    $10,            %edx
+        leal    1548603684(%ebx,%edi,),%ebx
+        movl    $-1,            %edi
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        roll    $15,            %ebx
+        addl    %eax,           %ebx
+        /* 110 */
+        subl    %edx,           %edi
+        andl    %ebx,           %esi
+        andl    %ecx,           %edi
+        orl     %esi,           %edi
+        movl    8(%esp),        %esi
+        roll    $10,            %ecx
+        leal    1548603684(%eax,%edi,),%eax
+        movl    $-1,            %edi
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        roll    $13,            %eax
+        addl    %ebp,           %eax
+        /* 111 */
+        subl    %ecx,           %edi
+        andl    %eax,           %esi
+        andl    %ebx,           %edi
+        orl     %esi,           %edi
+        movl    12(%esp),       %esi
+        roll    $10,            %ebx
+        leal    1548603684(%ebp,%edi,),%ebp
+        movl    $-1,            %edi
+        addl    %esi,           %ebp
+        subl    %eax,           %edi
+        roll    $11,            %ebp
+        addl    %edx,           %ebp
+        /* 112 */
+        movl    64(%esp),       %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %edx
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    1836072691(%edx,%edi,1),%edx
+        subl    %ebp,           %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 113 */
+        movl    24(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ecx
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    1836072691(%ecx,%esi,1),%ecx
+        subl    %edx,           %edi
+        roll    $7,             %ecx
+        addl    %ebx,           %ecx
+        /* 114 */
+        movl    8(%esp),        %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    1836072691(%ebx,%edi,1),%ebx
+        subl    %ecx,           %esi
+        roll    $15,            %ebx
+        addl    %eax,           %ebx
+        /* 115 */
+        movl    16(%esp),       %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %eax
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    1836072691(%eax,%esi,1),%eax
+        subl    %ebx,           %edi
+        roll    $11,            %eax
+        addl    %ebp,           %eax
+        /* 116 */
+        movl    32(%esp),       %esi
+        orl     %eax,           %edi
+        addl    %esi,           %ebp
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    1836072691(%ebp,%edi,1),%ebp
+        subl    %eax,           %esi
+        roll    $8,             %ebp
+        addl    %edx,           %ebp
+        /* 117 */
+        movl    60(%esp),       %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %edx
+        xorl    %ebx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %eax
+        leal    1836072691(%edx,%esi,1),%edx
+        subl    %ebp,           %edi
+        roll    $6,             %edx
+        addl    %ecx,           %edx
+        /* 118 */
+        movl    28(%esp),       %esi
+        orl     %edx,           %edi
+        addl    %esi,           %ecx
+        xorl    %eax,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebp
+        leal    1836072691(%ecx,%edi,1),%ecx
+        subl    %edx,           %esi
+        roll    $6,             %ecx
+        addl    %ebx,           %ecx
+        /* 119 */
+        movl    40(%esp),       %edi
+        orl     %ecx,           %esi
+        addl    %edi,           %ebx
+        xorl    %ebp,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %edx
+        leal    1836072691(%ebx,%esi,1),%ebx
+        subl    %ecx,           %edi
+        roll    $14,            %ebx
+        addl    %eax,           %ebx
+        /* 120 */
+        movl    48(%esp),       %esi
+        orl     %ebx,           %edi
+        addl    %esi,           %eax
+        xorl    %edx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ecx
+        leal    1836072691(%eax,%edi,1),%eax
+        subl    %ebx,           %esi
+        roll    $12,            %eax
+        addl    %ebp,           %eax
+        /* 121 */
+        movl    36(%esp),       %edi
+        orl     %eax,           %esi
+        addl    %edi,           %ebp
+        xorl    %ecx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebx
+        leal    1836072691(%ebp,%esi,1),%ebp
+        subl    %eax,           %edi
+        roll    $13,            %ebp
+        addl    %edx,           %ebp
+        /* 122 */
+        movl    52(%esp),       %esi
+        orl     %ebp,           %edi
+        addl    %esi,           %edx
+        xorl    %ebx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %eax
+        leal    1836072691(%edx,%edi,1),%edx
+        subl    %ebp,           %esi
+        roll    $5,             %edx
+        addl    %ecx,           %edx
+        /* 123 */
+        movl    12(%esp),       %edi
+        orl     %edx,           %esi
+        addl    %edi,           %ecx
+        xorl    %eax,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ebp
+        leal    1836072691(%ecx,%esi,1),%ecx
+        subl    %edx,           %edi
+        roll    $14,            %ecx
+        addl    %ebx,           %ecx
+        /* 124 */
+        movl    44(%esp),       %esi
+        orl     %ecx,           %edi
+        addl    %esi,           %ebx
+        xorl    %ebp,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %edx
+        leal    1836072691(%ebx,%edi,1),%ebx
+        subl    %ecx,           %esi
+        roll    $13,            %ebx
+        addl    %eax,           %ebx
+        /* 125 */
+        movl    4(%esp),        %edi
+        orl     %ebx,           %esi
+        addl    %edi,           %eax
+        xorl    %edx,           %esi
+        movl    $-1,            %edi
+        roll    $10,            %ecx
+        leal    1836072691(%eax,%esi,1),%eax
+        subl    %ebx,           %edi
+        roll    $13,            %eax
+        addl    %ebp,           %eax
+        /* 126 */
+        movl    20(%esp),       %esi
+        orl     %eax,           %edi
+        addl    %esi,           %ebp
+        xorl    %ecx,           %edi
+        movl    $-1,            %esi
+        roll    $10,            %ebx
+        leal    1836072691(%ebp,%edi,1),%ebp
+        subl    %eax,           %esi
+        roll    $7,             %ebp
+        addl    %edx,           %ebp
+        /* 127 */
+        movl    56(%esp),       %edi
+        orl     %ebp,           %esi
+        addl    %edi,           %edx
+        xorl    %ebx,           %esi
+        movl    36(%esp),       %edi
+        roll    $10,            %eax
+        leal    1836072691(%edx,%esi,1),%edx
+        movl    $-1,            %esi
+        roll    $5,             %edx
+        addl    %ecx,           %edx
+        /* 128 */
+        addl    %edi,           %ecx
+        movl    %ebp,           %edi
+        subl    %edx,           %esi
+        andl    %edx,           %edi
+        andl    %eax,           %esi
+        orl     %esi,           %edi
+        movl    28(%esp),       %esi
+        roll    $10,            %ebp
+        leal    2053994217(%ecx,%edi,1),%ecx
+        movl    $-1,            %edi
+        roll    $15,            %ecx
+        addl    %ebx,           %ecx
+        /* 129 */
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        subl    %ecx,           %edi
+        andl    %ecx,           %esi
+        andl    %ebp,           %edi
+        orl     %edi,           %esi
+        movl    20(%esp),       %edi
+        roll    $10,            %edx
+        leal    2053994217(%ebx,%esi,1),%ebx
+        movl    $-1,            %esi
+        roll    $5,             %ebx
+        addl    %eax,           %ebx
+        /* 130 */
+        addl    %edi,           %eax
+        movl    %ecx,           %edi
+        subl    %ebx,           %esi
+        andl    %ebx,           %edi
+        andl    %edx,           %esi
+        orl     %esi,           %edi
+        movl    8(%esp),        %esi
+        roll    $10,            %ecx
+        leal    2053994217(%eax,%edi,1),%eax
+        movl    $-1,            %edi
+        roll    $8,             %eax
+        addl    %ebp,           %eax
+        /* 131 */
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        subl    %eax,           %edi
+        andl    %eax,           %esi
+        andl    %ecx,           %edi
+        orl     %edi,           %esi
+        movl    16(%esp),       %edi
+        roll    $10,            %ebx
+        leal    2053994217(%ebp,%esi,1),%ebp
+        movl    $-1,            %esi
+        roll    $11,            %ebp
+        addl    %edx,           %ebp
+        /* 132 */
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        subl    %ebp,           %esi
+        andl    %ebp,           %edi
+        andl    %ebx,           %esi
+        orl     %esi,           %edi
+        movl    48(%esp),       %esi
+        roll    $10,            %eax
+        leal    2053994217(%edx,%edi,1),%edx
+        movl    $-1,            %edi
+        roll    $14,            %edx
+        addl    %ecx,           %edx
+        /* 133 */
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        subl    %edx,           %edi
+        andl    %edx,           %esi
+        andl    %eax,           %edi
+        orl     %edi,           %esi
+        movl    64(%esp),       %edi
+        roll    $10,            %ebp
+        leal    2053994217(%ecx,%esi,1),%ecx
+        movl    $-1,            %esi
+        roll    $14,            %ecx
+        addl    %ebx,           %ecx
+        /* 134 */
+        addl    %edi,           %ebx
+        movl    %edx,           %edi
+        subl    %ecx,           %esi
+        andl    %ecx,           %edi
+        andl    %ebp,           %esi
+        orl     %esi,           %edi
+        movl    4(%esp),        %esi
+        roll    $10,            %edx
+        leal    2053994217(%ebx,%edi,1),%ebx
+        movl    $-1,            %edi
+        roll    $6,             %ebx
+        addl    %eax,           %ebx
+        /* 135 */
+        addl    %esi,           %eax
+        movl    %ecx,           %esi
+        subl    %ebx,           %edi
+        andl    %ebx,           %esi
+        andl    %edx,           %edi
+        orl     %edi,           %esi
+        movl    24(%esp),       %edi
+        roll    $10,            %ecx
+        leal    2053994217(%eax,%esi,1),%eax
+        movl    $-1,            %esi
+        roll    $14,            %eax
+        addl    %ebp,           %eax
+        /* 136 */
+        addl    %edi,           %ebp
+        movl    %ebx,           %edi
+        subl    %eax,           %esi
+        andl    %eax,           %edi
+        andl    %ecx,           %esi
+        orl     %esi,           %edi
+        movl    52(%esp),       %esi
+        roll    $10,            %ebx
+        leal    2053994217(%ebp,%edi,1),%ebp
+        movl    $-1,            %edi
+        roll    $6,             %ebp
+        addl    %edx,           %ebp
+        /* 137 */
+        addl    %esi,           %edx
+        movl    %eax,           %esi
+        subl    %ebp,           %edi
+        andl    %ebp,           %esi
+        andl    %ebx,           %edi
+        orl     %edi,           %esi
+        movl    12(%esp),       %edi
+        roll    $10,            %eax
+        leal    2053994217(%edx,%esi,1),%edx
+        movl    $-1,            %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 138 */
+        addl    %edi,           %ecx
+        movl    %ebp,           %edi
+        subl    %edx,           %esi
+        andl    %edx,           %edi
+        andl    %eax,           %esi
+        orl     %esi,           %edi
+        movl    56(%esp),       %esi
+        roll    $10,            %ebp
+        leal    2053994217(%ecx,%edi,1),%ecx
+        movl    $-1,            %edi
+        roll    $12,            %ecx
+        addl    %ebx,           %ecx
+        /* 139 */
+        addl    %esi,           %ebx
+        movl    %edx,           %esi
+        subl    %ecx,           %edi
+        andl    %ecx,           %esi
+        andl    %ebp,           %edi
+        orl     %edi,           %esi
+        movl    40(%esp),       %edi
+        roll    $10,            %edx
+        leal    2053994217(%ebx,%esi,1),%ebx
+        movl    $-1,            %esi
+        roll    $9,             %ebx
+        addl    %eax,           %ebx
+        /* 140 */
+        addl    %edi,           %eax
+        movl    %ecx,           %edi
+        subl    %ebx,           %esi
+        andl    %ebx,           %edi
+        andl    %edx,           %esi
+        orl     %esi,           %edi
+        movl    32(%esp),       %esi
+        roll    $10,            %ecx
+        leal    2053994217(%eax,%edi,1),%eax
+        movl    $-1,            %edi
+        roll    $12,            %eax
+        addl    %ebp,           %eax
+        /* 141 */
+        addl    %esi,           %ebp
+        movl    %ebx,           %esi
+        subl    %eax,           %edi
+        andl    %eax,           %esi
+        andl    %ecx,           %edi
+        orl     %edi,           %esi
+        movl    44(%esp),       %edi
+        roll    $10,            %ebx
+        leal    2053994217(%ebp,%esi,1),%ebp
+        movl    $-1,            %esi
+        roll    $5,             %ebp
+        addl    %edx,           %ebp
+        /* 142 */
+        addl    %edi,           %edx
+        movl    %eax,           %edi
+        subl    %ebp,           %esi
+        andl    %ebp,           %edi
+        andl    %ebx,           %esi
+        orl     %esi,           %edi
+        movl    60(%esp),       %esi
+        roll    $10,            %eax
+        leal    2053994217(%edx,%edi,1),%edx
+        movl    $-1,            %edi
+        roll    $15,            %edx
+        addl    %ecx,           %edx
+        /* 143 */
+        addl    %esi,           %ecx
+        movl    %ebp,           %esi
+        subl    %edx,           %edi
+        andl    %edx,           %esi
+        andl    %eax,           %edi
+        orl     %esi,           %edi
+        movl    %edx,           %esi
+        roll    $10,            %ebp
+        leal    2053994217(%ecx,%edi,1),%ecx
+        xorl    %ebp,           %esi
+        roll    $8,             %ecx
+        addl    %ebx,           %ecx
+        /* 144 */
+        movl    52(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %edi,           %ebx
+        roll    $10,            %edx
+        addl    %esi,           %ebx
+        movl    %ecx,           %esi
+        roll    $8,             %ebx
+        addl    %eax,           %ebx
+        /* 145 */
+        xorl    %edx,           %esi
+        movl    64(%esp),       %edi
+        xorl    %ebx,           %esi
+        addl    %esi,           %eax
+        movl    %ebx,           %esi
+        roll    $10,            %ecx
+        addl    %edi,           %eax
+        xorl    %ecx,           %esi
+        roll    $5,             %eax
+        addl    %ebp,           %eax
+        /* 146 */
+        movl    44(%esp),       %edi
+        xorl    %eax,           %esi
+        addl    %edi,           %ebp
+        roll    $10,            %ebx
+        addl    %esi,           %ebp
+        movl    %eax,           %esi
+        roll    $12,            %ebp
+        addl    %edx,           %ebp
+        /* 147 */
+        xorl    %ebx,           %esi
+        movl    20(%esp),       %edi
+        xorl    %ebp,           %esi
+        addl    %esi,           %edx
+        movl    %ebp,           %esi
+        roll    $10,            %eax
+        addl    %edi,           %edx
+        xorl    %eax,           %esi
+        roll    $9,             %edx
+        addl    %ecx,           %edx
+        /* 148 */
+        movl    8(%esp),        %edi
+        xorl    %edx,           %esi
+        addl    %edi,           %ecx
+        roll    $10,            %ebp
+        addl    %esi,           %ecx
+        movl    %edx,           %esi
+        roll    $12,            %ecx
+        addl    %ebx,           %ecx
+        /* 149 */
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %esi,           %ebx
+        movl    %ecx,           %esi
+        roll    $10,            %edx
+        addl    %edi,           %ebx
+        xorl    %edx,           %esi
+        roll    $5,             %ebx
+        addl    %eax,           %ebx
+        /* 150 */
+        movl    36(%esp),       %edi
+        xorl    %ebx,           %esi
+        addl    %edi,           %eax
+        roll    $10,            %ecx
+        addl    %esi,           %eax
+        movl    %ebx,           %esi
+        roll    $14,            %eax
+        addl    %ebp,           %eax
+        /* 151 */
+        xorl    %ecx,           %esi
+        movl    32(%esp),       %edi
+        xorl    %eax,           %esi
+        addl    %esi,           %ebp
+        movl    %eax,           %esi
+        roll    $10,            %ebx
+        addl    %edi,           %ebp
+        xorl    %ebx,           %esi
+        roll    $6,             %ebp
+        addl    %edx,           %ebp
+        /* 152 */
+        movl    28(%esp),       %edi
+        xorl    %ebp,           %esi
+        addl    %edi,           %edx
+        roll    $10,            %eax
+        addl    %esi,           %edx
+        movl    %ebp,           %esi
+        roll    $8,             %edx
+        addl    %ecx,           %edx
+        /* 153 */
+        xorl    %eax,           %esi
+        movl    12(%esp),       %edi
+        xorl    %edx,           %esi
+        addl    %esi,           %ecx
+        movl    %edx,           %esi
+        roll    $10,            %ebp
+        addl    %edi,           %ecx
+        xorl    %ebp,           %esi
+        roll    $13,            %ecx
+        addl    %ebx,           %ecx
+        /* 154 */
+        movl    56(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %edi,           %ebx
+        roll    $10,            %edx
+        addl    %esi,           %ebx
+        movl    %ecx,           %esi
+        roll    $6,             %ebx
+        addl    %eax,           %ebx
+        /* 155 */
+        xorl    %edx,           %esi
+        movl    60(%esp),       %edi
+        xorl    %ebx,           %esi
+        addl    %esi,           %eax
+        movl    %ebx,           %esi
+        roll    $10,            %ecx
+        addl    %edi,           %eax
+        xorl    %ecx,           %esi
+        roll    $5,             %eax
+        addl    %ebp,           %eax
+        /* 156 */
+        movl    4(%esp),        %edi
+        xorl    %eax,           %esi
+        addl    %edi,           %ebp
+        roll    $10,            %ebx
+        addl    %esi,           %ebp
+        movl    %eax,           %esi
+        roll    $15,            %ebp
+        addl    %edx,           %ebp
+        /* 157 */
+        xorl    %ebx,           %esi
+        movl    16(%esp),       %edi
+        xorl    %ebp,           %esi
+        addl    %esi,           %edx
+        movl    %ebp,           %esi
+        roll    $10,            %eax
+        addl    %edi,           %edx
+        xorl    %eax,           %esi
+        roll    $13,            %edx
+        addl    %ecx,           %edx
+        /* 158 */
+        movl    40(%esp),       %edi
+        xorl    %edx,           %esi
+        addl    %edi,           %ecx
+        roll    $10,            %ebp
+        addl    %esi,           %ecx
+        movl    %edx,           %esi
+        roll    $11,            %ecx
+        addl    %ebx,           %ecx
+        /* 159 */
+        xorl    %ebp,           %esi
+        movl    48(%esp),       %edi
+        xorl    %ecx,           %esi
+        addl    %esi,           %ebx
+        roll    $10,            %edx
+        addl    %edi,           %ebx
+        movl    108(%esp),      %edi
+        roll    $11,            %ebx
+        addl    %eax,           %ebx
+        movl    4(%edi),        %esi
+        addl    %esi,           %edx
+        movl    76(%esp),       %esi
+        addl    %esi,           %edx
+        movl    8(%edi),        %esi
+        addl    %esi,           %ebp
+        movl    80(%esp),       %esi
+        addl    %esi,           %ebp
+        movl    12(%edi),       %esi
+        addl    %esi,           %eax
+        movl    84(%esp),       %esi
+        addl    %esi,           %eax
+        movl    16(%edi),       %esi
+        addl    %esi,           %ebx
+        movl    68(%esp),       %esi
+        addl    %esi,           %ebx
+        movl    (%edi),         %esi
+        addl    %esi,           %ecx
+        movl    72(%esp),       %esi
+        addl    %esi,           %ecx
+        movl    %edx,           (%edi)
+        movl    %ebp,           4(%edi)
+        movl    %eax,           8(%edi)
+        movl    %ebx,           12(%edi)
+        movl    %ecx,           16(%edi)
+        movl    (%esp),         %edi
+        movl    112(%esp),      %esi
+        cmpl    %esi,           %edi
+        movl    108(%esp),      %edi
+        jge     .L000start
+        addl    $88,            %esp
+        popl    %ebx
+        popl    %ebp
+        popl    %edi
+        popl    %esi
+        ret
+.ripemd160_block_x86_end:
+        SIZE(ripemd160_block_x86,.ripemd160_block_x86_end-ripemd160_block_x86)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/rsa/Makefile.ssl b/src/lib/libcrypto/rsa/Makefile.ssl
new file mode 100644
index 0000000000..d52f2e609e
--- /dev/null
+++ b/src/lib/libcrypto/rsa/Makefile.ssl
@@ -0,0 +1,86 @@
+#
+# SSLeay/crypto/rsa/Makefile
+#
+
+DIR=    rsa
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=rsa
+ERRC=rsa_err
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c $(ERRC).c \
+        rsa_pk1.c rsa_ssl.c rsa_none.c
+LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o $(ERRC).o \
+        rsa_pk1.o rsa_ssl.o rsa_none.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= rsa.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/rsa/rsa.err b/src/lib/libcrypto/rsa/rsa.err
new file mode 100644
index 0000000000..5ded1b5fa2
--- /dev/null
+++ b/src/lib/libcrypto/rsa/rsa.err
@@ -0,0 +1,45 @@
+/* Error codes for the RSA functions. */
+
+/* Function codes. */
+#define RSA_F_RSA_EAY_PRIVATE_DECRYPT                    100
+#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT                    101
+#define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     102
+#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     103
+#define RSA_F_RSA_GENERATE_KEY                           104
+#define RSA_F_RSA_NEW_METHOD                             105
+#define RSA_F_RSA_PADDING_ADD_NONE                       106
+#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               107
+#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               108
+#define RSA_F_RSA_PADDING_ADD_SSLV23                     109
+#define RSA_F_RSA_PADDING_CHECK_NONE                     110
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             111
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             112
+#define RSA_F_RSA_PADDING_CHECK_SSLV23                   113
+#define RSA_F_RSA_PRINT                                  114
+#define RSA_F_RSA_PRINT_FP                               115
+#define RSA_F_RSA_SIGN                                   116
+#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 117
+#define RSA_F_RSA_VERIFY                                 118
+#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               119
+
+/* Reason codes. */
+#define RSA_R_ALGORITHM_MISMATCH                         100
+#define RSA_R_BAD_E_VALUE                                101
+#define RSA_R_BAD_FIXED_HEADER_DECRYPT                   102
+#define RSA_R_BAD_PAD_BYTE_COUNT                         103
+#define RSA_R_BAD_SIGNATURE                              104
+#define RSA_R_BAD_ZERO_BYTE                              105
+#define RSA_R_BLOCK_TYPE_IS_NOT_01                       106
+#define RSA_R_BLOCK_TYPE_IS_NOT_02                       107
+#define RSA_R_DATA_GREATER_THAN_MOD_LEN                  108
+#define RSA_R_DATA_TOO_LARGE                             109
+#define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                110
+#define RSA_R_DATA_TOO_SMALL                             111
+#define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
+#define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
+#define RSA_R_PADDING_CHECK_FAILED                       114
+#define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
+#define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
+#define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
+#define RSA_R_UNKNOWN_PADDING_TYPE                       118
+#define RSA_R_WRONG_SIGNATURE_LENGTH                     119
diff --git a/src/lib/libcrypto/sha/Makefile.ssl b/src/lib/libcrypto/sha/Makefile.ssl
new file mode 100644
index 0000000000..eeb545d140
--- /dev/null
+++ b/src/lib/libcrypto/sha/Makefile.ssl
@@ -0,0 +1,103 @@
+#
+# SSLeay/crypto/sha/Makefile
+#
+
+DIR=    sha
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+SHA1_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=shatest.c sha1test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
+LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o $(SHA1_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= sha.h
+HEADER= sha_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+# elf
+asm/sx86-elf.o: asm/sx86unix.cpp
+        $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o
+
+# solaris
+asm/sx86-sol.o: asm/sx86unix.cpp
+        $(CC) -E -DSOL asm/sx86unix.cpp | sed 's/^#.*//' > asm/sx86-sol.s
+        as -o asm/sx86-sol.o asm/sx86-sol.s
+        rm -f asm/sx86-sol.s
+
+# a.out
+asm/sx86-out.o: asm/sx86unix.cpp
+        $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o
+
+# bsdi
+asm/sx86bsdi.o: asm/sx86unix.cpp
+        $(CPP) -DBSDI asm/sx86unix.cpp | as -o asm/sx86bsdi.o
+
+asm/sx86unix.cpp:
+        (cd asm; perl sha1-586.pl cpp >sx86unix.cpp)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/sha/Makefile.uni b/src/lib/libcrypto/sha/Makefile.uni
new file mode 100644
index 0000000000..f3236755b2
--- /dev/null
+++ b/src/lib/libcrypto/sha/Makefile.uni
@@ -0,0 +1,122 @@
+# Targets
+# make          - twidle the options yourself :-)
+# make cc       - standard cc options
+# make gcc      - standard gcc options
+# make x86-elf  - linux-elf etc
+# make x86-out  - linux-a.out, FreeBSD etc
+# make x86-solaris
+# make x86-bdsi
+
+DIR=    sha
+TOP=    .
+CC=     gcc
+CFLAG=  -O3 -fomit-frame-pointer
+
+CPP=    $(CC) -E
+INCLUDES=
+INSTALLTOP=/usr/local/lib
+MAKE=           make
+MAKEDEPEND=     makedepend
+MAKEFILE=       Makefile.uni
+AR=             ar r
+
+SHA_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+
+TEST1=shatest
+TEST2=sha1test
+APP1=sha
+APP2=sha1
+
+TEST=$(TEST1) $(TEST2)
+APPS=$(APP1) $(APP2)
+
+LIB=libsha.a
+LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
+LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o $(SHA_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= sha.h
+HEADER= sha_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+all:    $(LIB) $(TEST) $(APPS)
+
+$(LIB): $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/ranlib.sh $(LIB)
+
+# elf
+asm/sx86-elf.o: asm/sx86unix.cpp
+        $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o
+
+# solaris
+asm/sx86-sol.o: asm/sx86unix.cpp
+        $(CC) -E -DSOL asm/sx86unix.cpp | sed 's/^#.*//' > asm/sx86-sol.s
+        as -o asm/sx86-sol.o asm/sx86-sol.s
+        rm -f asm/sx86-sol.s
+
+# a.out
+asm/sx86-out.o: asm/sx86unix.cpp
+        $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o
+
+# bsdi
+asm/sx86bsdi.o: asm/sx86unix.cpp
+        $(CPP) -DBSDI asm/sx86unix.cpp | as -o asm/sx86bsdi.o
+
+asm/sx86unix.cpp:
+        (cd asm; perl sha1-586.pl cpp >sx86unix.cpp)
+
+test:   $(TEST)
+        ./$(TEST1)
+        ./$(TEST2)
+
+$(TEST1): $(TEST1).c $(LIB)
+        $(CC) -o $(TEST1) $(CFLAGS) $(TEST1).c $(LIB)
+
+$(TEST2): $(TEST2).c $(LIB)
+        $(CC) -o $(TEST2) $(CFLAGS) $(TEST2).c $(LIB)
+
+$(APP1): $(APP1).c $(LIB)
+        $(CC) -o $(APP1) $(CFLAGS) $(APP1).c $(LIB)
+
+$(APP2): $(APP2).c $(LIB)
+        $(CC) -o $(APP2) $(CFLAGS) $(APP2).c $(LIB)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+cc:
+        $(MAKE) SHA_ASM_OBJ="" CC="cc" CFLAG="-O" all
+
+gcc:
+        $(MAKE) SHA_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all
+
+x86-elf:
+        $(MAKE) SHA_ASM_OBJ="asm/sx86-elf.o" CFLAG="-DELF -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-out:
+        $(MAKE) SHA_ASM_OBJ="asm/sx86-out.o" CFLAG="-DOUT -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-solaris:
+        $(MAKE) SHA_ASM_OBJ="asm/sx86-sol.o" CFLAG="-DSOL -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all
+
+x86-bdsi:
+        $(MAKE) SHA_ASM_OBJ="asm/sx86-bdsi.o" CFLAG="-DBDSI -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/sha/asm/s1-win32.asm b/src/lib/libcrypto/sha/asm/s1-win32.asm
new file mode 100644
index 0000000000..61335666b9
--- /dev/null
+++ b/src/lib/libcrypto/sha/asm/s1-win32.asm
@@ -0,0 +1,1664 @@
+        ; Don't even think of reading this code
+        ; It was automatically generated by sha1-586.pl
+        ; Which is a perl program used to generate the x86 assember for
+        ; any of elf, a.out, BSDI,Win32, or Solaris
+        ; eric <eay@cryptsoft.com>
+        ; 
+        TITLE   sha1-586.asm
+        .486
+.model FLAT
+_TEXT   SEGMENT
+PUBLIC  _sha1_block_x86
+
+_sha1_block_x86 PROC NEAR
+        push    esi
+        push    ebp
+        mov     eax,            DWORD PTR 20[esp]
+        mov     esi,            DWORD PTR 16[esp]
+        add     eax,            esi
+        mov     ebp,            DWORD PTR 12[esp]
+        push    ebx
+        sub     eax,            64
+        push    edi
+        mov     ebx,            DWORD PTR 4[ebp]
+        sub     esp,            72
+        mov     edx,            DWORD PTR 12[ebp]
+        mov     edi,            DWORD PTR 16[ebp]
+        mov     ecx,            DWORD PTR 8[ebp]
+        mov     DWORD PTR 68[esp],eax
+        ; First we need to setup the X array
+        mov     eax,            DWORD PTR [esi]
+L000start:
+        ; First, load the words onto the stack in network byte order
+        bswap   eax
+        mov     DWORD PTR [esp],eax
+        mov     eax,            DWORD PTR 4[esi]
+        bswap   eax
+        mov     DWORD PTR 4[esp],eax
+        mov     eax,            DWORD PTR 8[esi]
+        bswap   eax
+        mov     DWORD PTR 8[esp],eax
+        mov     eax,            DWORD PTR 12[esi]
+        bswap   eax
+        mov     DWORD PTR 12[esp],eax
+        mov     eax,            DWORD PTR 16[esi]
+        bswap   eax
+        mov     DWORD PTR 16[esp],eax
+        mov     eax,            DWORD PTR 20[esi]
+        bswap   eax
+        mov     DWORD PTR 20[esp],eax
+        mov     eax,            DWORD PTR 24[esi]
+        bswap   eax
+        mov     DWORD PTR 24[esp],eax
+        mov     eax,            DWORD PTR 28[esi]
+        bswap   eax
+        mov     DWORD PTR 28[esp],eax
+        mov     eax,            DWORD PTR 32[esi]
+        bswap   eax
+        mov     DWORD PTR 32[esp],eax
+        mov     eax,            DWORD PTR 36[esi]
+        bswap   eax
+        mov     DWORD PTR 36[esp],eax
+        mov     eax,            DWORD PTR 40[esi]
+        bswap   eax
+        mov     DWORD PTR 40[esp],eax
+        mov     eax,            DWORD PTR 44[esi]
+        bswap   eax
+        mov     DWORD PTR 44[esp],eax
+        mov     eax,            DWORD PTR 48[esi]
+        bswap   eax
+        mov     DWORD PTR 48[esp],eax
+        mov     eax,            DWORD PTR 52[esi]
+        bswap   eax
+        mov     DWORD PTR 52[esp],eax
+        mov     eax,            DWORD PTR 56[esi]
+        bswap   eax
+        mov     DWORD PTR 56[esp],eax
+        mov     eax,            DWORD PTR 60[esi]
+        bswap   eax
+        mov     DWORD PTR 60[esp],eax
+        ; We now have the X array on the stack
+        ; starting at sp-4
+        mov     DWORD PTR 64[esp],esi
+        ; 
+        ; Start processing
+        mov     eax,            DWORD PTR [ebp]
+        ; 00_15 0
+        mov     esi,            ecx
+        mov     ebp,            eax
+        xor     esi,            edx
+        rol     ebp,            5
+        and     esi,            ebx
+        add     ebp,            edi
+        ror     ebx,            1
+        mov     edi,            DWORD PTR [esp]
+        ror     ebx,            1
+        xor     esi,            edx
+        lea     ebp,            DWORD PTR 1518500249[edi*1+ebp]
+        mov     edi,            ebx
+        add     esi,            ebp
+        xor     edi,            ecx
+        mov     ebp,            esi
+        and     edi,            eax
+        rol     ebp,            5
+        add     ebp,            edx
+        mov     edx,            DWORD PTR 4[esp]
+        ror     eax,            1
+        xor     edi,            ecx
+        ror     eax,            1
+        lea     ebp,            DWORD PTR 1518500249[edx*1+ebp]
+        add     edi,            ebp
+        ; 00_15 2
+        mov     edx,            eax
+        mov     ebp,            edi
+        xor     edx,            ebx
+        rol     ebp,            5
+        and     edx,            esi
+        add     ebp,            ecx
+        ror     esi,            1
+        mov     ecx,            DWORD PTR 8[esp]
+        ror     esi,            1
+        xor     edx,            ebx
+        lea     ebp,            DWORD PTR 1518500249[ecx*1+ebp]
+        mov     ecx,            esi
+        add     edx,            ebp
+        xor     ecx,            eax
+        mov     ebp,            edx
+        and     ecx,            edi
+        rol     ebp,            5
+        add     ebp,            ebx
+        mov     ebx,            DWORD PTR 12[esp]
+        ror     edi,            1
+        xor     ecx,            eax
+        ror     edi,            1
+        lea     ebp,            DWORD PTR 1518500249[ebx*1+ebp]
+        add     ecx,            ebp
+        ; 00_15 4
+        mov     ebx,            edi
+        mov     ebp,            ecx
+        xor     ebx,            esi
+        rol     ebp,            5
+        and     ebx,            edx
+        add     ebp,            eax
+        ror     edx,            1
+        mov     eax,            DWORD PTR 16[esp]
+        ror     edx,            1
+        xor     ebx,            esi
+        lea     ebp,            DWORD PTR 1518500249[eax*1+ebp]
+        mov     eax,            edx
+        add     ebx,            ebp
+        xor     eax,            edi
+        mov     ebp,            ebx
+        and     eax,            ecx
+        rol     ebp,            5
+        add     ebp,            esi
+        mov     esi,            DWORD PTR 20[esp]
+        ror     ecx,            1
+        xor     eax,            edi
+        ror     ecx,            1
+        lea     ebp,            DWORD PTR 1518500249[esi*1+ebp]
+        add     eax,            ebp
+        ; 00_15 6
+        mov     esi,            ecx
+        mov     ebp,            eax
+        xor     esi,            edx
+        rol     ebp,            5
+        and     esi,            ebx
+        add     ebp,            edi
+        ror     ebx,            1
+        mov     edi,            DWORD PTR 24[esp]
+        ror     ebx,            1
+        xor     esi,            edx
+        lea     ebp,            DWORD PTR 1518500249[edi*1+ebp]
+        mov     edi,            ebx
+        add     esi,            ebp
+        xor     edi,            ecx
+        mov     ebp,            esi
+        and     edi,            eax
+        rol     ebp,            5
+        add     ebp,            edx
+        mov     edx,            DWORD PTR 28[esp]
+        ror     eax,            1
+        xor     edi,            ecx
+        ror     eax,            1
+        lea     ebp,            DWORD PTR 1518500249[edx*1+ebp]
+        add     edi,            ebp
+        ; 00_15 8
+        mov     edx,            eax
+        mov     ebp,            edi
+        xor     edx,            ebx
+        rol     ebp,            5
+        and     edx,            esi
+        add     ebp,            ecx
+        ror     esi,            1
+        mov     ecx,            DWORD PTR 32[esp]
+        ror     esi,            1
+        xor     edx,            ebx
+        lea     ebp,            DWORD PTR 1518500249[ecx*1+ebp]
+        mov     ecx,            esi
+        add     edx,            ebp
+        xor     ecx,            eax
+        mov     ebp,            edx
+        and     ecx,            edi
+        rol     ebp,            5
+        add     ebp,            ebx
+        mov     ebx,            DWORD PTR 36[esp]
+        ror     edi,            1
+        xor     ecx,            eax
+        ror     edi,            1
+        lea     ebp,            DWORD PTR 1518500249[ebx*1+ebp]
+        add     ecx,            ebp
+        ; 00_15 10
+        mov     ebx,            edi
+        mov     ebp,            ecx
+        xor     ebx,            esi
+        rol     ebp,            5
+        and     ebx,            edx
+        add     ebp,            eax
+        ror     edx,            1
+        mov     eax,            DWORD PTR 40[esp]
+        ror     edx,            1
+        xor     ebx,            esi
+        lea     ebp,            DWORD PTR 1518500249[eax*1+ebp]
+        mov     eax,            edx
+        add     ebx,            ebp
+        xor     eax,            edi
+        mov     ebp,            ebx
+        and     eax,            ecx
+        rol     ebp,            5
+        add     ebp,            esi
+        mov     esi,            DWORD PTR 44[esp]
+        ror     ecx,            1
+        xor     eax,            edi
+        ror     ecx,            1
+        lea     ebp,            DWORD PTR 1518500249[esi*1+ebp]
+        add     eax,            ebp
+        ; 00_15 12
+        mov     esi,            ecx
+        mov     ebp,            eax
+        xor     esi,            edx
+        rol     ebp,            5
+        and     esi,            ebx
+        add     ebp,            edi
+        ror     ebx,            1
+        mov     edi,            DWORD PTR 48[esp]
+        ror     ebx,            1
+        xor     esi,            edx
+        lea     ebp,            DWORD PTR 1518500249[edi*1+ebp]
+        mov     edi,            ebx
+        add     esi,            ebp
+        xor     edi,            ecx
+        mov     ebp,            esi
+        and     edi,            eax
+        rol     ebp,            5
+        add     ebp,            edx
+        mov     edx,            DWORD PTR 52[esp]
+        ror     eax,            1
+        xor     edi,            ecx
+        ror     eax,            1
+        lea     ebp,            DWORD PTR 1518500249[edx*1+ebp]
+        add     edi,            ebp
+        ; 00_15 14
+        mov     edx,            eax
+        mov     ebp,            edi
+        xor     edx,            ebx
+        rol     ebp,            5
+        and     edx,            esi
+        add     ebp,            ecx
+        ror     esi,            1
+        mov     ecx,            DWORD PTR 56[esp]
+        ror     esi,            1
+        xor     edx,            ebx
+        lea     ebp,            DWORD PTR 1518500249[ecx*1+ebp]
+        mov     ecx,            esi
+        add     edx,            ebp
+        xor     ecx,            eax
+        mov     ebp,            edx
+        and     ecx,            edi
+        rol     ebp,            5
+        add     ebp,            ebx
+        mov     ebx,            DWORD PTR 60[esp]
+        ror     edi,            1
+        xor     ecx,            eax
+        ror     edi,            1
+        lea     ebp,            DWORD PTR 1518500249[ebx*1+ebp]
+        add     ecx,            ebp
+        ; 16_19 16
+        nop
+        mov     ebp,            DWORD PTR [esp]
+        mov     ebx,            DWORD PTR 8[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edi
+        rol     ebx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR [esp],ebx
+        and     ebp,            edx
+        lea     ebx,            DWORD PTR 1518500249[eax*1+ebx]
+        xor     ebp,            esi
+        mov     eax,            ecx
+        add     ebx,            ebp
+        rol     eax,            5
+        ror     edx,            1
+        add     ebx,            eax
+        mov     eax,            DWORD PTR 4[esp]
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        ror     edx,            1
+        xor     eax,            ebp
+        rol     eax,            1
+        mov     ebp,            edx
+        xor     ebp,            edi
+        mov     DWORD PTR 4[esp],eax
+        and     ebp,            ecx
+        lea     eax,            DWORD PTR 1518500249[esi*1+eax]
+        xor     ebp,            edi
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     eax,            esi
+        ror     ecx,            1
+        add     eax,            ebp
+        ; 16_19 18
+        mov     ebp,            DWORD PTR 8[esp]
+        mov     esi,            DWORD PTR 16[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     esi,            ebp
+        mov     ebp,            ecx
+        rol     esi,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 8[esp],esi
+        and     ebp,            ebx
+        lea     esi,            DWORD PTR 1518500249[edi*1+esi]
+        xor     ebp,            edx
+        mov     edi,            eax
+        add     esi,            ebp
+        rol     edi,            5
+        ror     ebx,            1
+        add     esi,            edi
+        mov     edi,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        ror     ebx,            1
+        xor     edi,            ebp
+        rol     edi,            1
+        mov     ebp,            ebx
+        xor     ebp,            ecx
+        mov     DWORD PTR 12[esp],edi
+        and     ebp,            eax
+        lea     edi,            DWORD PTR 1518500249[edx*1+edi]
+        xor     ebp,            ecx
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edi,            edx
+        ror     eax,            1
+        add     edi,            ebp
+        ; 20_39 20
+        mov     edx,            DWORD PTR 16[esp]
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR 16[esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 1859775393[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 21
+        mov     ecx,            DWORD PTR 20[esp]
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 20[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 1859775393[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 20_39 22
+        mov     ebx,            DWORD PTR 24[esp]
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        xor     ebp,            edi
+        mov     DWORD PTR 24[esp],ebx
+        xor     ebp,            esi
+        lea     ebx,            DWORD PTR 1859775393[eax*1+ebx]
+        mov     eax,            ecx
+        rol     eax,            5
+        ror     edx,            1
+        add     eax,            ebp
+        ror     edx,            1
+        add     ebx,            eax
+        ; 20_39 23
+        mov     eax,            DWORD PTR 28[esp]
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     eax,            ebp
+        mov     ebp,            ecx
+        rol     eax,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 28[esp],eax
+        xor     ebp,            edi
+        lea     eax,            DWORD PTR 1859775393[esi*1+eax]
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     esi,            ebp
+        ror     ecx,            1
+        add     eax,            esi
+        ; 20_39 24
+        mov     esi,            DWORD PTR 32[esp]
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 32[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 1859775393[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 25
+        mov     edi,            DWORD PTR 36[esp]
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 36[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 1859775393[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edx,            ebp
+        ror     eax,            1
+        add     edi,            edx
+        ; 20_39 26
+        mov     edx,            DWORD PTR 40[esp]
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR 40[esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 1859775393[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 27
+        mov     ecx,            DWORD PTR 44[esp]
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 44[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 1859775393[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 20_39 28
+        mov     ebx,            DWORD PTR 48[esp]
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        xor     ebp,            edi
+        mov     DWORD PTR 48[esp],ebx
+        xor     ebp,            esi
+        lea     ebx,            DWORD PTR 1859775393[eax*1+ebx]
+        mov     eax,            ecx
+        rol     eax,            5
+        ror     edx,            1
+        add     eax,            ebp
+        ror     edx,            1
+        add     ebx,            eax
+        ; 20_39 29
+        mov     eax,            DWORD PTR 52[esp]
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     eax,            ebp
+        mov     ebp,            ecx
+        rol     eax,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 52[esp],eax
+        xor     ebp,            edi
+        lea     eax,            DWORD PTR 1859775393[esi*1+eax]
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     esi,            ebp
+        ror     ecx,            1
+        add     eax,            esi
+        ; 20_39 30
+        mov     esi,            DWORD PTR 56[esp]
+        mov     ebp,            DWORD PTR [esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 56[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 1859775393[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 31
+        mov     edi,            DWORD PTR 60[esp]
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 60[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 1859775393[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edx,            ebp
+        ror     eax,            1
+        add     edi,            edx
+        ; 20_39 32
+        mov     edx,            DWORD PTR [esp]
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR [esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 1859775393[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 33
+        mov     ecx,            DWORD PTR 4[esp]
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 4[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 1859775393[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 20_39 34
+        mov     ebx,            DWORD PTR 8[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        xor     ebp,            edi
+        mov     DWORD PTR 8[esp],ebx
+        xor     ebp,            esi
+        lea     ebx,            DWORD PTR 1859775393[eax*1+ebx]
+        mov     eax,            ecx
+        rol     eax,            5
+        ror     edx,            1
+        add     eax,            ebp
+        ror     edx,            1
+        add     ebx,            eax
+        ; 20_39 35
+        mov     eax,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        xor     eax,            ebp
+        mov     ebp,            ecx
+        rol     eax,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 12[esp],eax
+        xor     ebp,            edi
+        lea     eax,            DWORD PTR 1859775393[esi*1+eax]
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     esi,            ebp
+        ror     ecx,            1
+        add     eax,            esi
+        ; 20_39 36
+        mov     esi,            DWORD PTR 16[esp]
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 16[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 1859775393[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 37
+        mov     edi,            DWORD PTR 20[esp]
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 20[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 1859775393[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edx,            ebp
+        ror     eax,            1
+        add     edi,            edx
+        ; 20_39 38
+        mov     edx,            DWORD PTR 24[esp]
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR 24[esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 1859775393[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 39
+        mov     ecx,            DWORD PTR 28[esp]
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 28[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 1859775393[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 40_59 40
+        mov     ebx,            DWORD PTR 32[esp]
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        or      ebp,            edi
+        mov     DWORD PTR 32[esp],ebx
+        and     ebp,            esi
+        lea     ebx,            DWORD PTR 2400959708[eax*1+ebx]
+        mov     eax,            edx
+        ror     edx,            1
+        and     eax,            edi
+        or      ebp,            eax
+        mov     eax,            ecx
+        rol     eax,            5
+        add     ebp,            eax
+        mov     eax,            DWORD PTR 36[esp]
+        add     ebx,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        ror     edx,            1
+        xor     eax,            ebp
+        rol     eax,            1
+        mov     ebp,            ecx
+        mov     DWORD PTR 36[esp],eax
+        or      ebp,            edx
+        lea     eax,            DWORD PTR 2400959708[esi*1+eax]
+        mov     esi,            ecx
+        and     ebp,            edi
+        and     esi,            edx
+        or      ebp,            esi
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     ebp,            esi
+        ror     ecx,            1
+        add     eax,            ebp
+        ; 40_59 41
+        ; 40_59 42
+        mov     esi,            DWORD PTR 40[esp]
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        or      ebp,            ecx
+        mov     DWORD PTR 40[esp],esi
+        and     ebp,            edx
+        lea     esi,            DWORD PTR 2400959708[edi*1+esi]
+        mov     edi,            ebx
+        ror     ebx,            1
+        and     edi,            ecx
+        or      ebp,            edi
+        mov     edi,            eax
+        rol     edi,            5
+        add     ebp,            edi
+        mov     edi,            DWORD PTR 44[esp]
+        add     esi,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        ror     ebx,            1
+        xor     edi,            ebp
+        rol     edi,            1
+        mov     ebp,            eax
+        mov     DWORD PTR 44[esp],edi
+        or      ebp,            ebx
+        lea     edi,            DWORD PTR 2400959708[edx*1+edi]
+        mov     edx,            eax
+        and     ebp,            ecx
+        and     edx,            ebx
+        or      ebp,            edx
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     ebp,            edx
+        ror     eax,            1
+        add     edi,            ebp
+        ; 40_59 43
+        ; 40_59 44
+        mov     edx,            DWORD PTR 48[esp]
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        or      ebp,            eax
+        mov     DWORD PTR 48[esp],edx
+        and     ebp,            ebx
+        lea     edx,            DWORD PTR 2400959708[ecx*1+edx]
+        mov     ecx,            esi
+        ror     esi,            1
+        and     ecx,            eax
+        or      ebp,            ecx
+        mov     ecx,            edi
+        rol     ecx,            5
+        add     ebp,            ecx
+        mov     ecx,            DWORD PTR 52[esp]
+        add     edx,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        ror     esi,            1
+        xor     ecx,            ebp
+        rol     ecx,            1
+        mov     ebp,            edi
+        mov     DWORD PTR 52[esp],ecx
+        or      ebp,            esi
+        lea     ecx,            DWORD PTR 2400959708[ebx*1+ecx]
+        mov     ebx,            edi
+        and     ebp,            eax
+        and     ebx,            esi
+        or      ebp,            ebx
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebp,            ebx
+        ror     edi,            1
+        add     ecx,            ebp
+        ; 40_59 45
+        ; 40_59 46
+        mov     ebx,            DWORD PTR 56[esp]
+        mov     ebp,            DWORD PTR [esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        or      ebp,            edi
+        mov     DWORD PTR 56[esp],ebx
+        and     ebp,            esi
+        lea     ebx,            DWORD PTR 2400959708[eax*1+ebx]
+        mov     eax,            edx
+        ror     edx,            1
+        and     eax,            edi
+        or      ebp,            eax
+        mov     eax,            ecx
+        rol     eax,            5
+        add     ebp,            eax
+        mov     eax,            DWORD PTR 60[esp]
+        add     ebx,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        ror     edx,            1
+        xor     eax,            ebp
+        rol     eax,            1
+        mov     ebp,            ecx
+        mov     DWORD PTR 60[esp],eax
+        or      ebp,            edx
+        lea     eax,            DWORD PTR 2400959708[esi*1+eax]
+        mov     esi,            ecx
+        and     ebp,            edi
+        and     esi,            edx
+        or      ebp,            esi
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     ebp,            esi
+        ror     ecx,            1
+        add     eax,            ebp
+        ; 40_59 47
+        ; 40_59 48
+        mov     esi,            DWORD PTR [esp]
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        or      ebp,            ecx
+        mov     DWORD PTR [esp],esi
+        and     ebp,            edx
+        lea     esi,            DWORD PTR 2400959708[edi*1+esi]
+        mov     edi,            ebx
+        ror     ebx,            1
+        and     edi,            ecx
+        or      ebp,            edi
+        mov     edi,            eax
+        rol     edi,            5
+        add     ebp,            edi
+        mov     edi,            DWORD PTR 4[esp]
+        add     esi,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        ror     ebx,            1
+        xor     edi,            ebp
+        rol     edi,            1
+        mov     ebp,            eax
+        mov     DWORD PTR 4[esp],edi
+        or      ebp,            ebx
+        lea     edi,            DWORD PTR 2400959708[edx*1+edi]
+        mov     edx,            eax
+        and     ebp,            ecx
+        and     edx,            ebx
+        or      ebp,            edx
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     ebp,            edx
+        ror     eax,            1
+        add     edi,            ebp
+        ; 40_59 49
+        ; 40_59 50
+        mov     edx,            DWORD PTR 8[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        or      ebp,            eax
+        mov     DWORD PTR 8[esp],edx
+        and     ebp,            ebx
+        lea     edx,            DWORD PTR 2400959708[ecx*1+edx]
+        mov     ecx,            esi
+        ror     esi,            1
+        and     ecx,            eax
+        or      ebp,            ecx
+        mov     ecx,            edi
+        rol     ecx,            5
+        add     ebp,            ecx
+        mov     ecx,            DWORD PTR 12[esp]
+        add     edx,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        ror     esi,            1
+        xor     ecx,            ebp
+        rol     ecx,            1
+        mov     ebp,            edi
+        mov     DWORD PTR 12[esp],ecx
+        or      ebp,            esi
+        lea     ecx,            DWORD PTR 2400959708[ebx*1+ecx]
+        mov     ebx,            edi
+        and     ebp,            eax
+        and     ebx,            esi
+        or      ebp,            ebx
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebp,            ebx
+        ror     edi,            1
+        add     ecx,            ebp
+        ; 40_59 51
+        ; 40_59 52
+        mov     ebx,            DWORD PTR 16[esp]
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        or      ebp,            edi
+        mov     DWORD PTR 16[esp],ebx
+        and     ebp,            esi
+        lea     ebx,            DWORD PTR 2400959708[eax*1+ebx]
+        mov     eax,            edx
+        ror     edx,            1
+        and     eax,            edi
+        or      ebp,            eax
+        mov     eax,            ecx
+        rol     eax,            5
+        add     ebp,            eax
+        mov     eax,            DWORD PTR 20[esp]
+        add     ebx,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        ror     edx,            1
+        xor     eax,            ebp
+        rol     eax,            1
+        mov     ebp,            ecx
+        mov     DWORD PTR 20[esp],eax
+        or      ebp,            edx
+        lea     eax,            DWORD PTR 2400959708[esi*1+eax]
+        mov     esi,            ecx
+        and     ebp,            edi
+        and     esi,            edx
+        or      ebp,            esi
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     ebp,            esi
+        ror     ecx,            1
+        add     eax,            ebp
+        ; 40_59 53
+        ; 40_59 54
+        mov     esi,            DWORD PTR 24[esp]
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        or      ebp,            ecx
+        mov     DWORD PTR 24[esp],esi
+        and     ebp,            edx
+        lea     esi,            DWORD PTR 2400959708[edi*1+esi]
+        mov     edi,            ebx
+        ror     ebx,            1
+        and     edi,            ecx
+        or      ebp,            edi
+        mov     edi,            eax
+        rol     edi,            5
+        add     ebp,            edi
+        mov     edi,            DWORD PTR 28[esp]
+        add     esi,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        ror     ebx,            1
+        xor     edi,            ebp
+        rol     edi,            1
+        mov     ebp,            eax
+        mov     DWORD PTR 28[esp],edi
+        or      ebp,            ebx
+        lea     edi,            DWORD PTR 2400959708[edx*1+edi]
+        mov     edx,            eax
+        and     ebp,            ecx
+        and     edx,            ebx
+        or      ebp,            edx
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     ebp,            edx
+        ror     eax,            1
+        add     edi,            ebp
+        ; 40_59 55
+        ; 40_59 56
+        mov     edx,            DWORD PTR 32[esp]
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        or      ebp,            eax
+        mov     DWORD PTR 32[esp],edx
+        and     ebp,            ebx
+        lea     edx,            DWORD PTR 2400959708[ecx*1+edx]
+        mov     ecx,            esi
+        ror     esi,            1
+        and     ecx,            eax
+        or      ebp,            ecx
+        mov     ecx,            edi
+        rol     ecx,            5
+        add     ebp,            ecx
+        mov     ecx,            DWORD PTR 36[esp]
+        add     edx,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        ror     esi,            1
+        xor     ecx,            ebp
+        rol     ecx,            1
+        mov     ebp,            edi
+        mov     DWORD PTR 36[esp],ecx
+        or      ebp,            esi
+        lea     ecx,            DWORD PTR 2400959708[ebx*1+ecx]
+        mov     ebx,            edi
+        and     ebp,            eax
+        and     ebx,            esi
+        or      ebp,            ebx
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebp,            ebx
+        ror     edi,            1
+        add     ecx,            ebp
+        ; 40_59 57
+        ; 40_59 58
+        mov     ebx,            DWORD PTR 40[esp]
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        or      ebp,            edi
+        mov     DWORD PTR 40[esp],ebx
+        and     ebp,            esi
+        lea     ebx,            DWORD PTR 2400959708[eax*1+ebx]
+        mov     eax,            edx
+        ror     edx,            1
+        and     eax,            edi
+        or      ebp,            eax
+        mov     eax,            ecx
+        rol     eax,            5
+        add     ebp,            eax
+        mov     eax,            DWORD PTR 44[esp]
+        add     ebx,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        ror     edx,            1
+        xor     eax,            ebp
+        rol     eax,            1
+        mov     ebp,            ecx
+        mov     DWORD PTR 44[esp],eax
+        or      ebp,            edx
+        lea     eax,            DWORD PTR 2400959708[esi*1+eax]
+        mov     esi,            ecx
+        and     ebp,            edi
+        and     esi,            edx
+        or      ebp,            esi
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     ebp,            esi
+        ror     ecx,            1
+        add     eax,            ebp
+        ; 40_59 59
+        ; 20_39 60
+        mov     esi,            DWORD PTR 48[esp]
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 48[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 3395469782[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 61
+        mov     edi,            DWORD PTR 52[esp]
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 52[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 3395469782[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edx,            ebp
+        ror     eax,            1
+        add     edi,            edx
+        ; 20_39 62
+        mov     edx,            DWORD PTR 56[esp]
+        mov     ebp,            DWORD PTR [esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR 56[esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 3395469782[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 63
+        mov     ecx,            DWORD PTR 60[esp]
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 60[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 3395469782[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 20_39 64
+        mov     ebx,            DWORD PTR [esp]
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        xor     ebp,            edi
+        mov     DWORD PTR [esp],ebx
+        xor     ebp,            esi
+        lea     ebx,            DWORD PTR 3395469782[eax*1+ebx]
+        mov     eax,            ecx
+        rol     eax,            5
+        ror     edx,            1
+        add     eax,            ebp
+        ror     edx,            1
+        add     ebx,            eax
+        ; 20_39 65
+        mov     eax,            DWORD PTR 4[esp]
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     eax,            ebp
+        mov     ebp,            ecx
+        rol     eax,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 4[esp],eax
+        xor     ebp,            edi
+        lea     eax,            DWORD PTR 3395469782[esi*1+eax]
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     esi,            ebp
+        ror     ecx,            1
+        add     eax,            esi
+        ; 20_39 66
+        mov     esi,            DWORD PTR 8[esp]
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 8[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 3395469782[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 67
+        mov     edi,            DWORD PTR 12[esp]
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 12[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 3395469782[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edx,            ebp
+        ror     eax,            1
+        add     edi,            edx
+        ; 20_39 68
+        mov     edx,            DWORD PTR 16[esp]
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR 16[esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 3395469782[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 69
+        mov     ecx,            DWORD PTR 20[esp]
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 20[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 3395469782[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 20_39 70
+        mov     ebx,            DWORD PTR 24[esp]
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        xor     ebp,            edi
+        mov     DWORD PTR 24[esp],ebx
+        xor     ebp,            esi
+        lea     ebx,            DWORD PTR 3395469782[eax*1+ebx]
+        mov     eax,            ecx
+        rol     eax,            5
+        ror     edx,            1
+        add     eax,            ebp
+        ror     edx,            1
+        add     ebx,            eax
+        ; 20_39 71
+        mov     eax,            DWORD PTR 28[esp]
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     eax,            ebp
+        mov     ebp,            ecx
+        rol     eax,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 28[esp],eax
+        xor     ebp,            edi
+        lea     eax,            DWORD PTR 3395469782[esi*1+eax]
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     esi,            ebp
+        ror     ecx,            1
+        add     eax,            esi
+        ; 20_39 72
+        mov     esi,            DWORD PTR 32[esp]
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR [esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 32[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 3395469782[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 73
+        mov     edi,            DWORD PTR 36[esp]
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 36[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 3395469782[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        ror     eax,            1
+        add     edx,            ebp
+        ror     eax,            1
+        add     edi,            edx
+        ; 20_39 74
+        mov     edx,            DWORD PTR 40[esp]
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 8[esp]
+        xor     edx,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     edx,            ebp
+        mov     ebp,            esi
+        rol     edx,            1
+        xor     ebp,            eax
+        mov     DWORD PTR 40[esp],edx
+        xor     ebp,            ebx
+        lea     edx,            DWORD PTR 3395469782[ecx*1+edx]
+        mov     ecx,            edi
+        rol     ecx,            5
+        ror     esi,            1
+        add     ecx,            ebp
+        ror     esi,            1
+        add     edx,            ecx
+        ; 20_39 75
+        mov     ecx,            DWORD PTR 44[esp]
+        mov     ebp,            DWORD PTR 52[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 12[esp]
+        xor     ecx,            ebp
+        mov     ebp,            DWORD PTR 32[esp]
+        xor     ecx,            ebp
+        mov     ebp,            edi
+        rol     ecx,            1
+        xor     ebp,            esi
+        mov     DWORD PTR 44[esp],ecx
+        xor     ebp,            eax
+        lea     ecx,            DWORD PTR 3395469782[ebx*1+ecx]
+        mov     ebx,            edx
+        rol     ebx,            5
+        ror     edi,            1
+        add     ebx,            ebp
+        ror     edi,            1
+        add     ecx,            ebx
+        ; 20_39 76
+        mov     ebx,            DWORD PTR 48[esp]
+        mov     ebp,            DWORD PTR 56[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 16[esp]
+        xor     ebx,            ebp
+        mov     ebp,            DWORD PTR 36[esp]
+        xor     ebx,            ebp
+        mov     ebp,            edx
+        rol     ebx,            1
+        xor     ebp,            edi
+        mov     DWORD PTR 48[esp],ebx
+        xor     ebp,            esi
+        lea     ebx,            DWORD PTR 3395469782[eax*1+ebx]
+        mov     eax,            ecx
+        rol     eax,            5
+        ror     edx,            1
+        add     eax,            ebp
+        ror     edx,            1
+        add     ebx,            eax
+        ; 20_39 77
+        mov     eax,            DWORD PTR 52[esp]
+        mov     ebp,            DWORD PTR 60[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 20[esp]
+        xor     eax,            ebp
+        mov     ebp,            DWORD PTR 40[esp]
+        xor     eax,            ebp
+        mov     ebp,            ecx
+        rol     eax,            1
+        xor     ebp,            edx
+        mov     DWORD PTR 52[esp],eax
+        xor     ebp,            edi
+        lea     eax,            DWORD PTR 3395469782[esi*1+eax]
+        mov     esi,            ebx
+        rol     esi,            5
+        ror     ecx,            1
+        add     esi,            ebp
+        ror     ecx,            1
+        add     eax,            esi
+        ; 20_39 78
+        mov     esi,            DWORD PTR 56[esp]
+        mov     ebp,            DWORD PTR [esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 24[esp]
+        xor     esi,            ebp
+        mov     ebp,            DWORD PTR 44[esp]
+        xor     esi,            ebp
+        mov     ebp,            ebx
+        rol     esi,            1
+        xor     ebp,            ecx
+        mov     DWORD PTR 56[esp],esi
+        xor     ebp,            edx
+        lea     esi,            DWORD PTR 3395469782[edi*1+esi]
+        mov     edi,            eax
+        rol     edi,            5
+        ror     ebx,            1
+        add     edi,            ebp
+        ror     ebx,            1
+        add     esi,            edi
+        ; 20_39 79
+        mov     edi,            DWORD PTR 60[esp]
+        mov     ebp,            DWORD PTR 4[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 28[esp]
+        xor     edi,            ebp
+        mov     ebp,            DWORD PTR 48[esp]
+        xor     edi,            ebp
+        mov     ebp,            eax
+        rol     edi,            1
+        xor     ebp,            ebx
+        mov     DWORD PTR 60[esp],edi
+        xor     ebp,            ecx
+        lea     edi,            DWORD PTR 3395469782[edx*1+edi]
+        mov     edx,            esi
+        rol     edx,            5
+        add     edx,            ebp
+        mov     ebp,            DWORD PTR 92[esp]
+        ror     eax,            1
+        add     edi,            edx
+        ror     eax,            1
+        ; End processing
+        ; 
+        mov     edx,            DWORD PTR 12[ebp]
+        add     edx,            ebx
+        mov     ebx,            DWORD PTR 4[ebp]
+        add     ebx,            esi
+        mov     esi,            eax
+        mov     eax,            DWORD PTR [ebp]
+        mov     DWORD PTR 12[ebp],edx
+        add     eax,            edi
+        mov     edi,            DWORD PTR 16[ebp]
+        add     edi,            ecx
+        mov     ecx,            DWORD PTR 8[ebp]
+        add     ecx,            esi
+        mov     DWORD PTR [ebp],eax
+        mov     esi,            DWORD PTR 64[esp]
+        mov     DWORD PTR 8[ebp],ecx
+        add     esi,            64
+        mov     eax,            DWORD PTR 68[esp]
+        mov     DWORD PTR 16[ebp],edi
+        cmp     eax,            esi
+        mov     DWORD PTR 4[ebp],ebx
+        jl      $L001end
+        mov     eax,            DWORD PTR [esi]
+        jmp     L000start
+$L001end:
+        add     esp,            72
+        pop     edi
+        pop     ebx
+        pop     ebp
+        pop     esi
+        ret
+_sha1_block_x86 ENDP
+_TEXT   ENDS
+END
diff --git a/src/lib/libcrypto/sha/asm/sx86unix.cpp b/src/lib/libcrypto/sha/asm/sx86unix.cpp
new file mode 100644
index 0000000000..8366664a39
--- /dev/null
+++ b/src/lib/libcrypto/sha/asm/sx86unix.cpp
@@ -0,0 +1,1948 @@
+/* Run the C pre-processor over this file with one of the following defined
+ * ELF - elf object files,
+ * OUT - a.out object files,
+ * BSDI - BSDI style a.out object files
+ * SOL - Solaris style elf
+ */
+
+#define TYPE(a,b)       .type   a,b
+#define SIZE(a,b)       .size   a,b
+
+#if defined(OUT) || defined(BSDI)
+#define sha1_block_x86 _sha1_block_x86
+
+#endif
+
+#ifdef OUT
+#define OK      1
+#define ALIGN   4
+#endif
+
+#ifdef BSDI
+#define OK              1
+#define ALIGN           4
+#undef SIZE
+#undef TYPE
+#define SIZE(a,b)
+#define TYPE(a,b)
+#endif
+
+#if defined(ELF) || defined(SOL)
+#define OK              1
+#define ALIGN           16
+#endif
+
+#ifndef OK
+You need to define one of
+ELF - elf systems - linux-elf, NetBSD and DG-UX
+OUT - a.out systems - linux-a.out and FreeBSD
+SOL - solaris systems, which are elf with strange comment lines
+BSDI - a.out with a very primative version of as.
+#endif
+
+/* Let the Assembler begin :-) */
+        /* Don't even think of reading this code */
+        /* It was automatically generated by sha1-586.pl */
+        /* Which is a perl program used to generate the x86 assember for */
+        /* any of elf, a.out, BSDI,Win32, or Solaris */
+        /* eric <eay@cryptsoft.com> */
+
+        .file   "sha1-586.s"
+        .version        "01.01"
+gcc2_compiled.:
+.text
+        .align ALIGN
+.globl sha1_block_x86
+        TYPE(sha1_block_x86,@function)
+sha1_block_x86:
+        pushl   %esi
+        pushl   %ebp
+        movl    20(%esp),       %eax
+        movl    16(%esp),       %esi
+        addl    %esi,           %eax
+        movl    12(%esp),       %ebp
+        pushl   %ebx
+        subl    $64,            %eax
+        pushl   %edi
+        movl    4(%ebp),        %ebx
+        subl    $72,            %esp
+        movl    12(%ebp),       %edx
+        movl    16(%ebp),       %edi
+        movl    8(%ebp),        %ecx
+        movl    %eax,           68(%esp)
+        /* First we need to setup the X array */
+        movl    (%esi),         %eax
+.L000start:
+        /* First, load the words onto the stack in network byte order */
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           (%esp)
+        movl    4(%esi),        %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           4(%esp)
+        movl    8(%esi),        %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           8(%esp)
+        movl    12(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           12(%esp)
+        movl    16(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           16(%esp)
+        movl    20(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           20(%esp)
+        movl    24(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           24(%esp)
+        movl    28(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           28(%esp)
+        movl    32(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           32(%esp)
+        movl    36(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           36(%esp)
+        movl    40(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           40(%esp)
+        movl    44(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           44(%esp)
+        movl    48(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           48(%esp)
+        movl    52(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           52(%esp)
+        movl    56(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           56(%esp)
+        movl    60(%esi),       %eax
+.byte 15
+.byte 200               /* bswapl  %eax */
+        movl    %eax,           60(%esp)
+        /* We now have the X array on the stack */
+        /* starting at sp-4 */
+        movl    %esi,           64(%esp)
+
+        /* Start processing */
+        movl    (%ebp),         %eax
+        /* 00_15 0 */
+        movl    %ecx,           %esi
+        movl    %eax,           %ebp
+        xorl    %edx,           %esi
+        roll    $5,             %ebp
+        andl    %ebx,           %esi
+        addl    %edi,           %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        movl    (%esp),         %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %edx,           %esi
+        leal    1518500249(%ebp,%edi,1),%ebp
+        movl    %ebx,           %edi
+        addl    %ebp,           %esi
+        xorl    %ecx,           %edi
+        movl    %esi,           %ebp
+        andl    %eax,           %edi
+        roll    $5,             %ebp
+        addl    %edx,           %ebp
+        movl    4(%esp),        %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        xorl    %ecx,           %edi
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        leal    1518500249(%ebp,%edx,1),%ebp
+        addl    %ebp,           %edi
+        /* 00_15 2 */
+        movl    %eax,           %edx
+        movl    %edi,           %ebp
+        xorl    %ebx,           %edx
+        roll    $5,             %ebp
+        andl    %esi,           %edx
+        addl    %ecx,           %ebp
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        movl    8(%esp),        %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        xorl    %ebx,           %edx
+        leal    1518500249(%ebp,%ecx,1),%ebp
+        movl    %esi,           %ecx
+        addl    %ebp,           %edx
+        xorl    %eax,           %ecx
+        movl    %edx,           %ebp
+        andl    %edi,           %ecx
+        roll    $5,             %ebp
+        addl    %ebx,           %ebp
+        movl    12(%esp),       %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        xorl    %eax,           %ecx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        leal    1518500249(%ebp,%ebx,1),%ebp
+        addl    %ebp,           %ecx
+        /* 00_15 4 */
+        movl    %edi,           %ebx
+        movl    %ecx,           %ebp
+        xorl    %esi,           %ebx
+        roll    $5,             %ebp
+        andl    %edx,           %ebx
+        addl    %eax,           %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        movl    16(%esp),       %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %esi,           %ebx
+        leal    1518500249(%ebp,%eax,1),%ebp
+        movl    %edx,           %eax
+        addl    %ebp,           %ebx
+        xorl    %edi,           %eax
+        movl    %ebx,           %ebp
+        andl    %ecx,           %eax
+        roll    $5,             %ebp
+        addl    %esi,           %ebp
+        movl    20(%esp),       %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        xorl    %edi,           %eax
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        leal    1518500249(%ebp,%esi,1),%ebp
+        addl    %ebp,           %eax
+        /* 00_15 6 */
+        movl    %ecx,           %esi
+        movl    %eax,           %ebp
+        xorl    %edx,           %esi
+        roll    $5,             %ebp
+        andl    %ebx,           %esi
+        addl    %edi,           %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        movl    24(%esp),       %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %edx,           %esi
+        leal    1518500249(%ebp,%edi,1),%ebp
+        movl    %ebx,           %edi
+        addl    %ebp,           %esi
+        xorl    %ecx,           %edi
+        movl    %esi,           %ebp
+        andl    %eax,           %edi
+        roll    $5,             %ebp
+        addl    %edx,           %ebp
+        movl    28(%esp),       %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        xorl    %ecx,           %edi
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        leal    1518500249(%ebp,%edx,1),%ebp
+        addl    %ebp,           %edi
+        /* 00_15 8 */
+        movl    %eax,           %edx
+        movl    %edi,           %ebp
+        xorl    %ebx,           %edx
+        roll    $5,             %ebp
+        andl    %esi,           %edx
+        addl    %ecx,           %ebp
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        movl    32(%esp),       %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        xorl    %ebx,           %edx
+        leal    1518500249(%ebp,%ecx,1),%ebp
+        movl    %esi,           %ecx
+        addl    %ebp,           %edx
+        xorl    %eax,           %ecx
+        movl    %edx,           %ebp
+        andl    %edi,           %ecx
+        roll    $5,             %ebp
+        addl    %ebx,           %ebp
+        movl    36(%esp),       %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        xorl    %eax,           %ecx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        leal    1518500249(%ebp,%ebx,1),%ebp
+        addl    %ebp,           %ecx
+        /* 00_15 10 */
+        movl    %edi,           %ebx
+        movl    %ecx,           %ebp
+        xorl    %esi,           %ebx
+        roll    $5,             %ebp
+        andl    %edx,           %ebx
+        addl    %eax,           %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        movl    40(%esp),       %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %esi,           %ebx
+        leal    1518500249(%ebp,%eax,1),%ebp
+        movl    %edx,           %eax
+        addl    %ebp,           %ebx
+        xorl    %edi,           %eax
+        movl    %ebx,           %ebp
+        andl    %ecx,           %eax
+        roll    $5,             %ebp
+        addl    %esi,           %ebp
+        movl    44(%esp),       %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        xorl    %edi,           %eax
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        leal    1518500249(%ebp,%esi,1),%ebp
+        addl    %ebp,           %eax
+        /* 00_15 12 */
+        movl    %ecx,           %esi
+        movl    %eax,           %ebp
+        xorl    %edx,           %esi
+        roll    $5,             %ebp
+        andl    %ebx,           %esi
+        addl    %edi,           %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        movl    48(%esp),       %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %edx,           %esi
+        leal    1518500249(%ebp,%edi,1),%ebp
+        movl    %ebx,           %edi
+        addl    %ebp,           %esi
+        xorl    %ecx,           %edi
+        movl    %esi,           %ebp
+        andl    %eax,           %edi
+        roll    $5,             %ebp
+        addl    %edx,           %ebp
+        movl    52(%esp),       %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        xorl    %ecx,           %edi
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        leal    1518500249(%ebp,%edx,1),%ebp
+        addl    %ebp,           %edi
+        /* 00_15 14 */
+        movl    %eax,           %edx
+        movl    %edi,           %ebp
+        xorl    %ebx,           %edx
+        roll    $5,             %ebp
+        andl    %esi,           %edx
+        addl    %ecx,           %ebp
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        movl    56(%esp),       %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        xorl    %ebx,           %edx
+        leal    1518500249(%ebp,%ecx,1),%ebp
+        movl    %esi,           %ecx
+        addl    %ebp,           %edx
+        xorl    %eax,           %ecx
+        movl    %edx,           %ebp
+        andl    %edi,           %ecx
+        roll    $5,             %ebp
+        addl    %ebx,           %ebp
+        movl    60(%esp),       %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        xorl    %eax,           %ecx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        leal    1518500249(%ebp,%ebx,1),%ebp
+        addl    %ebp,           %ecx
+        /* 16_19 16 */
+        nop
+        movl    (%esp),         %ebp
+        movl    8(%esp),        %ebx
+        xorl    %ebp,           %ebx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edi,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %esi,           %ebp
+        movl    %ebx,           (%esp)
+        andl    %edx,           %ebp
+        leal    1518500249(%ebx,%eax,1),%ebx
+        xorl    %esi,           %ebp
+        movl    %ecx,           %eax
+        addl    %ebp,           %ebx
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        movl    4(%esp),        %eax
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    56(%esp),       %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %ebp,           %eax
+.byte 209
+.byte 192               /* roll $1 %eax */
+        movl    %edx,           %ebp
+        xorl    %edi,           %ebp
+        movl    %eax,           4(%esp)
+        andl    %ecx,           %ebp
+        leal    1518500249(%eax,%esi,1),%eax
+        xorl    %edi,           %ebp
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %eax
+        /* 16_19 18 */
+        movl    8(%esp),        %ebp
+        movl    16(%esp),       %esi
+        xorl    %ebp,           %esi
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ecx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %edx,           %ebp
+        movl    %esi,           8(%esp)
+        andl    %ebx,           %ebp
+        leal    1518500249(%esi,%edi,1),%esi
+        xorl    %edx,           %ebp
+        movl    %eax,           %edi
+        addl    %ebp,           %esi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        movl    12(%esp),       %edi
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    (%esp),         %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %ebp,           %edi
+.byte 209
+.byte 199               /* roll $1 %edi */
+        movl    %ebx,           %ebp
+        xorl    %ecx,           %ebp
+        movl    %edi,           12(%esp)
+        andl    %eax,           %ebp
+        leal    1518500249(%edi,%edx,1),%edi
+        xorl    %ecx,           %ebp
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edi
+        /* 20_39 20 */
+        movl    16(%esp),       %edx
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           16(%esp)
+        xorl    %ebx,           %ebp
+        leal    1859775393(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 21 */
+        movl    20(%esp),       %ecx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           20(%esp)
+        xorl    %eax,           %ebp
+        leal    1859775393(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 20_39 22 */
+        movl    24(%esp),       %ebx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %edi,           %ebp
+        movl    %ebx,           24(%esp)
+        xorl    %esi,           %ebp
+        leal    1859775393(%ebx,%eax,1),%ebx
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %ebp,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        /* 20_39 23 */
+        movl    28(%esp),       %eax
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    %ecx,           %ebp
+.byte 209
+.byte 192               /* roll $1 %eax */
+        xorl    %edx,           %ebp
+        movl    %eax,           28(%esp)
+        xorl    %edi,           %ebp
+        leal    1859775393(%eax,%esi,1),%eax
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+        /* 20_39 24 */
+        movl    32(%esp),       %esi
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %esi
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           32(%esp)
+        xorl    %edx,           %ebp
+        leal    1859775393(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 25 */
+        movl    36(%esp),       %edi
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           36(%esp)
+        xorl    %ecx,           %ebp
+        leal    1859775393(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+        /* 20_39 26 */
+        movl    40(%esp),       %edx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %edx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           40(%esp)
+        xorl    %ebx,           %ebp
+        leal    1859775393(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 27 */
+        movl    44(%esp),       %ecx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           44(%esp)
+        xorl    %eax,           %ebp
+        leal    1859775393(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 20_39 28 */
+        movl    48(%esp),       %ebx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %edi,           %ebp
+        movl    %ebx,           48(%esp)
+        xorl    %esi,           %ebp
+        leal    1859775393(%ebx,%eax,1),%ebx
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %ebp,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        /* 20_39 29 */
+        movl    52(%esp),       %eax
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    %ecx,           %ebp
+.byte 209
+.byte 192               /* roll $1 %eax */
+        xorl    %edx,           %ebp
+        movl    %eax,           52(%esp)
+        xorl    %edi,           %ebp
+        leal    1859775393(%eax,%esi,1),%eax
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+        /* 20_39 30 */
+        movl    56(%esp),       %esi
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           56(%esp)
+        xorl    %edx,           %ebp
+        leal    1859775393(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 31 */
+        movl    60(%esp),       %edi
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           60(%esp)
+        xorl    %ecx,           %ebp
+        leal    1859775393(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+        /* 20_39 32 */
+        movl    (%esp),         %edx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %edx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           (%esp)
+        xorl    %ebx,           %ebp
+        leal    1859775393(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 33 */
+        movl    4(%esp),        %ecx
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           4(%esp)
+        xorl    %eax,           %ebp
+        leal    1859775393(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 20_39 34 */
+        movl    8(%esp),        %ebx
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %edi,           %ebp
+        movl    %ebx,           8(%esp)
+        xorl    %esi,           %ebp
+        leal    1859775393(%ebx,%eax,1),%ebx
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %ebp,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        /* 20_39 35 */
+        movl    12(%esp),       %eax
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %eax
+        movl    %ecx,           %ebp
+.byte 209
+.byte 192               /* roll $1 %eax */
+        xorl    %edx,           %ebp
+        movl    %eax,           12(%esp)
+        xorl    %edi,           %ebp
+        leal    1859775393(%eax,%esi,1),%eax
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+        /* 20_39 36 */
+        movl    16(%esp),       %esi
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           16(%esp)
+        xorl    %edx,           %ebp
+        leal    1859775393(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 37 */
+        movl    20(%esp),       %edi
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           20(%esp)
+        xorl    %ecx,           %ebp
+        leal    1859775393(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+        /* 20_39 38 */
+        movl    24(%esp),       %edx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           24(%esp)
+        xorl    %ebx,           %ebp
+        leal    1859775393(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 39 */
+        movl    28(%esp),       %ecx
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           28(%esp)
+        xorl    %eax,           %ebp
+        leal    1859775393(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 40_59 40 */
+        movl    32(%esp),       %ebx
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %ebx
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        orl     %edi,           %ebp
+        movl    %ebx,           32(%esp)
+        andl    %esi,           %ebp
+        leal    2400959708(%ebx,%eax,1),%ebx
+        movl    %edx,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        andl    %edi,           %eax
+        orl     %eax,           %ebp
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+        addl    %eax,           %ebp
+        movl    36(%esp),       %eax
+        addl    %ebp,           %ebx
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %eax
+        movl    24(%esp),       %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %ebp,           %eax
+.byte 209
+.byte 192               /* roll $1 %eax */
+        movl    %ecx,           %ebp
+        movl    %eax,           36(%esp)
+        orl     %edx,           %ebp
+        leal    2400959708(%eax,%esi,1),%eax
+        movl    %ecx,           %esi
+        andl    %edi,           %ebp
+        andl    %edx,           %esi
+        orl     %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %ebp
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %eax
+        /* 40_59 41 */
+        /* 40_59 42 */
+        movl    40(%esp),       %esi
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %esi
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        orl     %ecx,           %ebp
+        movl    %esi,           40(%esp)
+        andl    %edx,           %ebp
+        leal    2400959708(%esi,%edi,1),%esi
+        movl    %ebx,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        andl    %ecx,           %edi
+        orl     %edi,           %ebp
+        movl    %eax,           %edi
+        roll    $5,             %edi
+        addl    %edi,           %ebp
+        movl    44(%esp),       %edi
+        addl    %ebp,           %esi
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    32(%esp),       %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %ebp,           %edi
+.byte 209
+.byte 199               /* roll $1 %edi */
+        movl    %eax,           %ebp
+        movl    %edi,           44(%esp)
+        orl     %ebx,           %ebp
+        leal    2400959708(%edi,%edx,1),%edi
+        movl    %eax,           %edx
+        andl    %ecx,           %ebp
+        andl    %ebx,           %edx
+        orl     %edx,           %ebp
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %ebp
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edi
+        /* 40_59 43 */
+        /* 40_59 44 */
+        movl    48(%esp),       %edx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        orl     %eax,           %ebp
+        movl    %edx,           48(%esp)
+        andl    %ebx,           %ebp
+        leal    2400959708(%edx,%ecx,1),%edx
+        movl    %esi,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        andl    %eax,           %ecx
+        orl     %ecx,           %ebp
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+        addl    %ecx,           %ebp
+        movl    52(%esp),       %ecx
+        addl    %ebp,           %edx
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    40(%esp),       %ebp
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        xorl    %ebp,           %ecx
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        movl    %edi,           %ebp
+        movl    %ecx,           52(%esp)
+        orl     %esi,           %ebp
+        leal    2400959708(%ecx,%ebx,1),%ecx
+        movl    %edi,           %ebx
+        andl    %eax,           %ebp
+        andl    %esi,           %ebx
+        orl     %ebx,           %ebp
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ebp
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ecx
+        /* 40_59 45 */
+        /* 40_59 46 */
+        movl    56(%esp),       %ebx
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %ebx
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        orl     %edi,           %ebp
+        movl    %ebx,           56(%esp)
+        andl    %esi,           %ebp
+        leal    2400959708(%ebx,%eax,1),%ebx
+        movl    %edx,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        andl    %edi,           %eax
+        orl     %eax,           %ebp
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+        addl    %eax,           %ebp
+        movl    60(%esp),       %eax
+        addl    %ebp,           %ebx
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %eax
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    48(%esp),       %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %ebp,           %eax
+.byte 209
+.byte 192               /* roll $1 %eax */
+        movl    %ecx,           %ebp
+        movl    %eax,           60(%esp)
+        orl     %edx,           %ebp
+        leal    2400959708(%eax,%esi,1),%eax
+        movl    %ecx,           %esi
+        andl    %edi,           %ebp
+        andl    %edx,           %esi
+        orl     %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %ebp
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %eax
+        /* 40_59 47 */
+        /* 40_59 48 */
+        movl    (%esp),         %esi
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %esi
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        orl     %ecx,           %ebp
+        movl    %esi,           (%esp)
+        andl    %edx,           %ebp
+        leal    2400959708(%esi,%edi,1),%esi
+        movl    %ebx,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        andl    %ecx,           %edi
+        orl     %edi,           %ebp
+        movl    %eax,           %edi
+        roll    $5,             %edi
+        addl    %edi,           %ebp
+        movl    4(%esp),        %edi
+        addl    %ebp,           %esi
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    56(%esp),       %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %ebp,           %edi
+.byte 209
+.byte 199               /* roll $1 %edi */
+        movl    %eax,           %ebp
+        movl    %edi,           4(%esp)
+        orl     %ebx,           %ebp
+        leal    2400959708(%edi,%edx,1),%edi
+        movl    %eax,           %edx
+        andl    %ecx,           %ebp
+        andl    %ebx,           %edx
+        orl     %edx,           %ebp
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %ebp
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edi
+        /* 40_59 49 */
+        /* 40_59 50 */
+        movl    8(%esp),        %edx
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        orl     %eax,           %ebp
+        movl    %edx,           8(%esp)
+        andl    %ebx,           %ebp
+        leal    2400959708(%edx,%ecx,1),%edx
+        movl    %esi,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        andl    %eax,           %ecx
+        orl     %ecx,           %ebp
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+        addl    %ecx,           %ebp
+        movl    12(%esp),       %ecx
+        addl    %ebp,           %edx
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    (%esp),         %ebp
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        xorl    %ebp,           %ecx
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        movl    %edi,           %ebp
+        movl    %ecx,           12(%esp)
+        orl     %esi,           %ebp
+        leal    2400959708(%ecx,%ebx,1),%ecx
+        movl    %edi,           %ebx
+        andl    %eax,           %ebp
+        andl    %esi,           %ebx
+        orl     %ebx,           %ebp
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ebp
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ecx
+        /* 40_59 51 */
+        /* 40_59 52 */
+        movl    16(%esp),       %ebx
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        orl     %edi,           %ebp
+        movl    %ebx,           16(%esp)
+        andl    %esi,           %ebp
+        leal    2400959708(%ebx,%eax,1),%ebx
+        movl    %edx,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        andl    %edi,           %eax
+        orl     %eax,           %ebp
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+        addl    %eax,           %ebp
+        movl    20(%esp),       %eax
+        addl    %ebp,           %ebx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    8(%esp),        %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %ebp,           %eax
+.byte 209
+.byte 192               /* roll $1 %eax */
+        movl    %ecx,           %ebp
+        movl    %eax,           20(%esp)
+        orl     %edx,           %ebp
+        leal    2400959708(%eax,%esi,1),%eax
+        movl    %ecx,           %esi
+        andl    %edi,           %ebp
+        andl    %edx,           %esi
+        orl     %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %ebp
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %eax
+        /* 40_59 53 */
+        /* 40_59 54 */
+        movl    24(%esp),       %esi
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        orl     %ecx,           %ebp
+        movl    %esi,           24(%esp)
+        andl    %edx,           %ebp
+        leal    2400959708(%esi,%edi,1),%esi
+        movl    %ebx,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        andl    %ecx,           %edi
+        orl     %edi,           %ebp
+        movl    %eax,           %edi
+        roll    $5,             %edi
+        addl    %edi,           %ebp
+        movl    28(%esp),       %edi
+        addl    %ebp,           %esi
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    16(%esp),       %ebp
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        xorl    %ebp,           %edi
+.byte 209
+.byte 199               /* roll $1 %edi */
+        movl    %eax,           %ebp
+        movl    %edi,           28(%esp)
+        orl     %ebx,           %ebp
+        leal    2400959708(%edi,%edx,1),%edi
+        movl    %eax,           %edx
+        andl    %ecx,           %ebp
+        andl    %ebx,           %edx
+        orl     %edx,           %ebp
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %ebp
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edi
+        /* 40_59 55 */
+        /* 40_59 56 */
+        movl    32(%esp),       %edx
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %edx
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        orl     %eax,           %ebp
+        movl    %edx,           32(%esp)
+        andl    %ebx,           %ebp
+        leal    2400959708(%edx,%ecx,1),%edx
+        movl    %esi,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        andl    %eax,           %ecx
+        orl     %ecx,           %ebp
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+        addl    %ecx,           %ebp
+        movl    36(%esp),       %ecx
+        addl    %ebp,           %edx
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %ecx
+        movl    24(%esp),       %ebp
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        xorl    %ebp,           %ecx
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        movl    %edi,           %ebp
+        movl    %ecx,           36(%esp)
+        orl     %esi,           %ebp
+        leal    2400959708(%ecx,%ebx,1),%ecx
+        movl    %edi,           %ebx
+        andl    %eax,           %ebp
+        andl    %esi,           %ebx
+        orl     %ebx,           %ebp
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ebp
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ecx
+        /* 40_59 57 */
+        /* 40_59 58 */
+        movl    40(%esp),       %ebx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %ebx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        orl     %edi,           %ebp
+        movl    %ebx,           40(%esp)
+        andl    %esi,           %ebp
+        leal    2400959708(%ebx,%eax,1),%ebx
+        movl    %edx,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        andl    %edi,           %eax
+        orl     %eax,           %ebp
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+        addl    %eax,           %ebp
+        movl    44(%esp),       %eax
+        addl    %ebp,           %ebx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    32(%esp),       %ebp
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        xorl    %ebp,           %eax
+.byte 209
+.byte 192               /* roll $1 %eax */
+        movl    %ecx,           %ebp
+        movl    %eax,           44(%esp)
+        orl     %edx,           %ebp
+        leal    2400959708(%eax,%esi,1),%eax
+        movl    %ecx,           %esi
+        andl    %edi,           %ebp
+        andl    %edx,           %esi
+        orl     %esi,           %ebp
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %ebp
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %eax
+        /* 40_59 59 */
+        /* 20_39 60 */
+        movl    48(%esp),       %esi
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           48(%esp)
+        xorl    %edx,           %ebp
+        leal    3395469782(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 61 */
+        movl    52(%esp),       %edi
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           52(%esp)
+        xorl    %ecx,           %ebp
+        leal    3395469782(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+        /* 20_39 62 */
+        movl    56(%esp),       %edx
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %edx
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           56(%esp)
+        xorl    %ebx,           %ebp
+        leal    3395469782(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 63 */
+        movl    60(%esp),       %ecx
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %ecx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           60(%esp)
+        xorl    %eax,           %ebp
+        leal    3395469782(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 20_39 64 */
+        movl    (%esp),         %ebx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %ebx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %edi,           %ebp
+        movl    %ebx,           (%esp)
+        xorl    %esi,           %ebp
+        leal    3395469782(%ebx,%eax,1),%ebx
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %ebp,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        /* 20_39 65 */
+        movl    4(%esp),        %eax
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    %ecx,           %ebp
+.byte 209
+.byte 192               /* roll $1 %eax */
+        xorl    %edx,           %ebp
+        movl    %eax,           4(%esp)
+        xorl    %edi,           %ebp
+        leal    3395469782(%eax,%esi,1),%eax
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+        /* 20_39 66 */
+        movl    8(%esp),        %esi
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           8(%esp)
+        xorl    %edx,           %ebp
+        leal    3395469782(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 67 */
+        movl    12(%esp),       %edi
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           12(%esp)
+        xorl    %ecx,           %ebp
+        leal    3395469782(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+        /* 20_39 68 */
+        movl    16(%esp),       %edx
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           16(%esp)
+        xorl    %ebx,           %ebp
+        leal    3395469782(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 69 */
+        movl    20(%esp),       %ecx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           20(%esp)
+        xorl    %eax,           %ebp
+        leal    3395469782(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 20_39 70 */
+        movl    24(%esp),       %ebx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %edi,           %ebp
+        movl    %ebx,           24(%esp)
+        xorl    %esi,           %ebp
+        leal    3395469782(%ebx,%eax,1),%ebx
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %ebp,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        /* 20_39 71 */
+        movl    28(%esp),       %eax
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    %ecx,           %ebp
+.byte 209
+.byte 192               /* roll $1 %eax */
+        xorl    %edx,           %ebp
+        movl    %eax,           28(%esp)
+        xorl    %edi,           %ebp
+        leal    3395469782(%eax,%esi,1),%eax
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+        /* 20_39 72 */
+        movl    32(%esp),       %esi
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %esi
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           32(%esp)
+        xorl    %edx,           %ebp
+        leal    3395469782(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 73 */
+        movl    36(%esp),       %edi
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %edi
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           36(%esp)
+        xorl    %ecx,           %ebp
+        leal    3395469782(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %ebp,           %edx
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+        /* 20_39 74 */
+        movl    40(%esp),       %edx
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    8(%esp),        %ebp
+        xorl    %ebp,           %edx
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %edx
+        movl    %esi,           %ebp
+.byte 209
+.byte 194               /* roll $1 %edx */
+        xorl    %eax,           %ebp
+        movl    %edx,           40(%esp)
+        xorl    %ebx,           %ebp
+        leal    3395469782(%edx,%ecx,1),%edx
+        movl    %edi,           %ecx
+        roll    $5,             %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ebp,           %ecx
+.byte 209
+.byte 206               /* rorl $1 %esi */
+        addl    %ecx,           %edx
+        /* 20_39 75 */
+        movl    44(%esp),       %ecx
+        movl    52(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    12(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    32(%esp),       %ebp
+        xorl    %ebp,           %ecx
+        movl    %edi,           %ebp
+.byte 209
+.byte 193               /* roll $1 %ecx */
+        xorl    %esi,           %ebp
+        movl    %ecx,           44(%esp)
+        xorl    %eax,           %ebp
+        leal    3395469782(%ecx,%ebx,1),%ecx
+        movl    %edx,           %ebx
+        roll    $5,             %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebp,           %ebx
+.byte 209
+.byte 207               /* rorl $1 %edi */
+        addl    %ebx,           %ecx
+        /* 20_39 76 */
+        movl    48(%esp),       %ebx
+        movl    56(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    16(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    36(%esp),       %ebp
+        xorl    %ebp,           %ebx
+        movl    %edx,           %ebp
+.byte 209
+.byte 195               /* roll $1 %ebx */
+        xorl    %edi,           %ebp
+        movl    %ebx,           48(%esp)
+        xorl    %esi,           %ebp
+        leal    3395469782(%ebx,%eax,1),%ebx
+        movl    %ecx,           %eax
+        roll    $5,             %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %ebp,           %eax
+.byte 209
+.byte 202               /* rorl $1 %edx */
+        addl    %eax,           %ebx
+        /* 20_39 77 */
+        movl    52(%esp),       %eax
+        movl    60(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    20(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    40(%esp),       %ebp
+        xorl    %ebp,           %eax
+        movl    %ecx,           %ebp
+.byte 209
+.byte 192               /* roll $1 %eax */
+        xorl    %edx,           %ebp
+        movl    %eax,           52(%esp)
+        xorl    %edi,           %ebp
+        leal    3395469782(%eax,%esi,1),%eax
+        movl    %ebx,           %esi
+        roll    $5,             %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %ebp,           %esi
+.byte 209
+.byte 201               /* rorl $1 %ecx */
+        addl    %esi,           %eax
+        /* 20_39 78 */
+        movl    56(%esp),       %esi
+        movl    (%esp),         %ebp
+        xorl    %ebp,           %esi
+        movl    24(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    44(%esp),       %ebp
+        xorl    %ebp,           %esi
+        movl    %ebx,           %ebp
+.byte 209
+.byte 198               /* roll $1 %esi */
+        xorl    %ecx,           %ebp
+        movl    %esi,           56(%esp)
+        xorl    %edx,           %ebp
+        leal    3395469782(%esi,%edi,1),%esi
+        movl    %eax,           %edi
+        roll    $5,             %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %ebp,           %edi
+.byte 209
+.byte 203               /* rorl $1 %ebx */
+        addl    %edi,           %esi
+        /* 20_39 79 */
+        movl    60(%esp),       %edi
+        movl    4(%esp),        %ebp
+        xorl    %ebp,           %edi
+        movl    28(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    48(%esp),       %ebp
+        xorl    %ebp,           %edi
+        movl    %eax,           %ebp
+.byte 209
+.byte 199               /* roll $1 %edi */
+        xorl    %ebx,           %ebp
+        movl    %edi,           60(%esp)
+        xorl    %ecx,           %ebp
+        leal    3395469782(%edi,%edx,1),%edi
+        movl    %esi,           %edx
+        roll    $5,             %edx
+        addl    %ebp,           %edx
+        movl    92(%esp),       %ebp
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        addl    %edx,           %edi
+.byte 209
+.byte 200               /* rorl $1 %eax */
+        /* End processing */
+
+        movl    12(%ebp),       %edx
+        addl    %ebx,           %edx
+        movl    4(%ebp),        %ebx
+        addl    %esi,           %ebx
+        movl    %eax,           %esi
+        movl    (%ebp),         %eax
+        movl    %edx,           12(%ebp)
+        addl    %edi,           %eax
+        movl    16(%ebp),       %edi
+        addl    %ecx,           %edi
+        movl    8(%ebp),        %ecx
+        addl    %esi,           %ecx
+        movl    %eax,           (%ebp)
+        movl    64(%esp),       %esi
+        movl    %ecx,           8(%ebp)
+        addl    $64,            %esi
+        movl    68(%esp),       %eax
+        movl    %edi,           16(%ebp)
+        cmpl    %esi,           %eax
+        movl    %ebx,           4(%ebp)
+        jl      .L001end
+        movl    (%esi),         %eax
+        jmp     .L000start
+.L001end:
+        addl    $72,            %esp
+        popl    %edi
+        popl    %ebx
+        popl    %ebp
+        popl    %esi
+        ret
+.sha1_block_x86_end:
+        SIZE(sha1_block_x86,.sha1_block_x86_end-sha1_block_x86)
+.ident  "desasm.pl"
diff --git a/src/lib/libcrypto/sha/sha_sgst.c b/src/lib/libcrypto/sha/sha_sgst.c
new file mode 100644
index 0000000000..8a16801328
--- /dev/null
+++ b/src/lib/libcrypto/sha/sha_sgst.c
@@ -0,0 +1,246 @@
+/* crypto/sha/sha_sgst.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 <stdlib.h>
+#include <string.h>
+
+#ifdef undef
+/* one or the other needs to be defined */
+#ifndef SHA_1 /* FIPE 180-1 */
+#define SHA_0 /* FIPS 180   */
+#endif
+#endif
+
+#define ULONG   unsigned long
+#define UCHAR   unsigned char
+#define UINT    unsigned int
+
+#ifdef NOCONST
+#define const
+#endif
+
+#undef c2nl
+#define c2nl(c,l)       (l =(((unsigned long)(*((c)++)))<<24), \
+                         l|=(((unsigned long)(*((c)++)))<<16), \
+                         l|=(((unsigned long)(*((c)++)))<< 8), \
+                         l|=(((unsigned long)(*((c)++)))    ))
+
+#undef p_c2nl
+#define p_c2nl(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)++))); \
+                                } \
+                        }
+
+#undef c2nl_p
+/* NOTE the pointer is not incremented at the end of this */
+#define c2nl_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; \
+                                } \
+                        }
+
+#undef p_c2nl_p
+#define p_c2nl_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; \
+                                } \
+                        }
+
+#undef nl2c
+#define nl2c(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))
+
+#undef c2l
+#define c2l(c,l)        (l =(((unsigned long)(*((c)++)))    ), \
+                         l|=(((unsigned long)(*((c)++)))<< 8), \
+                         l|=(((unsigned long)(*((c)++)))<<16), \
+                         l|=(((unsigned long)(*((c)++)))<<24))
+
+#undef p_c2l
+#define 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; \
+                                } \
+                        }
+
+#undef c2l_p
+/* NOTE the pointer is not incremented at the end of this */
+#define 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)))); \
+                                } \
+                        }
+
+#undef p_c2l_p
+#define 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; \
+                                } \
+                        }
+
+#undef l2c
+#define 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))
+
+#undef ROTATE
+#if defined(WIN32)
+#define ROTATE(a,n)     _lrotl(a,n)
+#else
+#define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
+#endif
+
+/* A nice byte order reversal from Wei Dai <weidai@eskimo.com> */
+#if defined(WIN32)
+/* 5 instructions with rotate instruction, else 9 */
+#define Endian_Reverse32(a) \
+        { \
+        unsigned long l=(a); \
+        (a)=((ROTATE(l,8)&0x00FF00FF)|(ROTATE(l,24)&0xFF00FF00)); \
+        }
+#else
+/* 6 instructions with rotate instruction, else 8 */
+#define Endian_Reverse32(a) \
+        { \
+        unsigned long l=(a); \
+        l=(((l&0xFF00FF00)>>8L)|((l&0x00FF00FF)<<8L)); \
+        (a)=ROTATE(l,16L); \
+        }
+#endif
+
+/* 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)
+
+#ifdef SHA_0
+#undef Xupdate
+#define Xupdate(a,i,ia,ib,ic,id) X[(i)&0x0f]=(a)=\
+        (ia[(i)&0x0f]^ib[((i)+2)&0x0f]^ic[((i)+8)&0x0f]^id[((i)+13)&0x0f]);
+#endif
+#ifdef SHA_1
+#undef Xupdate
+#define Xupdate(a,i,ia,ib,ic,id) (a)=\
+        (ia[(i)&0x0f]^ib[((i)+2)&0x0f]^ic[((i)+8)&0x0f]^id[((i)+13)&0x0f]);\
+        X[(i)&0x0f]=(a)=ROTATE((a),1);
+#endif
+
+#define BODY_00_15(i,a,b,c,d,e,f,xa) \
+        (f)=xa[i]+(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,xa,xb,xc,xd) \
+        Xupdate(f,i,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,xa,xb,xc,xd) \
+        Xupdate(f,i,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) \
+        Xupdate(f,i,xa,xa,xa,xa); \
+        (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) \
+        Xupdate(f,i,xa,xa,xa,xa); \
+        (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) \
+        Xupdate(f,i,xa,xa,xa,xa); \
+        (f)=X[(i)&0x0f]+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \
+        (b)=ROTATE((b),30);
+
diff --git a/src/lib/libcrypto/stack/Makefile.ssl b/src/lib/libcrypto/stack/Makefile.ssl
new file mode 100644
index 0000000000..0d232c08cf
--- /dev/null
+++ b/src/lib/libcrypto/stack/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/stack/Makefile
+#
+
+DIR=    stack
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=stack.c
+LIBOBJ=stack.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= stack.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/txt_db/Makefile.ssl b/src/lib/libcrypto/txt_db/Makefile.ssl
new file mode 100644
index 0000000000..76e511534f
--- /dev/null
+++ b/src/lib/libcrypto/txt_db/Makefile.ssl
@@ -0,0 +1,80 @@
+#
+# SSLeay/crypto/txt_db/Makefile
+#
+
+DIR=    txt_db
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=txt_db.c
+LIBOBJ=txt_db.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= txt_db.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/util/mklink.sh b/src/lib/libcrypto/util/mklink.sh
new file mode 100644
index 0000000000..1e052ed6ee
--- /dev/null
+++ b/src/lib/libcrypto/util/mklink.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# A bit of an ugly shell script used to actually 'link' files.
+# Used by 'make links'
+#
+
+PATH=$PATH:.:util:../util:../../util
+export PATH
+
+from=$1
+shift
+
+here=`pwd`
+tmp=`dirname $from`
+while [ "$tmp"x != "x" -a "$tmp"x != ".x" ]
+do
+        t=`basename $here`
+        here=`dirname $here`
+        to="/$t$to"
+        tmp=`dirname $tmp`
+done
+to=..$to
+
+#echo from=$from
+#echo to  =$to
+#exit 1
+
+if [ "$*"x != "x" ]; then
+        for i in $*
+        do
+                /bin/rm -f $from/$i
+                point.sh $to/$i $from/$i
+        done
+fi
+exit 0;
diff --git a/src/lib/libcrypto/util/ranlib.sh b/src/lib/libcrypto/util/ranlib.sh
new file mode 100644
index 0000000000..543f712c6b
--- /dev/null
+++ b/src/lib/libcrypto/util/ranlib.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+cwd=`pwd`
+cd /tmp
+
+if [ -s /bin/ranlib ] ; then 
+        RL=/bin/ranlib
+else if [ -s /usr/bin/ranlib ] ; then
+        RL=/usr/bin/ranlib
+fi
+fi
+
+if [ "x$RL" != "x" ]
+then
+        case "$1" in
+                /*)  
+                $RL "$1"
+                ;;
+                *)
+                $RL "$cwd/$1"
+                ;;
+        esac
+fi
diff --git a/src/lib/libcrypto/util/sep_lib.sh b/src/lib/libcrypto/util/sep_lib.sh
new file mode 100644
index 0000000000..2348db874e
--- /dev/null
+++ b/src/lib/libcrypto/util/sep_lib.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+cwd=`pwd`
+/bin/rm -fr tmp/*
+
+cd crypto/des
+make -f Makefile.uni tar
+make -f Makefile.uni tar_lit
+/bin/mv libdes.tgz $cwd/tmp
+/bin/mv libdes-l.tgz $cwd/tmp
+cd $cwd
+
+for name in md5 sha cast bf idea rc4 rc2
+do
+        echo doing $name
+        (cd crypto; tar cfh - $name)|(cd tmp; tar xf -)
+        cd tmp/$name
+        /bin/rm -f Makefile
+        /bin/rm -f Makefile.ssl
+        /bin/rm -f Makefile.ssl.orig
+        /bin/rm -f *.old
+        /bin/mv Makefile.uni Makefile
+
+        cp $cwd/util/ranlib.sh .
+        chmod +x ranlib.sh
+
+        if [ -d asm ]; then
+                mkdir asm/perlasm
+                cp $cwd/crypto/perlasm/*.pl asm/perlasm
+        fi
+        cd ..
+        tar cf - $name|gzip >$name.tgz
+#       /bin/rm -fr $name
+        cd $cwd
+done
+
+
diff --git a/src/lib/libcrypto/util/ssldir.pl b/src/lib/libcrypto/util/ssldir.pl
new file mode 100644
index 0000000000..10584686da
--- /dev/null
+++ b/src/lib/libcrypto/util/ssldir.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+
+$#ARGV == 0 || die "usage: ssldir.pl /new/path\n";
+@files=('crypto/cryptlib.h',
+        'Makefile.ssl',
+        'tools/c_rehash',
+        'util/mk1mf.pl',
+        );
+
+%cryptlib=(
+        '\sX509_CERT_AREA\s',"#define X509_CERT_AREA\t\t".'"%s"',
+        '\sX509_CERT_DIR\s', "#define X509_CERT_DIR\t\t".'"%s/certs"',
+        '\sX509_CERT_FILE\s', "#define X509_CERT_FILE\t\t".'"%s/cert.pem"',
+        '\sX509_PRIVATE_DIR\s',"#define X509_PRIVATE_DIR\t".'"%s/private"',
+        );
+
+%Makefile_ssl=(
+        '^INSTALLTOP=','INSTALLTOP=%s',
+        );
+
+%c_rehash=(
+        '^DIR=',        'DIR=%s',
+        );
+
+%mk1mf=(
+        '^$INSTALLTOP=','$INSTALLTOP="%s";',
+        );
+
+&dofile("crypto/cryptlib.h",$ARGV[0],%cryptlib);
+&dofile("Makefile.ssl",$ARGV[0],%Makefile_ssl);
+&dofile("tools/c_rehash",$ARGV[0],%c_rehash);
+&dofile("util/mk1mf.pl",$ARGV[0],%mk1mf);
+
+sub dofile
+        {
+        ($f,$p,%m)=@_;
+
+        open(IN,"<$f") || die "unable to open $f:$!\n";
+        @a=<IN>;
+        close(IN);
+        foreach $k (keys %m)
+                {
+                grep(/$k/ && ($_=sprintf($m{$k}."\n",$p)),@a);
+                }
+        ($ff=$f) =~ s/\..*$//;
+        open(OUT,">$ff.new") || die "unable to open $f:$!\n";
+        print OUT @a;
+        close(OUT);
+        rename($f,"$ff.old") || die "unable to rename $f\n";
+        rename("$ff.new",$f) || die "unable to rename $ff.new\n";
+        }
+
diff --git a/src/lib/libcrypto/util/up_ver.pl b/src/lib/libcrypto/util/up_ver.pl
new file mode 100644
index 0000000000..32c086b2aa
--- /dev/null
+++ b/src/lib/libcrypto/util/up_ver.pl
@@ -0,0 +1,79 @@
+#!/usr/bin/perl
+#
+# Up the version numbers in the files.
+#
+
+@files=(
+        "crypto/crypto.h",
+        "crypto/des/ecb_enc.c",
+        "crypto/idea/i_ecb.c",
+        "crypto/lhash/lhash.c",
+        "crypto/conf/conf.c",
+        "crypto/md2/md2_dgst.c",
+        "crypto/md5/md5_dgst.c",
+        "crypto/ripemd/rmd_dgst.c",
+        "crypto/pem/pem_lib.c",
+        "crypto/bn/bn_lib.c",
+        "crypto/dh/dh_lib.c",
+        "crypto/rc2/rc2_ecb.c",
+        "crypto/rc4/rc4_skey.c",
+        "crypto/rc5/rc5_ecb.c",
+        "crypto/bf/bf_ecb.c",
+        "crypto/cast/c_ecb.c",
+        "crypto/rsa/rsa_lib.c",
+        "crypto/dsa/dsa_lib.c",
+        "crypto/sha/sha1dgst.c",
+        "crypto/sha/sha_dgst.c",
+        "crypto/asn1/asn1_lib.c",
+        "crypto/x509/x509_vfy.c",
+        "crypto/evp/evp_enc.c",
+        "crypto/rand/md_rand.c",
+        "crypto/stack/stack.c",
+        "crypto/txt_db/txt_db.c",
+        "crypto/cversion.c",
+        "ssl/ssl_lib.c",
+        "ssl/s2_lib.c",
+        "ssl/s3_lib.c",
+        "ssl/t1_lib.c",
+        "README",
+        );
+
+@month=('Jan','Feb','Mar','Apr','May','Jun',
+        'Jul','Aug','Sep','Oct','Nov','Dec');
+@a=localtime(time());
+$time=sprintf("%02d-%s-%04d",$a[3],$month[$a[4]],$a[5]+1900);
+
+$ver=$ARGV[0];
+($ver ne "") || die "no version number specified\n";
+($a,$b,$c,$d)=unpack('axaxac',$ver);
+$d=defined($d)?$d-96:0;
+$xver=sprintf("%x%x%x%x",$a,$b,$c,$d);
+
+foreach $file (@files)
+        {
+        open(IN,"<$file") || die "unable to open $file:$!\n";
+        open(OUT,">$file.new") || die "unable to open $file.new:$!\n";
+        $found=0;
+
+        print STDERR "$file:";
+
+        while (<IN>)
+                {
+                if ((s/SSLeay \d\.\d.\d[^"]*(\"|\s)/SSLeay $ver $time\1/) ||
+                        s/^(\#define\s+SSLEAY_VERSION_NUMBER\s+0x)[0-9a-zA-Z]+(.*)$/$1$xver$2/)
+                        {
+                        print STDERR " Done";
+                        $found++;
+                        print OUT;
+                        while (<IN>) { print OUT; }
+                        last;
+                        }
+                print OUT;
+                }
+        print STDERR "\n";
+        close(IN);
+        close(OUT);
+        (!$found) && die "unable to update the version number in $file\n";
+        rename($file,"$file.old") || die "unable to rename $file:$!\n";
+        rename("$file.new",$file) || die "unable to rename $file.new:$!\n";
+        }
diff --git a/src/lib/libcrypto/x509/Makefile.ssl b/src/lib/libcrypto/x509/Makefile.ssl
new file mode 100644
index 0000000000..1c1ca2ffa0
--- /dev/null
+++ b/src/lib/libcrypto/x509/Makefile.ssl
@@ -0,0 +1,96 @@
+#
+# SSLeay/crypto/x509/Makefile
+#
+
+DIR=    x509
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG=-g
+INSTALLTOP=/usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+ERR=x509
+ERRC=x509_err
+GENERAL=Makefile README
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
+        x509_obj.c x509_req.c x509_vfy.c \
+        x509_set.c x509rset.c $(ERRC).c \
+        x509name.c x509_v3.c x509_ext.c x509pack.c \
+        x509type.c x509_lu.c x_all.c x509_txt.c \
+        by_file.c by_dir.c \
+        v3_net.c v3_x509.c
+LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \
+        x509_obj.o x509_req.o x509_vfy.o \
+        x509_set.o x509rset.o $(ERRC).o \
+        x509name.o x509_v3.o x509_ext.o x509pack.o \
+        x509type.o x509_lu.o x_all.o x509_txt.o \
+        by_file.o by_dir.o \
+        v3_net.o v3_x509.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= x509.h x509_vfy.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        sh $(TOP)/util/ranlib.sh $(LIB)
+        @touch lib
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
+        $(TOP)/util/mklink.sh ../../test $(TEST)
+        $(TOP)/util/mklink.sh ../../apps $(APPS)
+
+install:
+        @for i in $(EXHEADER) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/include/$$i; \
+        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+errors:
+        perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h
+        perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libcrypto/x509/attrib b/src/lib/libcrypto/x509/attrib
new file mode 100644
index 0000000000..37f6cd755f
--- /dev/null
+++ b/src/lib/libcrypto/x509/attrib
@@ -0,0 +1,38 @@
+
+PKCS7
+        STACK of X509_ATTRIBUTES
+                ASN1_OBJECT
+                STACK of ASN1_TYPE
+
+So it is
+
+p7.xa[].obj
+p7.xa[].data[]
+
+get_obj_by_nid(STACK , nid)
+get_num_by_nid(STACK , nid)
+get_data_by_nid(STACK , nid, index)
+
+X509_ATTRIBUTE *X509_ATTRIBUTE_new(void );
+void            X509_ATTRIBUTE_free(X509_ATTRIBUTE *a);
+
+X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **ex,
+                        int nid, STACK *value);
+
+X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **ex,
+                        int nid, STACK *value);
+
+int             X509_ATTRIBUTE_set_object(X509_ATTRIBUTE *ex,ASN1_OBJECT *obj);
+int             X509_ATTRIBUTE_add_data(X509_ATTRIBUTE *ex, int index,
+                        ASN1_TYPE *value);
+
+ASN1_OBJECT *   X509_ATTRIBUTE_get_object(X509_ATTRIBUTE *ex);
+int             X509_ATTRIBUTE_get_num(X509_ATTRIBUTE *ne);
+ASN1_TYPE *     X509_ATTRIBUTE_get_data(X509_ATTRIBUTE *ne,int index);
+
+ASN1_TYPE *     X509_ATTRIBUTE_get_data_by_NID(X509_ATTRIBUTE *ne,
+                        ASN1_OBJECT *obj);
+
+X509_ATTRUBUTE *PKCS7_get_s_att_by_NID(PKCS7 *p7,int nid);
+X509_ATTRUBUTE *PKCS7_get_u_att_by_NID(PKCS7 *p7,int nid);
+
diff --git a/src/lib/libcrypto/x509/v3_net.c b/src/lib/libcrypto/x509/v3_net.c
new file mode 100644
index 0000000000..0c2d276d13
--- /dev/null
+++ b/src/lib/libcrypto/x509/v3_net.c
@@ -0,0 +1,87 @@
+/* crypto/x509/v3_net.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 "stack.h"
+#include "cryptlib.h"
+#include "asn1.h"
+#include "objects.h"
+#include "x509.h"
+
+#define NETSCAPE_X509_EXT_NUM   8
+
+static X509_EXTENSION_METHOD netscape_x509_ext[NETSCAPE_X509_EXT_NUM]={
+{NID_netscape_ca_policy_url,    V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+{NID_netscape_ssl_server_name,  V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+{NID_netscape_revocation_url,   V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+{NID_netscape_base_url,V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+{NID_netscape_cert_type,V_ASN1_BIT_STRING,X509_EXT_PACK_STRING},
+{NID_netscape_ca_revocation_url,V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+{NID_netscape_renewal_url,V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+{NID_netscape_comment,V_ASN1_IA5STRING,X509_EXT_PACK_STRING},
+        };
+
+int X509v3_add_netscape_extensions()
+        {
+        int i;
+
+        for (i=0; i<NETSCAPE_X509_EXT_NUM; i++)
+                if (!X509v3_add_extension(&(netscape_x509_ext[i])))
+                        return(0);
+        return(1);
+        }
diff --git a/src/lib/libcrypto/x509/v3_x509.c b/src/lib/libcrypto/x509/v3_x509.c
new file mode 100644
index 0000000000..f685aa4c71
--- /dev/null
+++ b/src/lib/libcrypto/x509/v3_x509.c
@@ -0,0 +1,253 @@
+/* crypto/x509/v3_x509.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 <ctype.h>
+#include "stack.h"
+#include "cryptlib.h"
+#include "bio.h"
+#include "asn1.h"
+#include "objects.h"
+#include "x509.h"
+
+#if 0
+static int i2a_key_usage(BIO *bp, X509 *x);
+static int a2i_key_usage(X509 *x, char *str, int len);
+#endif
+
+int X509v3_get_key_usage(X509 *x);
+int X509v3_set_key_usage(X509 *x,unsigned int use);
+int i2a_X509v3_key_usage(BIO *bp, unsigned int use);
+unsigned int a2i_X509v3_key_usage(char *p);
+
+#define STD_X509_EXT_NUM        9
+
+#if 0
+static X509_OBJECTS std_x509_ext[STD_X509_EXT_NUM]={
+{NID_subject_key_identifier,    NULL,NULL},
+{NID_key_usage,                 a2i_key_usage,i2a_key_usage}, /**/
+{NID_private_key_usage_period,  NULL,NULL},
+{NID_subject_alt_name,          NULL,NULL},
+{NID_issuer_alt_name,           NULL,NULL},
+{NID_basic_constraints,         NULL,NULL},
+{NID_crl_number,                NULL,NULL},
+{NID_certificate_policies,      NULL,NULL},
+{NID_authority_key_identifier,  NULL,NULL},
+        };
+#endif
+
+int X509v3_add_standard_extensions()
+        {
+
+#if 0
+        for (i=0; i<STD_X509_EXT_NUM; i++)
+                if (!X509v3_add_extension(&(std_x509_ext[i])))
+                        return(0);
+#endif
+        return(1);
+        }
+
+int X509v3_get_key_usage(x)
+X509 *x;
+        {
+        X509_EXTENSION *ext;
+        ASN1_STRING *st;
+        char *p;
+        int i;
+
+        i=X509_get_ext_by_NID(x,NID_key_usage,-1);
+        if (i < 0) return(X509v3_KU_UNDEF);
+        ext=X509_get_ext(x,i);
+        st=X509v3_unpack_string(NULL,V_ASN1_BIT_STRING,
+                X509_EXTENSION_get_data(X509_get_ext(x,i)));
+
+        p=(char *)ASN1_STRING_data(st);
+        if (ASN1_STRING_length(st) == 1)
+                i=p[0];
+        else if (ASN1_STRING_length(st) == 2)
+                i=p[0]|(p[1]<<8);
+        else
+                i=0;
+        return(i);
+        }
+
+static struct
+        {
+        char *name;
+        unsigned int value;
+        } key_usage_data[] ={
+        {"digitalSignature",    X509v3_KU_DIGITAL_SIGNATURE},
+        {"nonRepudiation",      X509v3_KU_NON_REPUDIATION},
+        {"keyEncipherment",     X509v3_KU_KEY_ENCIPHERMENT},
+        {"dataEncipherment",    X509v3_KU_DATA_ENCIPHERMENT},
+        {"keyAgreement",        X509v3_KU_KEY_AGREEMENT},
+        {"keyCertSign",         X509v3_KU_KEY_CERT_SIGN},
+        {"cRLSign",             X509v3_KU_CRL_SIGN},
+        {"encipherOnly",        X509v3_KU_ENCIPHER_ONLY},
+        {"decipherOnly",        X509v3_KU_DECIPHER_ONLY},
+        {NULL,0},
+        };
+
+#if 0
+static int a2i_key_usage(x,str,len)
+X509 *x;
+char *str;
+int len;
+        {
+        return(X509v3_set_key_usage(x,a2i_X509v3_key_usage(str)));
+        }
+
+static int i2a_key_usage(bp,x)
+BIO *bp;
+X509 *x;
+        {
+        return(i2a_X509v3_key_usage(bp,X509v3_get_key_usage(x)));
+        }
+#endif
+
+int i2a_X509v3_key_usage(bp,use)
+BIO *bp;
+unsigned int use;
+        {
+        int i=0,first=1;
+
+        for (;;)
+                {
+                if (use | key_usage_data[i].value)
+                        {
+                        BIO_printf(bp,"%s%s",((first)?"":" "),
+                                key_usage_data[i].name);
+                        first=0;
+                        }
+                }
+        return(1);
+        }
+
+unsigned int a2i_X509v3_key_usage(p)
+char *p;
+        {
+        unsigned int ret=0;
+        char *q,*s;
+        int i,n;
+
+        q=p;
+        for (;;)
+                {
+                while ((*q != '\0') && isalnum(*q))
+                        q++;
+                if (*q == '\0') break;
+                s=q++;
+                while (isalnum(*q))
+                        q++;
+                n=q-s;
+                i=0;
+                for (;;)
+                        {
+                        if (strncmp(key_usage_data[i].name,s,n) == 0)
+                                {
+                                ret|=key_usage_data[i].value;
+                                break;
+                                }
+                        i++;
+                        if (key_usage_data[i].name == NULL)
+                                return(X509v3_KU_UNDEF);
+                        }
+                }
+        return(ret);
+        }
+
+int X509v3_set_key_usage(x,use)
+X509 *x;
+unsigned int use;
+        {
+        ASN1_OCTET_STRING *os;
+        X509_EXTENSION *ext;
+        int i;
+        unsigned char data[4];
+
+        i=X509_get_ext_by_NID(x,NID_key_usage,-1);
+        if (i < 0)
+                {
+                i=X509_get_ext_count(x)+1;
+                if ((ext=X509_EXTENSION_new()) == NULL) return(0);
+                if (!X509_add_ext(x,ext,i))
+                        {
+                        X509_EXTENSION_free(ext);
+                        return(0);
+                        }
+                }
+        else
+                ext=X509_get_ext(x,i);
+
+        /* fill in 'ext' */
+        os=X509_EXTENSION_get_data(ext);
+
+        i=0;
+        if (use > 0)
+                {
+                i=1;
+                data[0]=use&0xff;
+                }
+        if (use > 0xff)
+                {
+                i=2;
+                data[1]=(use>>8)&0xff;
+                }
+        return((X509v3_pack_string(&os,V_ASN1_BIT_STRING,data,i) == NULL)?0:1);
+        }
+
diff --git a/src/lib/libcrypto/x509/x509.doc b/src/lib/libcrypto/x509/x509.doc
new file mode 100644
index 0000000000..73cfc9f034
--- /dev/null
+++ b/src/lib/libcrypto/x509/x509.doc
@@ -0,0 +1,27 @@
+X509_verify()
+X509_sign()
+
+X509_get_version()
+X509_get_serialNumber()
+X509_get_issuer()
+X509_get_subject()
+X509_get_notBefore()
+X509_get_notAfter()
+X509_get_pubkey()
+
+X509_set_version()
+X509_set_serialNumber()
+X509_set_issuer()
+X509_set_subject()
+X509_set_notBefore()
+X509_set_notAfter()
+X509_set_pubkey()
+
+X509_get_extensions()
+X509_set_extensions()
+
+X509_EXTENSIONS_clear()
+X509_EXTENSIONS_retrieve()
+X509_EXTENSIONS_add()
+X509_EXTENSIONS_delete()
+
diff --git a/src/lib/libcrypto/x509/x509.err b/src/lib/libcrypto/x509/x509.err
new file mode 100644
index 0000000000..8d0862d7d1
--- /dev/null
+++ b/src/lib/libcrypto/x509/x509.err
@@ -0,0 +1,46 @@
+/* Error codes for the X509 functions. */
+
+/* Function codes. */
+#define X509_F_ADD_CERT_DIR                              100
+#define X509_F_BY_FILE_CTRL                              101
+#define X509_F_DIR_CTRL                                  102
+#define X509_F_GET_CERT_BY_SUBJECT                       103
+#define X509_F_X509V3_ADD_EXT                            104
+#define X509_F_X509V3_ADD_EXTENSION                      105
+#define X509_F_X509V3_PACK_STRING                        106
+#define X509_F_X509V3_UNPACK_STRING                      107
+#define X509_F_X509_EXTENSION_CREATE_BY_NID              108
+#define X509_F_X509_EXTENSION_CREATE_BY_OBJ              109
+#define X509_F_X509_GET_PUBKEY_PARAMETERS                110
+#define X509_F_X509_LOAD_CERT_FILE                       111
+#define X509_F_X509_LOAD_CRL_FILE                        112
+#define X509_F_X509_NAME_ADD_ENTRY                       113
+#define X509_F_X509_NAME_ENTRY_CREATE_BY_NID             114
+#define X509_F_X509_NAME_ENTRY_SET_OBJECT                115
+#define X509_F_X509_NAME_ONELINE                         116
+#define X509_F_X509_NAME_PRINT                           117
+#define X509_F_X509_PRINT_FP                             118
+#define X509_F_X509_PUBKEY_GET                           119
+#define X509_F_X509_PUBKEY_SET                           120
+#define X509_F_X509_REQ_PRINT                            121
+#define X509_F_X509_REQ_PRINT_FP                         122
+#define X509_F_X509_REQ_TO_X509                          123
+#define X509_F_X509_STORE_ADD_CERT                       124
+#define X509_F_X509_STORE_ADD_CRL                        125
+#define X509_F_X509_TO_X509_REQ                          126
+#define X509_F_X509_VERIFY_CERT                          127
+
+/* Reason codes. */
+#define X509_R_BAD_X509_FILETYPE                         100
+#define X509_R_CERT_ALREADY_IN_HASH_TABLE                101
+#define X509_R_ERR_ASN1_LIB                              102
+#define X509_R_LOADING_CERT_DIR                          103
+#define X509_R_LOADING_DEFAULTS                          104
+#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY              105
+#define X509_R_SHOULD_RETRY                              106
+#define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN        107
+#define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY            108
+#define X509_R_UNKNOWN_NID                               109
+#define X509_R_UNKNOWN_STRING_TYPE                       110
+#define X509_R_UNSUPPORTED_ALGORITHM                     111
+#define X509_R_WRONG_LOOKUP_TYPE                         112
diff --git a/src/lib/libcrypto/x509/x509pack.c b/src/lib/libcrypto/x509/x509pack.c
new file mode 100644
index 0000000000..846f125859
--- /dev/null
+++ b/src/lib/libcrypto/x509/x509pack.c
@@ -0,0 +1,157 @@
+/* crypto/x509/x509pack.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 "stack.h"
+#include "cryptlib.h"
+#include "asn1.h"
+#include "objects.h"
+#include "evp.h"
+#include "x509.h"
+
+ASN1_OCTET_STRING *X509v3_pack_string(ex,type,bytes,len)
+ASN1_OCTET_STRING **ex;
+int type;
+unsigned char *bytes;
+int len;
+        {
+        ASN1_OCTET_STRING *os;
+        ASN1_STRING str;
+        unsigned char *p;
+        int i;
+
+        if ((ex == NULL) || (*ex == NULL))
+                os=ASN1_OCTET_STRING_new();
+        else
+                os= *ex;
+
+        if (len < 0) len=strlen((char *)bytes);
+        str.length=len;
+        str.type=type;
+        str.data=bytes;
+
+        /* str now holds the data, we just have to copy it into ->value */
+
+        switch (type)
+                {
+        case V_ASN1_BIT_STRING:
+                i=i2d_ASN1_BIT_STRING((ASN1_BIT_STRING *)&str,NULL);
+                if (!ASN1_STRING_set((ASN1_STRING *)os,NULL,i))
+                        goto err;
+                p=(unsigned char *)os->data;
+                i2d_ASN1_BIT_STRING((ASN1_BIT_STRING *)&str,&p);
+                break;
+        case V_ASN1_OCTET_STRING:
+                i=i2d_ASN1_OCTET_STRING((ASN1_OCTET_STRING *)&str,NULL);
+                if (!ASN1_STRING_set((ASN1_STRING *)os,NULL,i))
+                        goto err;
+                p=(unsigned char *)os->data;
+                i2d_ASN1_OCTET_STRING((ASN1_OCTET_STRING *)&str,&p);
+                break;
+        case V_ASN1_IA5STRING:
+        case V_ASN1_PRINTABLESTRING:
+        case V_ASN1_T61STRING:
+                i=i2d_ASN1_bytes(&str,NULL,type,V_ASN1_UNIVERSAL);
+                if (!ASN1_STRING_set((ASN1_STRING *)os,NULL,i))
+                        goto err;
+                p=(unsigned char *)os->data;
+                i=i2d_ASN1_bytes(&str,&p,type,V_ASN1_UNIVERSAL);
+                break;
+        default:
+                X509err(X509_F_X509V3_PACK_STRING,X509_R_UNKNOWN_STRING_TYPE);
+                goto err;
+                }
+        os->length=i;
+
+        if ((ex != NULL) && (os != *ex))
+                *ex=os;
+        return(os);
+err:
+        return(NULL);
+        }
+
+ASN1_STRING *X509v3_unpack_string(ex,type,os)
+ASN1_STRING **ex;
+int type;
+ASN1_OCTET_STRING *os;
+        {
+        unsigned char *p;
+        ASN1_STRING *ret=NULL;
+
+        p=os->data;
+        switch (type)
+                {
+        case V_ASN1_BIT_STRING:
+                ret=(ASN1_STRING *)d2i_ASN1_BIT_STRING(
+                        (ASN1_BIT_STRING **)ex,&p,os->length);
+                break;
+        case V_ASN1_OCTET_STRING:
+                ret=(ASN1_STRING *)d2i_ASN1_OCTET_STRING(
+                        (ASN1_BIT_STRING **)ex,&p,os->length);
+                break;
+        case V_ASN1_IA5STRING:
+        case V_ASN1_PRINTABLESTRING:
+        case V_ASN1_T61STRING:
+                ret=(ASN1_STRING *)d2i_ASN1_PRINTABLE(ex,&p,os->length);
+                break;
+        default:
+                X509err(X509_F_X509V3_UNPACK_STRING,X509_R_UNKNOWN_STRING_TYPE);
+                }
+        return(ret);
+        }
+
diff --git a/src/lib/libcrypto/x509/x509v3.doc b/src/lib/libcrypto/x509/x509v3.doc
new file mode 100644
index 0000000000..1e760a9469
--- /dev/null
+++ b/src/lib/libcrypto/x509/x509v3.doc
@@ -0,0 +1,24 @@
+The 'new' system.
+
+The X509_EXTENSION_METHOD includes extensions and attributes and/or names. 
+Basically everthing that can be added to an X509 with an OID identifying it.
+
+It operates via 2 methods per object id.
+int a2i_XXX(X509 *x,char *str,int len);
+int i2a_XXX(BIO *bp,X509 *x);
+
+The a2i_XXX function will add the object with a value converted from the
+string into the X509.  Len can be -1 in which case the length is calculated
+via strlen(str).   Applications can always use direct knowledge to load and
+unload the relevent objects themselves.
+
+i2a_XXX will print to the passed BIO, a text representation of the
+relevet object.  Use a memory BIO if you want it printed to a buffer :-).
+
+X509_add_by_NID(X509 *x,int nid,char *str,int len);
+X509_add_by_OBJ(X509 *x,ASN1_OBJECT *obj,char *str,int len);
+
+X509_print_by_name(BIO *bp,X509 *x);
+X509_print_by_NID(BIO *bp,X509 *x);
+X509_print_by_OBJ(BIO *bp,X509 *x);
+
diff --git a/src/lib/libcrypto/x509v3/format b/src/lib/libcrypto/x509v3/format
new file mode 100644
index 0000000000..3307978121
--- /dev/null
+++ b/src/lib/libcrypto/x509v3/format
@@ -0,0 +1,92 @@
+AuthorityKeyIdentifier
+        {
+        keyIdentifier           [0] OCTET_STRING        OPTIONAL
+        authorityCertIssuer     [1] GeneralNames        OPTIONAL
+        authorityCertSerialNumber [2] CertificateSerialNumber OPTIONAL
+        }
+
+SubjectKeyIdentifier    OCTET_STRING
+
+KeyUsage
+        {
+        BIT_STRING
+                digitalSignature        0
+                nonRepudiation          1
+                keyEncipherment         2
+                dataEncipherment        3
+                keyAgreement            4
+                keyCertSign             5
+                cRLSign                 6
+                encipherOnly            7
+                decipherOnly            8
+        }
+
+extKeyUsage
+        {
+        SEQUENCE of OBJECT_IDENTIFIER
+        }
+
+privateKeyUsagePeriod
+        {
+        notBefore       [0]     GeneralizedTime OPTIONAL
+        notAfter        [1]     GeneralizedTime OPTIONAL
+        }
+
+certificatePoliciesSyntax
+        SEQUENCE of PoliciesInformation
+
+PoliciesInformation     XXX
+policyMappings          XXX
+supportedAlgorithms     XXX
+
+subjectAltName
+        GeneralNames sequence of GeneralName
+
+GeneralName
+        {
+        otherName       [0] INSTANCE OF OTHER-NAME
+        rfc882Name      [1] IA5String
+        dNSName         [2] IA5String
+        x400Address     [3] ORAddress
+        directoryName   [4] Name
+        ediPartyName    [5] 
+                                {
+                                nameAssigner    [0] DirectoryString OPTIONAL
+                                partyName       [1] DirectoryString
+                                }
+        uniformResourceIdentifier [6] IA5String
+        iPAddress       [7] OCTET_STRING
+        registeredID    [8] OBJECT_IDENTIFIER
+        }
+
+issuerAltName
+        GeneralNames sequence of GeneralName
+
+subjectDirectoryAttribute SEQUENCE of Attribute
+
+basicConstraints
+        {
+        cA                      BOOLEAN default FALSE
+        pathLenConstraint       INTEGER OPTIONAL
+        }
+
+nameConstraints
+        {
+        permittedSubtrees [0] sequence of GeneralSubtree OPTIONAL
+        excludedSubtrees [1] sequence of GeneralSubtree OPTIONAL
+        }
+
+GeneralSubtree
+        {
+        base    GeneralName
+        minimum [0] BaseDistance DEFAULT 0
+        maximum [1] BaseDistance OPTIONAL
+        }
+
+PolicyConstraints
+        {
+        requiredExplicitPolicy  [0] SkipCerts OPTIONAL
+        inhibitPolicyMapping    [1] SkipCerts OPTIONAL
+        }
+SkipCerts == INTEGER
+
diff --git a/src/lib/libcrypto/x509v3/header b/src/lib/libcrypto/x509v3/header
new file mode 100644
index 0000000000..3d791ca3dd
--- /dev/null
+++ b/src/lib/libcrypto/x509v3/header
@@ -0,0 +1,6 @@
+int             a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size)
+int             i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a)
+int             i2d_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp)
+ASN1_INTEGER *  d2i_ASN1_INTEGER(ASN1_INTEGER **a,unsigned char **pp,long length)
+
+
diff --git a/src/lib/libcrypto/x509v3/v3_ku.c b/src/lib/libcrypto/x509v3/v3_ku.c
new file mode 100644
index 0000000000..87c7402f43
--- /dev/null
+++ b/src/lib/libcrypto/x509v3/v3_ku.c
@@ -0,0 +1,318 @@
+/* crypto/x509v3/v3_ku.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 <ctype.h>
+#include "stack.h"
+#include "cryptlib.h"
+#include "bio.h"
+#include "asn1.h"
+#include "objects.h"
+#include "x509.h"
+
+X509_EXTENSION_METHOD X509v3_key_usage_method=
+        {
+        NID_key_usage,
+        ku_clear,
+        ex_get_bool,
+        ex_set_bool,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        ku_a2i,
+        ku_i2a,
+        };
+
+static void ku_clear(a)
+X509_EXTENSION *a;
+        {
+        }
+
+static int ku_expand(a)
+X509_EXTENSION *a;
+        {
+        ASN1_BIT_STRING *bs;
+
+        if (a->argp == NULL)
+                {
+                bs=X509v3_unpack_string(NULL,V_ASN1_BIT_STRING,value);
+                if (bs == NULL) return(0);
+                a->argp=(char *)bs;
+                a->ex_free=ASN1_STRING_free;
+                }
+        return(1);
+        }
+
+static int ku_get_bool(a,num)
+X509_EXTENSION *a;
+int num;
+        {
+        int ret;
+        ASN1_BIT_STRING *bs;
+
+        if ((a->argp == NULL) && !ku_expand(a))
+                return(-1);
+        bs=(ASN1_BIT_STRING *)a->argp;
+        ret=ASN1_BIT_STRING_get_bit(bs,num);
+        return(ret);
+        }
+
+static int ku_set_bool(a,num,value)
+X509_EXTENSION *a;
+int num;
+int value;
+        {
+        ASN1_BIT_STRING *a;
+
+        if ((a->argp == NULL) && !ku_expand(a))
+                return(0);
+        bs=(ASN1_BIT_STRING *)a->argp;
+        ret=ASN1_BIT_STRING_set_bit(bs,num,value);
+        }
+
+static int ku_a2i(bio,a,buf,len)
+BIO *bio;
+X509_EXTENSION *a;
+char *buf;
+int len;
+        {
+        get token
+        }
+
+static char ku_names[X509v3_N_KU_NUM]={
+        X509v3_S_KU_digitalSignature,
+        X509v3_S_KU_nonRepudiation,
+        X509v3_S_KU_keyEncipherment,
+        X509v3_S_KU_dataEncipherment,
+        X509v3_S_KU_keyAgreement,
+        X509v3_S_KU_keyCertSign,
+        X509v3_S_KU_cRLSign,
+        X509v3_S_KU_encipherOnly,
+        X509v3_S_KU_decipherOnly,
+        };
+
+static int ku_i2a(bio,a);
+BIO *bio;
+X509_EXTENSION *a;
+        {
+        int i,first=1;
+        char *c;
+
+        for (i=0; i<X509v3_N_KU_NUM; i++)
+                {
+                if (ku_get_bool(a,i) > 0)
+                        {
+                        BIO_printf(bio,"%s%s",((first)?"":" "),ku_names[i]);
+                        first=0;
+                        }
+                }
+        }
+
+/***********************/
+
+int X509v3_get_key_usage(x,ret)
+STACK *x;
+unsigned long *ret;
+        {
+        X509_EXTENSION *ext;
+        ASN1_STRING *st;
+        char *p;
+        int i;
+
+        i=X509_get_ext_by_NID(x,NID_key_usage,-1);
+        if (i < 0) return(X509v3_KU_UNDEF);
+        ext=X509_get_ext(x,i);
+        st=X509v3_unpack_string(NULL,V_ASN1_BIT_STRING,
+                X509_EXTENSION_get_data(X509_get_ext(x,i)));
+
+        p=ASN1_STRING_data(st);
+        if (ASN1_STRING_length(st) == 1)
+                i=p[0];
+        else if (ASN1_STRING_length(st) == 2)
+                i=p[0]|(p[1]<<8);
+        else
+                i=0;
+        return(i);
+        }
+
+static struct
+        {
+        char *name;
+        unsigned int value;
+        } key_usage_data[] ={
+        {"digitalSignature",    X509v3_KU_DIGITAL_SIGNATURE},
+        {"nonRepudiation",      X509v3_KU_NON_REPUDIATION},
+        {"keyEncipherment",     X509v3_KU_KEY_ENCIPHERMENT},
+        {"dataEncipherment",    X509v3_KU_DATA_ENCIPHERMENT},
+        {"keyAgreement",        X509v3_KU_KEY_AGREEMENT},
+        {"keyCertSign",         X509v3_KU_KEY_CERT_SIGN},
+        {"cRLSign",             X509v3_KU_CRL_SIGN},
+        {"encipherOnly",        X509v3_KU_ENCIPHER_ONLY},
+        {"decipherOnly",        X509v3_KU_DECIPHER_ONLY},
+        {NULL,0},
+        };
+
+#if 0
+static int a2i_key_usage(x,str,len)
+X509 *x;
+char *str;
+int len;
+        {
+        return(X509v3_set_key_usage(x,a2i_X509v3_key_usage(str)));
+        }
+
+static int i2a_key_usage(bp,x)
+BIO *bp;
+X509 *x;
+        {
+        return(i2a_X509v3_key_usage(bp,X509v3_get_key_usage(x)));
+        }
+#endif
+
+int i2a_X509v3_key_usage(bp,use)
+BIO *bp;
+unsigned int use;
+        {
+        int i=0,first=1;
+
+        for (;;)
+                {
+                if (use | key_usage_data[i].value)
+                        {
+                        BIO_printf(bp,"%s%s",((first)?"":" "),
+                                key_usage_data[i].name);
+                        first=0;
+                        }
+                }
+        return(1);
+        }
+
+unsigned int a2i_X509v3_key_usage(p)
+char *p;
+        {
+        unsigned int ret=0;
+        char *q,*s;
+        int i,n;
+
+        q=p;
+        for (;;)
+                {
+                while ((*q != '\0') && isalnum(*q))
+                        q++;
+                if (*q == '\0') break;
+                s=q++;
+                while (isalnum(*q))
+                        q++;
+                n=q-s;
+                i=0;
+                for (;;)
+                        {
+                        if (strncmp(key_usage_data[i].name,s,n) == 0)
+                                {
+                                ret|=key_usage_data[i].value;
+                                break;
+                                }
+                        i++;
+                        if (key_usage_data[i].name == NULL)
+                                return(X509v3_KU_UNDEF);
+                        }
+                }
+        return(ret);
+        }
+
+int X509v3_set_key_usage(x,use)
+X509 *x;
+unsigned int use;
+        {
+        ASN1_OCTET_STRING *os;
+        X509_EXTENSION *ext;
+        int i;
+        unsigned char data[4];
+
+        i=X509_get_ext_by_NID(x,NID_key_usage,-1);
+        if (i < 0)
+                {
+                i=X509_get_ext_count(x)+1;
+                if ((ext=X509_EXTENSION_new()) == NULL) return(0);
+                if (!X509_add_ext(x,ext,i))
+                        {
+                        X509_EXTENSION_free(ext);
+                        return(0);
+                        }
+                }
+        else
+                ext=X509_get_ext(x,i);
+
+        /* fill in 'ext' */
+        os=X509_EXTENSION_get_data(ext);
+
+        i=0;
+        if (use > 0)
+                {
+                i=1;
+                data[0]=use&0xff;
+                }
+        if (use > 0xff)
+                {
+                i=2;
+                data[1]=(use>>8)&0xff;
+                }
+        return((X509v3_pack_string(&os,V_ASN1_BIT_STRING,data,i) == NULL)?0:1);
+        }
+