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

901 files changed, 169096 insertions, 0 deletions

diff --git a/src/lib/libc/crypt/Makefile.inc b/src/lib/libc/crypt/Makefile.inc
new file mode 100644
index 0000000000..068172d8eb
--- /dev/null
+++ b/src/lib/libc/crypt/Makefile.inc
@@ -0,0 +1,12 @@
+#       $OpenBSD: Makefile.inc,v 1.12 1999/02/26 00:54:00 deraadt Exp $
+
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/crypt ${LIBCSRCDIR}/crypt
+
+SRCS+=  cast.c crypt.c morecrypt.c md5crypt.c arc4random.c blowfish.c
+SRCS+=  bcrypt.c skipjack.c
+
+MAN+=   crypt.3 blowfish.3 arc4random.3
+MLINKS+=crypt.3 encrypt.3 crypt.3 setkey.3 crypt.3 des_cipher.3
+MLINKS+=crypt.3 des_setkey.3 blowfish.3 blf_key.3 blowfish.3 blf_enc.3
+MLINKS+=blowfish.3 blf_dec.3
+MLINKS+=arc4random.3 arc4random_stir.3 arc4random.3 arc4random_addrandom.3
diff --git a/src/lib/libc/crypt/arc4random.3 b/src/lib/libc/crypt/arc4random.3
new file mode 100644
index 0000000000..741965c5ac
--- /dev/null
+++ b/src/lib/libc/crypt/arc4random.3
@@ -0,0 +1,83 @@
+.\" $OpenBSD: arc4random.3,v 1.4 1998/09/07 16:44:34 aaron Exp $
+.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+.\" 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 Niels Provos.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" Manual page, using -mandoc macros
+.\"
+.Dd April 15, 1997
+.Dt ARC4RANDOM 3
+.Os "OpenBSD 2.0"
+.Sh NAME
+.Nm arc4random,
+.Nm arc4random_stir,
+.Nm arc4random_addrandom
+.Nd arc4 random number generator.
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft u_int32_t
+.Fn arc4random "void"
+.Ft void
+.Fn arc4random_stir "void"
+.Ft void
+.Fn arc4random_addrandom "u_char *dat" "int datlen"
+.Sh DESCRIPTION
+The
+.Fn arc4random 
+function uses the key stream generator employed by the
+arc4 cipher, which uses 8*8 8 bit S-Boxes. The S-Boxes
+can be in about 
+.if t 2\u\s71700\s10\d
+.if n (2**1700)
+states.
+.Pp
+The
+.Fn arc4random_stir
+function reads data from 
+.Pa /dev/arandom
+and uses it to permutate the S-Boxes via
+.Fn arc4random_addrandom .
+.Pp
+There is no need to call 
+.Fn arc4random_stir
+before using
+.Fn arc4random ,
+since
+.Fn arc4random
+automatically initalizes itself.
+.Sh SEE ALSO
+.Xr rand48 3 ,
+.Xr rand 3 ,
+.Xr random 3
+.Sh HISTORY
+.Pa RC4 
+has been designed by RSA Data Security, Inc. It was posted anonymously
+to the USENET and was confirmed to be equivalent by several sources who
+had access to the original cipher. Since 
+.Pa RC4
+used to be a trade secret, the cipher is now referred to as 
+.Pa ARC4 .
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c
new file mode 100644
index 0000000000..5279c21518
--- /dev/null
+++ b/src/lib/libc/crypt/arc4random.c
@@ -0,0 +1,176 @@
+/*      $OpenBSD: arc4random.c,v 1.3 1998/03/22 19:01:16 niklas Exp $   */
+
+/*
+ * Arc4 random number generator for OpenBSD.
+ * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
+ *
+ * Modification and redistribution in source and binary forms is
+ * permitted provided that due credit is given to the author and the
+ * OpenBSD project (for instance by leaving this copyright notice
+ * intact).
+ */
+
+/*
+ * This code is derived from section 17.1 of Applied Cryptography,
+ * second edition, which describes a stream cipher allegedly
+ * compatible with RSA Labs "RC4" cipher (the actual description of
+ * which is a trade secret).  The same algorithm is used as a stream
+ * cipher called "arcfour" in Tatu Ylonen's ssh package.
+ *
+ * Here the stream cipher has been modified always to include the time
+ * when initializing the state.  That makes it impossible to
+ * regenerate the same random sequence twice, so this can't be used
+ * for encryption, but will generate good random numbers.
+ *
+ * RC4 is a registered trademark of RSA Laboratories.
+ */
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+
+#ifdef __GNUC__
+#define inline __inline
+#else                           /* !__GNUC__ */
+#define inline
+#endif                          /* !__GNUC__ */
+
+struct arc4_stream {
+        u_int8_t i;
+        u_int8_t j;
+        u_int8_t s[256];
+};
+
+int     rs_initialized;
+static struct arc4_stream rs;
+
+static inline void
+arc4_init(as)
+        struct arc4_stream *as;
+{
+        int     n;
+
+        for (n = 0; n < 256; n++)
+                as->s[n] = n;
+        as->i = 0;
+        as->j = 0;
+}
+
+static inline void
+arc4_addrandom(as, dat, datlen)
+        struct arc4_stream *as;
+        u_char *dat;
+        int     datlen;
+{
+        int     n;
+        u_int8_t si;
+
+        as->i--;
+        for (n = 0; n < 256; n++) {
+                as->i = (as->i + 1);
+                si = as->s[as->i];
+                as->j = (as->j + si + dat[n % datlen]);
+                as->s[as->i] = as->s[as->j];
+                as->s[as->j] = si;
+        }
+}
+
+static void
+arc4_stir(as)
+        struct arc4_stream *as;
+{
+        int     fd;
+        struct {
+                struct timeval tv;
+                u_int8_t rnd[128 - sizeof(struct timeval)];
+        }       rdat;
+
+        gettimeofday(&rdat.tv, NULL);
+        fd = open("/dev/arandom", O_RDONLY);
+        if (fd >= 0) {
+                read(fd, rdat.rnd, sizeof(rdat.rnd));
+                close(fd);
+        }
+        /* fd < 0?  Ah, what the heck. We'll just take whatever was on the
+         * stack... */
+
+        arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
+}
+
+static inline u_int8_t
+arc4_getbyte(as)
+        struct arc4_stream *as;
+{
+        u_int8_t si, sj;
+
+        as->i = (as->i + 1);
+        si = as->s[as->i];
+        as->j = (as->j + si);
+        sj = as->s[as->j];
+        as->s[as->i] = sj;
+        as->s[as->j] = si;
+        return (as->s[(si + sj) & 0xff]);
+}
+
+static inline u_int32_t
+arc4_getword(as)
+        struct arc4_stream *as;
+{
+        u_int32_t val;
+        val = arc4_getbyte(as) << 24;
+        val |= arc4_getbyte(as) << 16;
+        val |= arc4_getbyte(as) << 8;
+        val |= arc4_getbyte(as);
+        return val;
+}
+
+void
+arc4random_stir()
+{
+        if (!rs_initialized) {
+                arc4_init(&rs);
+                rs_initialized = 1;
+        }
+        arc4_stir(&rs);
+}
+
+void
+arc4random_addrandom(dat, datlen)
+        u_char *dat;
+        int     datlen;
+{
+        if (!rs_initialized)
+                arc4random_stir();
+        arc4_addrandom(&rs, dat, datlen);
+}
+
+u_int32_t
+arc4random()
+{
+        if (!rs_initialized)
+                arc4random_stir();
+        return arc4_getword(&rs);
+}
+
+#if 0
+/*-------- Test code for i386 --------*/
+#include <stdio.h>
+#include <machine/pctr.h>
+int
+main(int argc, char **argv)
+{
+        const int iter = 1000000;
+        int     i;
+        pctrval v;
+
+        v = rdtsc();
+        for (i = 0; i < iter; i++)
+                arc4random();
+        v = rdtsc() - v;
+        v /= iter;
+
+        printf("%qd cycles\n", v);
+}
+#endif
diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c
new file mode 100644
index 0000000000..1b121fb28f
--- /dev/null
+++ b/src/lib/libc/crypt/bcrypt.c
@@ -0,0 +1,362 @@
+/*      $OpenBSD: bcrypt.c,v 1.12 1998/08/10 18:33:07 provos Exp $      */
+
+/*
+ * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * 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 Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* This password hashing algorithm was designed by David Mazieres
+ * <dm@lcs.mit.edu> and works as follows:
+ *
+ * 1. state := InitState ()
+ * 2. state := ExpandKey (state, salt, password) 3.
+ * REPEAT rounds:
+ *      state := ExpandKey (state, 0, salt)
+ *      state := ExpandKey(state, 0, password)
+ * 4. ctext := "OrpheanBeholderScryDoubt"
+ * 5. REPEAT 64:
+ *      ctext := Encrypt_ECB (state, ctext);
+ * 6. RETURN Concatenate (salt, ctext);
+ *
+ */
+
+#if 0
+#include <stdio.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <string.h>
+#include <pwd.h>
+#include <blf.h>
+
+/* This implementation is adaptable to current computing power.
+ * You can have up to 2^31 rounds which should be enough for some
+ * time to come.
+ */
+
+#define BCRYPT_VERSION '2'
+#define BCRYPT_MAXSALT 16       /* Precomputation is just so nice */
+#define BCRYPT_BLOCKS 6         /* Ciphertext blocks */
+#define BCRYPT_MINROUNDS 16     /* we have log2(rounds) in salt */
+
+char   *bcrypt_gensalt __P((u_int8_t));
+
+static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t));
+static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t));
+static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *));
+
+static char    encrypted[_PASSWORD_LEN];
+static char    gsalt[BCRYPT_MAXSALT * 4 / 3 + 1];
+static char    error[] = ":";
+
+const static u_int8_t Base64Code[] =
+"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+const static u_int8_t index_64[128] =
+{
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+        255, 255, 255, 255, 255, 255, 0, 1, 54, 55,
+        56, 57, 58, 59, 60, 61, 62, 63, 255, 255,
+        255, 255, 255, 255, 255, 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,
+        255, 255, 255, 255, 255, 255, 28, 29, 30,
+        31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        51, 52, 53, 255, 255, 255, 255, 255
+};
+#define CHAR64(c)  ( (c) > 127 ? 255 : index_64[(c)])
+
+#ifdef __STDC__
+static void
+decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data)
+#else
+static void
+decode_base64(buffer, len, data)
+        u_int8_t *buffer;
+        u_int16_t len;
+        u_int8_t *data;
+#endif
+{
+        u_int8_t *bp = buffer;
+        u_int8_t *p = data;
+        u_int8_t c1, c2, c3, c4;
+        while (bp < buffer + len) {
+                c1 = CHAR64(*p);
+                c2 = CHAR64(*(p + 1));
+
+                /* Invalid data */
+                if (c1 == 255 || c2 == 255)
+                        break;
+
+                *bp++ = (c1 << 2) | ((c2 & 0x30) >> 4);
+                if (bp >= buffer + len)
+                        break;
+
+                c3 = CHAR64(*(p + 2));
+                if (c3 == 255)
+                        break;
+
+                *bp++ = ((c2 & 0x0f) << 4) | ((c3 & 0x3c) >> 2);
+                if (bp >= buffer + len)
+                        break;
+
+                c4 = CHAR64(*(p + 3));
+                if (c4 == 255)
+                        break;
+                *bp++ = ((c3 & 0x03) << 6) | c4;
+
+                p += 4;
+        }
+}
+
+#ifdef __STDC__
+static void
+encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr)
+#else
+static void
+encode_salt(salt, csalt, clen, logr)
+        char   *salt;
+        u_int8_t *csalt;
+        u_int16_t clen;
+        u_int8_t logr;
+#endif
+{
+        salt[0] = '$';
+        salt[1] = BCRYPT_VERSION;
+        salt[2] = 'a';
+        salt[3] = '$';
+
+        snprintf(salt + 4, 4, "%2.2u$", logr);
+
+        encode_base64((u_int8_t *) salt + 7, csalt, clen);
+}
+/* Generates a salt for this version of crypt.
+   Since versions may change. Keeping this here
+   seems sensible.
+ */
+
+#ifdef __STDC__
+char *
+bcrypt_gensalt(u_int8_t log_rounds)
+#else
+char *
+bcrypt_gensalt(log_rounds)
+        u_int8_t log_rounds;
+#endif
+{
+        u_int8_t csalt[BCRYPT_MAXSALT];
+        u_int16_t i;
+        u_int32_t seed = 0;
+
+        for (i = 0; i < BCRYPT_MAXSALT; i++) {
+                if (i % 4 == 0)
+                        seed = arc4random();
+                csalt[i] = seed & 0xff;
+                seed = seed >> 8;
+        }
+
+        if (log_rounds < 4)
+                log_rounds = 4;
+
+        encode_salt(gsalt, csalt, BCRYPT_MAXSALT, log_rounds);
+        return gsalt;
+}
+/* We handle $Vers$log2(NumRounds)$salt+passwd$
+   i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
+
+char   *
+bcrypt(key, salt)
+        const char   *key;
+        const char   *salt;
+{
+        blf_ctx state;
+        u_int32_t rounds, i, k;
+        u_int16_t j;
+        u_int8_t key_len, salt_len, logr, minor;
+        u_int8_t ciphertext[4 * BCRYPT_BLOCKS] = "OrpheanBeholderScryDoubt";
+        u_int8_t csalt[BCRYPT_MAXSALT];
+        u_int32_t cdata[BCRYPT_BLOCKS];
+
+        /* Discard "$" identifier */
+        salt++;
+
+        if (*salt > BCRYPT_VERSION) {
+                /* How do I handle errors ? Return ':' */
+                return error;
+        }
+
+        /* Check for minor versions */
+        if (salt[1] != '$') {
+                 switch (salt[1]) {
+                 case 'a':
+                         /* 'ab' should not yield the same as 'abab' */
+                         minor = salt[1];
+                         salt++;
+                         break;
+                 default:
+                         return error;
+                 }
+        } else
+                 minor = 0;
+
+        /* Discard version + "$" identifier */
+        salt += 2;
+
+        if (salt[2] != '$')
+                /* Out of sync with passwd entry */
+                return error;
+
+        /* Computer power doesnt increase linear, 2^x should be fine */
+        if ((rounds = (u_int32_t) 1 << (logr = atoi(salt))) < BCRYPT_MINROUNDS)
+                return error;
+
+        /* Discard num rounds + "$" identifier */
+        salt += 3;
+
+        /* We dont want the base64 salt but the raw data */
+        decode_base64(csalt, BCRYPT_MAXSALT, (u_int8_t *) salt);
+        salt_len = BCRYPT_MAXSALT;
+        key_len = strlen(key) + (minor >= 'a' ? 1 : 0);
+
+        /* Setting up S-Boxes and Subkeys */
+        Blowfish_initstate(&state);
+        Blowfish_expandstate(&state, csalt, salt_len,
+            (u_int8_t *) key, key_len);
+        for (k = 0; k < rounds; k++) {
+                Blowfish_expand0state(&state, (u_int8_t *) key, key_len);
+                Blowfish_expand0state(&state, csalt, salt_len);
+        }
+
+        /* This can be precomputed later */
+        j = 0;
+        for (i = 0; i < BCRYPT_BLOCKS; i++)
+                cdata[i] = Blowfish_stream2word(ciphertext, 4 * BCRYPT_BLOCKS, &j);
+
+        /* Now do the encryption */
+        for (k = 0; k < 64; k++)
+                blf_enc(&state, cdata, BCRYPT_BLOCKS / 2);
+
+        for (i = 0; i < BCRYPT_BLOCKS; i++) {
+                ciphertext[4 * i + 3] = cdata[i] & 0xff;
+                cdata[i] = cdata[i] >> 8;
+                ciphertext[4 * i + 2] = cdata[i] & 0xff;
+                cdata[i] = cdata[i] >> 8;
+                ciphertext[4 * i + 1] = cdata[i] & 0xff;
+                cdata[i] = cdata[i] >> 8;
+                ciphertext[4 * i + 0] = cdata[i] & 0xff;
+        }
+
+
+        i = 0;
+        encrypted[i++] = '$';
+        encrypted[i++] = BCRYPT_VERSION;
+        if (minor)
+                encrypted[i++] = minor;
+        encrypted[i++] = '$';
+
+        snprintf(encrypted + i, 4, "%2.2u$", logr);
+
+        encode_base64((u_int8_t *) encrypted + i + 3, csalt, BCRYPT_MAXSALT);
+        encode_base64((u_int8_t *) encrypted + strlen(encrypted), ciphertext,
+            4 * BCRYPT_BLOCKS - 1);
+        return encrypted;
+}
+
+#ifdef __STDC__
+static void
+encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len)
+#else
+static void
+encode_base64(buffer, data, len)
+        u_int8_t *buffer;
+        u_int8_t *data;
+        u_int16_t len;
+#endif
+{
+        u_int8_t *bp = buffer;
+        u_int8_t *p = data;
+        u_int8_t c1, c2;
+        while (p < data + len) {
+                c1 = *p++;
+                *bp++ = Base64Code[(c1 >> 2)];
+                c1 = (c1 & 0x03) << 4;
+                if (p >= data + len) {
+                        *bp++ = Base64Code[c1];
+                        break;
+                }
+                c2 = *p++;
+                c1 |= (c2 >> 4) & 0x0f;
+                *bp++ = Base64Code[c1];
+                c1 = (c2 & 0x0f) << 2;
+                if (p >= data + len) {
+                        *bp++ = Base64Code[c1];
+                        break;
+                }
+                c2 = *p++;
+                c1 |= (c2 >> 6) & 0x03;
+                *bp++ = Base64Code[c1];
+                *bp++ = Base64Code[c2 & 0x3f];
+        }
+        *bp = '\0';
+}
+#if 0
+void
+main()
+{
+        char    blubber[73];
+        char    salt[100];
+        char   *p;
+        salt[0] = '$';
+        salt[1] = BCRYPT_VERSION;
+        salt[2] = '$';
+
+        snprintf(salt + 3, 4, "%2.2u$", 5);
+
+        printf("24 bytes of salt: ");
+        fgets(salt + 6, 94, stdin);
+        salt[99] = 0;
+        printf("72 bytes of password: ");
+        fpurge(stdin);
+        fgets(blubber, 73, stdin);
+        blubber[72] = 0;
+
+        p = crypt(blubber, salt);
+        printf("Passwd entry: %s\n\n", p);
+
+        p = bcrypt_gensalt(5);
+        printf("Generated salt: %s\n", p);
+        p = crypt(blubber, p);
+        printf("Passwd entry: %s\n", p);
+}
+#endif
diff --git a/src/lib/libc/crypt/blowfish.3 b/src/lib/libc/crypt/blowfish.3
new file mode 100644
index 0000000000..02a1ef8738
--- /dev/null
+++ b/src/lib/libc/crypt/blowfish.3
@@ -0,0 +1,104 @@
+.\" $OpenBSD: blowfish.3,v 1.2 1998/08/10 18:40:58 provos Exp $
+.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+.\" 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 Niels Provos.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" Manual page, using -mandoc macros
+.\"
+.Dd February 13, 1997
+.Dt BLOWFISH 3
+.Os "OpenBSD 2.0"
+.Sh NAME
+.Nm blf_key,
+.Nm blf_enc,
+.Nm blf_dec
+.Nd Blowfish encryption
+.Sh SYNOPSIS
+.Fd #include <blf.h>
+.Ft void
+.Fn blf_key "blf_ctx *state" "const u_int8_t *key" "u_int16_t keylen"
+.Ft void
+.Fn blf_enc "blf_ctx *state" "u_int32_t *data" "u_int16_t datalen"
+.Ft void
+.Fn blf_dec "blf_ctx *state" "u_int32_t *data" "u_int16_t datalen"
+.Ft void
+.Fn blf_ecb_encrypt "blf_ctx *state" "u_int8_t *data" "u_int32_t datalen"
+.Ft void
+.Fn blf_ecb_decrypt "blf_ctx *state" "u_int8_t *data" "u_int32_t datalen"
+.Ft void
+.Fn blf_cbc_encrypt "blf_ctx *state" "u_int8_t *iv" "u_int8_t *data" "u_int32_t datalen"
+.Ft void
+.Fn blf_cbc_decrypt "blf_ctx *state" "u_int8_t *iv" "u_int8_t *data" "u_int32_t datalen"
+.Sh DESCRIPTION
+.Pa Blowfish
+is a fast unpatented block cipher designed by Bruce Schneier.
+It basically consists of a 16 times iterated Feistel network.
+The block size is 64 bit and the key size is maximal 448 bit.
+.Pp
+The
+.Fn blf_key
+function initializes the 4 8bit S-boxes and the 18 Subkeys with
+the hexadecimal digits of Pi. The key is used for further randomization.
+The first argument to
+.Fn blf_enc
+is the initalized state derived from
+.Fn blf_key .
+The stream of 32-bit words is encrypted in Electronic Codebook
+Mode (ECB) and
+.Pa datalen
+must be even.
+.Fn blf_dec
+is used for decrypting Blowfish encrypted blocks.
+.Pp
+The functions 
+.Fn blf_ecb_encrypt
+and
+.Fn blf_ecb_decrypt 
+are used for encrypting and decrypting octet streams in ECB mode.
+The functions 
+.Fn blf_cbc_encrypt
+and
+.Fn blf_cbc_decrypt 
+are used for encrypting and decrypting octet streams in
+Cipherblock Chaining Mode (CBC).
+.Pp
+The functions
+.Fn Blowfish_initstate ,
+.Fn Blowfish_expand0state ,
+.Fn Blowfish_expandstate ,
+.Fn Blowfish_encipher
+and
+.Fn Blowfish_decipher
+are used for customization of the
+.Pa Blowfish
+cipher, e.g. for the blowfish password hashing function.
+.Sh SEE ALSO
+.Xr crypt 3 ,
+.Xr passwd 1 ,
+.Xr passwd 5
+.Sh AUTHOR
+Niels Provos <provos@physnet.uni-hamburg.de>
diff --git a/src/lib/libc/crypt/blowfish.c b/src/lib/libc/crypt/blowfish.c
new file mode 100644
index 0000000000..6cddbc64b3
--- /dev/null
+++ b/src/lib/libc/crypt/blowfish.c
@@ -0,0 +1,774 @@
+/* $OpenBSD: blowfish.c,v 1.12 1998/08/30 22:35:39 niklas Exp $ */
+/*
+ * Blowfish block cipher for OpenBSD
+ * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * All rights reserved.
+ *
+ * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
+ *
+ * Redistribution and use in source 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 Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This code is derived from section 14.3 and the given source
+ * in section V of Applied Cryptography, second edition.
+ * Blowfish is an unpatented fast block cipher designed by
+ * Bruce Schneier.
+ */
+
+#if 0
+#include <stdio.h>              /* used for debugging */
+#include <string.h>
+#endif
+
+#include <sys/types.h>
+#include <blf.h>
+
+#undef inline
+#ifdef __GNUC__
+#define inline __inline
+#else                           /* !__GNUC__ */
+#define inline
+#endif                          /* !__GNUC__ */
+
+/* Function for Feistel Networks */
+
+#define F(bc, x) ((((bc)->S[0][((x) & 0xFF000000) >> 24] \
+                    + (bc)->S[1][((x) &0xFF0000 ) >> 16]) \
+                   ^ (bc)->S[2][((x) & 0xFF00) >> 8]) \
+                  + (bc)->S[3][(x) & 0x00FF])
+
+#define BLFRND(bc,i,j,n) (i ^= F(bc,j) ^ (bc)->P[n])
+
+void
+Blowfish_encipher(c, xl, xr)
+        blf_ctx *c;
+        u_int32_t *xl;
+        u_int32_t *xr;
+{
+        u_int32_t Xl;
+        u_int32_t Xr;
+
+        Xl = *xl;
+        Xr = *xr;
+
+        Xl ^= c->P[0];
+        BLFRND(c, Xr, Xl, 1); BLFRND(c, Xl, Xr, 2);
+        BLFRND(c, Xr, Xl, 3); BLFRND(c, Xl, Xr, 4);
+        BLFRND(c, Xr, Xl, 5); BLFRND(c, Xl, Xr, 6);
+        BLFRND(c, Xr, Xl, 7); BLFRND(c, Xl, Xr, 8);
+        BLFRND(c, Xr, Xl, 9); BLFRND(c, Xl, Xr, 10);
+        BLFRND(c, Xr, Xl, 11); BLFRND(c, Xl, Xr, 12);
+        BLFRND(c, Xr, Xl, 13); BLFRND(c, Xl, Xr, 14);
+        BLFRND(c, Xr, Xl, 15); BLFRND(c, Xl, Xr, 16);
+
+        *xl = Xr ^ c->P[17];
+        *xr = Xl;
+}
+
+void
+Blowfish_decipher(c, xl, xr)
+        blf_ctx *c;
+        u_int32_t *xl;
+        u_int32_t *xr;
+{
+        u_int32_t Xl;
+        u_int32_t Xr;
+
+        Xl = *xl;
+        Xr = *xr;
+
+        Xl ^= c->P[17];
+        BLFRND(c, Xr, Xl, 16); BLFRND(c, Xl, Xr, 15);
+        BLFRND(c, Xr, Xl, 14); BLFRND(c, Xl, Xr, 13);
+        BLFRND(c, Xr, Xl, 12); BLFRND(c, Xl, Xr, 11);
+        BLFRND(c, Xr, Xl, 10); BLFRND(c, Xl, Xr, 9);
+        BLFRND(c, Xr, Xl, 8); BLFRND(c, Xl, Xr, 7);
+        BLFRND(c, Xr, Xl, 6); BLFRND(c, Xl, Xr, 5);
+        BLFRND(c, Xr, Xl, 4); BLFRND(c, Xl, Xr, 3);
+        BLFRND(c, Xr, Xl, 2); BLFRND(c, Xl, Xr, 1);
+
+        *xl = Xr ^ c->P[0];
+        *xr = Xl;
+}
+
+void
+Blowfish_initstate(c)
+        blf_ctx *c;
+{
+
+/* P-box and S-box tables initialized with digits of Pi */
+
+        const blf_ctx initstate =
+
+        { {
+                {
+                        0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+                        0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+                        0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+                        0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+                        0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+                        0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+                        0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+                        0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+                        0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+                        0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+                        0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+                        0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+                        0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+                        0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+                        0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+                        0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+                        0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+                        0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+                        0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+                        0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+                        0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+                        0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+                        0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+                        0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+                        0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+                        0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+                        0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+                        0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+                        0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+                        0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+                        0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+                        0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+                        0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+                        0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+                        0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+                        0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+                        0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+                        0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+                        0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+                        0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+                        0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+                        0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+                        0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+                        0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+                        0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+                        0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+                        0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+                        0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+                        0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+                        0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+                        0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+                        0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+                        0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+                        0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+                        0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+                        0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+                        0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+                        0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+                        0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+                        0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+                        0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+                        0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+                        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+                0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
+                {
+                        0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+                        0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+                        0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+                        0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+                        0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+                        0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+                        0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+                        0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+                        0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+                        0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+                        0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+                        0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+                        0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+                        0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+                        0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+                        0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+                        0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+                        0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+                        0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+                        0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+                        0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+                        0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+                        0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+                        0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+                        0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+                        0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+                        0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+                        0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+                        0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+                        0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+                        0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+                        0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+                        0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+                        0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+                        0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+                        0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+                        0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+                        0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+                        0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+                        0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+                        0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+                        0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+                        0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+                        0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+                        0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+                        0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+                        0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+                        0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+                        0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+                        0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+                        0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+                        0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+                        0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+                        0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+                        0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+                        0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+                        0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+                        0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+                        0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+                        0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+                        0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+                        0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+                        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+                0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
+                {
+                        0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+                        0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+                        0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+                        0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+                        0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+                        0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+                        0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+                        0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+                        0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+                        0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+                        0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+                        0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+                        0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+                        0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+                        0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+                        0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+                        0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+                        0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+                        0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+                        0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+                        0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+                        0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+                        0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+                        0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+                        0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+                        0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+                        0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+                        0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+                        0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+                        0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+                        0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+                        0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+                        0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+                        0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+                        0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+                        0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+                        0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+                        0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+                        0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+                        0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+                        0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+                        0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+                        0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+                        0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+                        0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+                        0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+                        0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+                        0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+                        0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+                        0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+                        0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+                        0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+                        0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+                        0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+                        0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+                        0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+                        0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+                        0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+                        0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+                        0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+                        0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+                        0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+                        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+                0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
+                {
+                        0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+                        0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+                        0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+                        0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+                        0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+                        0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+                        0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+                        0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+                        0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+                        0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+                        0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+                        0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+                        0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+                        0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+                        0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+                        0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+                        0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+                        0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+                        0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+                        0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+                        0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+                        0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+                        0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+                        0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+                        0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+                        0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+                        0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+                        0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+                        0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+                        0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+                        0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+                        0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+                        0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+                        0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+                        0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+                        0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+                        0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+                        0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+                        0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+                        0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+                        0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+                        0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+                        0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+                        0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+                        0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+                        0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+                        0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+                        0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+                        0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+                        0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+                        0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+                        0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+                        0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+                        0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+                        0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+                        0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+                        0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+                        0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+                        0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+                        0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+                        0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+                        0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+                        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+                0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
+        },
+        {
+                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+                0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+                0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+                0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+                0x9216d5d9, 0x8979fb1b
+        } };
+
+        *c = initstate;
+
+}
+
+#ifdef __STDC__
+u_int32_t
+Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
+#else
+u_int32_t
+Blowfish_stream2word(data, databytes, current)
+        const u_int8_t *data;
+        u_int16_t databytes;
+        u_int16_t *current;
+#endif
+{
+        u_int8_t i;
+        u_int16_t j;
+        u_int32_t temp;
+
+        temp = 0x00000000;
+        j = *current;
+
+        for (i = 0; i < 4; i++, j++) {
+                if (j >= databytes)
+                        j = 0;
+                temp = (temp << 8) | data[j];
+        }
+
+        *current = j;
+        return temp;
+}
+
+#if __STDC__
+void
+Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
+#else
+void
+Blowfish_expand0state(c, key, keybytes)
+        blf_ctx *c;
+        const u_int8_t *key;
+        u_int16_t keybytes;
+#endif
+{
+        u_int16_t i;
+        u_int16_t j;
+        u_int16_t k;
+        u_int32_t temp;
+        u_int32_t datal;
+        u_int32_t datar;
+
+        j = 0;
+        for (i = 0; i < BLF_N + 2; i++) {
+                /* Extract 4 int8 to 1 int32 from keystream */
+                temp = Blowfish_stream2word(key, keybytes, &j);
+                c->P[i] = c->P[i] ^ temp;
+        }
+
+        j = 0;
+        datal = 0x00000000;
+        datar = 0x00000000;
+        for (i = 0; i < BLF_N + 2; i += 2) {
+                Blowfish_encipher(c, &datal, &datar);
+
+                c->P[i] = datal;
+                c->P[i + 1] = datar;
+        }
+
+        for (i = 0; i < 4; i++) {
+                for (k = 0; k < 256; k += 2) {
+                        Blowfish_encipher(c, &datal, &datar);
+
+                        c->S[i][k] = datal;
+                        c->S[i][k + 1] = datar;
+                }
+        }
+}
+
+
+#if __STDC__
+void
+Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
+                     const u_int8_t *key, u_int16_t keybytes)
+#else
+void
+Blowfish_expandstate(c, data, databytes, key, keybytes)
+        blf_ctx *c;
+        const u_int8_t *data;
+        u_int16_t databytes;
+        const u_int8_t *key;
+        u_int16_t keybytes;
+#endif
+{
+        u_int16_t i;
+        u_int16_t j;
+        u_int16_t k;
+        u_int32_t temp;
+        u_int32_t datal;
+        u_int32_t datar;
+
+        j = 0;
+        for (i = 0; i < BLF_N + 2; i++) {
+                /* Extract 4 int8 to 1 int32 from keystream */
+                temp = Blowfish_stream2word(key, keybytes, &j);
+                c->P[i] = c->P[i] ^ temp;
+        }
+
+        j = 0;
+        datal = 0x00000000;
+        datar = 0x00000000;
+        for (i = 0; i < BLF_N + 2; i += 2) {
+                datal ^= Blowfish_stream2word(data, databytes, &j);
+                datar ^= Blowfish_stream2word(data, databytes, &j);
+                Blowfish_encipher(c, &datal, &datar);
+
+                c->P[i] = datal;
+                c->P[i + 1] = datar;
+        }
+
+        for (i = 0; i < 4; i++) {
+                for (k = 0; k < 256; k += 2) {
+                        datal ^= Blowfish_stream2word(data, databytes, &j);
+                        datar ^= Blowfish_stream2word(data, databytes, &j);
+                        Blowfish_encipher(c, &datal, &datar);
+
+                        c->S[i][k] = datal;
+                        c->S[i][k + 1] = datar;
+                }
+        }
+
+}
+
+#if __STDC__
+void
+blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
+#else
+void
+blf_key(c, k, len)
+        blf_ctx *c;
+        const u_int8_t *k;
+        u_int16_t len;
+#endif
+{
+        /* Initalize S-boxes and subkeys with Pi */
+        Blowfish_initstate(c);
+
+        /* Transform S-boxes and subkeys with key */
+        Blowfish_expand0state(c, k, len);
+}
+
+#if __STDC__
+void
+blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
+#else
+void
+blf_enc(c, data, blocks)
+        blf_ctx *c;
+        u_int32_t *data;
+        u_int16_t blocks;
+#endif
+{
+        u_int32_t *d;
+        u_int16_t i;
+
+        d = data;
+        for (i = 0; i < blocks; i++) {
+                Blowfish_encipher(c, d, d + 1);
+                d += 2;
+        }
+}
+
+#if __STDC__
+void
+blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
+#else
+void
+blf_dec(c, data, blocks)
+        blf_ctx *c;
+        u_int32_t *data;
+        u_int16_t blocks;
+#endif
+{
+        u_int32_t *d;
+        u_int16_t i;
+
+        d = data;
+        for (i = 0; i < blocks; i++) {
+                Blowfish_decipher(c, d, d + 1);
+                d += 2;
+        }
+}
+
+#if __STDC__
+void
+blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
+#else
+void
+blf_ecb_encrypt(c, data, len)
+     blf_ctx *c;
+     u_int8_t *data;
+     u_int32_t len;
+#endif
+{
+        u_int32_t l, r;
+        u_int32_t i;
+
+        for (i = 0; i < len; i += 8) {
+                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
+                Blowfish_encipher(c, &l, &r);
+                data[0] = l >> 24 & 0xff;
+                data[1] = l >> 16 & 0xff;
+                data[2] = l >> 8 & 0xff;
+                data[3] = l & 0xff;
+                data[4] = r >> 24 & 0xff;
+                data[5] = r >> 16 & 0xff;
+                data[6] = r >> 8 & 0xff;
+                data[7] = r & 0xff;
+                data += 8;
+        }
+}
+
+#if __STDC__
+void
+blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
+#else
+void
+blf_ecb_decrypt(c, data, len)
+     blf_ctx *c;
+     u_int8_t *data;
+     u_int32_t len;
+#endif
+{
+        u_int32_t l, r;
+        u_int32_t i;
+
+        for (i = 0; i < len; i += 8) {
+                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
+                Blowfish_decipher(c, &l, &r);
+                data[0] = l >> 24 & 0xff;
+                data[1] = l >> 16 & 0xff;
+                data[2] = l >> 8 & 0xff;
+                data[3] = l & 0xff;
+                data[4] = r >> 24 & 0xff;
+                data[5] = r >> 16 & 0xff;
+                data[6] = r >> 8 & 0xff;
+                data[7] = r & 0xff;
+                data += 8;
+        }
+}
+
+#if __STDC__
+void
+blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len)
+#else
+void
+blf_cbc_encrypt(c, iv, data, len)
+     blf_ctx *c;
+     u_int8_t *iv;
+     u_int8_t *data;
+     u_int32_t len;
+#endif
+{
+        u_int32_t l, r;
+        u_int32_t i, j;
+
+        for (i = 0; i < len; i += 8) {
+                for (j = 0; j < 8; j++)
+                        data[j] ^= iv[j];
+                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
+                Blowfish_encipher(c, &l, &r);
+                data[0] = l >> 24 & 0xff;
+                data[1] = l >> 16 & 0xff;
+                data[2] = l >> 8 & 0xff;
+                data[3] = l & 0xff;
+                data[4] = r >> 24 & 0xff;
+                data[5] = r >> 16 & 0xff;
+                data[6] = r >> 8 & 0xff;
+                data[7] = r & 0xff;
+                iv = data;
+                data += 8;
+        }
+}
+
+#if __STDC__
+void
+blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len)
+#else
+void
+blf_cbc_decrypt(c, iva, data, len)
+     blf_ctx *c;
+     u_int8_t *iva;
+     u_int8_t *data;
+     u_int32_t len;
+#endif
+{
+        u_int32_t l, r;
+        u_int8_t *iv;
+        u_int32_t i, j;
+
+        iv = data + len - 16;
+        data = data + len - 8;
+        for (i = len - 8; i >= 8; i -= 8) {
+                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
+                Blowfish_decipher(c, &l, &r);
+                data[0] = l >> 24 & 0xff;
+                data[1] = l >> 16 & 0xff;
+                data[2] = l >> 8 & 0xff;
+                data[3] = l & 0xff;
+                data[4] = r >> 24 & 0xff;
+                data[5] = r >> 16 & 0xff;
+                data[6] = r >> 8 & 0xff;
+                data[7] = r & 0xff;
+                for (j = 0; j < 8; j++)
+                        data[j] ^= iv[j];
+                iv = data;
+                data -= 8;
+        }
+        l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+        r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
+        Blowfish_decipher(c, &l, &r);
+        data[0] = l >> 24 & 0xff;
+        data[1] = l >> 16 & 0xff;
+        data[2] = l >> 8 & 0xff;
+        data[3] = l & 0xff;
+        data[4] = r >> 24 & 0xff;
+        data[5] = r >> 16 & 0xff;
+        data[6] = r >> 8 & 0xff;
+        data[7] = r & 0xff;
+        for (j = 0; j < 8; j++)
+                data[j] ^= iva[j];
+}
+
+#if 0
+void
+report(u_int32_t data[], u_int16_t len)
+{
+        u_int16_t i;
+        for (i = 0; i < len; i += 2)
+                printf("Block %0hd: %08lx %08lx.\n",
+                    i / 2, data[i], data[i + 1]);
+}
+void
+main(void)
+{
+
+        blf_ctx c;
+        char    key[] = "AAAAA";
+        char    key2[] = "abcdefghijklmnopqrstuvwxyz";
+
+        u_int32_t data[10];
+        u_int32_t data2[] =
+        {0x424c4f57l, 0x46495348l};
+
+        u_int16_t i;
+
+        /* First test */
+        for (i = 0; i < 10; i++)
+                data[i] = i;
+
+        blf_key(&c, (u_int8_t *) key, 5);
+        blf_enc(&c, data, 5);
+        blf_dec(&c, data, 1);
+        blf_dec(&c, data + 2, 4);
+        printf("Should read as 0 - 9.\n");
+        report(data, 10);
+
+        /* Second test */
+        blf_key(&c, (u_int8_t *) key2, strlen(key2));
+        blf_enc(&c, data2, 1);
+        printf("\nShould read as: 0x324ed0fe 0xf413a203.\n");
+        report(data2, 2);
+        blf_dec(&c, data2, 1);
+        report(data2, 2);
+}
+#endif
diff --git a/src/lib/libc/crypt/cast.c b/src/lib/libc/crypt/cast.c
new file mode 100644
index 0000000000..264138f03e
--- /dev/null
+++ b/src/lib/libc/crypt/cast.c
@@ -0,0 +1,779 @@
+/*      $OpenBSD: cast.c,v 1.2 1998/07/21 22:42:03 provos Exp $       */
+/*
+ *      CAST-128 in C
+ *      Written by Steve Reid <sreid@sea-to-sky.net>
+ *      100% Public Domain - no warranty
+ *      Released 1997.10.11
+ */
+
+#include <sys/types.h>
+
+#include <cast.h>
+
+/* CAST S-Boxes */
+
+static const u_int32_t cast_sbox1[256] = {
+        0x30FB40D4, 0x9FA0FF0B, 0x6BECCD2F, 0x3F258C7A,
+        0x1E213F2F, 0x9C004DD3, 0x6003E540, 0xCF9FC949,
+        0xBFD4AF27, 0x88BBBDB5, 0xE2034090, 0x98D09675,
+        0x6E63A0E0, 0x15C361D2, 0xC2E7661D, 0x22D4FF8E,
+        0x28683B6F, 0xC07FD059, 0xFF2379C8, 0x775F50E2,
+        0x43C340D3, 0xDF2F8656, 0x887CA41A, 0xA2D2BD2D,
+        0xA1C9E0D6, 0x346C4819, 0x61B76D87, 0x22540F2F,
+        0x2ABE32E1, 0xAA54166B, 0x22568E3A, 0xA2D341D0,
+        0x66DB40C8, 0xA784392F, 0x004DFF2F, 0x2DB9D2DE,
+        0x97943FAC, 0x4A97C1D8, 0x527644B7, 0xB5F437A7,
+        0xB82CBAEF, 0xD751D159, 0x6FF7F0ED, 0x5A097A1F,
+        0x827B68D0, 0x90ECF52E, 0x22B0C054, 0xBC8E5935,
+        0x4B6D2F7F, 0x50BB64A2, 0xD2664910, 0xBEE5812D,
+        0xB7332290, 0xE93B159F, 0xB48EE411, 0x4BFF345D,
+        0xFD45C240, 0xAD31973F, 0xC4F6D02E, 0x55FC8165,
+        0xD5B1CAAD, 0xA1AC2DAE, 0xA2D4B76D, 0xC19B0C50,
+        0x882240F2, 0x0C6E4F38, 0xA4E4BFD7, 0x4F5BA272,
+        0x564C1D2F, 0xC59C5319, 0xB949E354, 0xB04669FE,
+        0xB1B6AB8A, 0xC71358DD, 0x6385C545, 0x110F935D,
+        0x57538AD5, 0x6A390493, 0xE63D37E0, 0x2A54F6B3,
+        0x3A787D5F, 0x6276A0B5, 0x19A6FCDF, 0x7A42206A,
+        0x29F9D4D5, 0xF61B1891, 0xBB72275E, 0xAA508167,
+        0x38901091, 0xC6B505EB, 0x84C7CB8C, 0x2AD75A0F,
+        0x874A1427, 0xA2D1936B, 0x2AD286AF, 0xAA56D291,
+        0xD7894360, 0x425C750D, 0x93B39E26, 0x187184C9,
+        0x6C00B32D, 0x73E2BB14, 0xA0BEBC3C, 0x54623779,
+        0x64459EAB, 0x3F328B82, 0x7718CF82, 0x59A2CEA6,
+        0x04EE002E, 0x89FE78E6, 0x3FAB0950, 0x325FF6C2,
+        0x81383F05, 0x6963C5C8, 0x76CB5AD6, 0xD49974C9,
+        0xCA180DCF, 0x380782D5, 0xC7FA5CF6, 0x8AC31511,
+        0x35E79E13, 0x47DA91D0, 0xF40F9086, 0xA7E2419E,
+        0x31366241, 0x051EF495, 0xAA573B04, 0x4A805D8D,
+        0x548300D0, 0x00322A3C, 0xBF64CDDF, 0xBA57A68E,
+        0x75C6372B, 0x50AFD341, 0xA7C13275, 0x915A0BF5,
+        0x6B54BFAB, 0x2B0B1426, 0xAB4CC9D7, 0x449CCD82,
+        0xF7FBF265, 0xAB85C5F3, 0x1B55DB94, 0xAAD4E324,
+        0xCFA4BD3F, 0x2DEAA3E2, 0x9E204D02, 0xC8BD25AC,
+        0xEADF55B3, 0xD5BD9E98, 0xE31231B2, 0x2AD5AD6C,
+        0x954329DE, 0xADBE4528, 0xD8710F69, 0xAA51C90F,
+        0xAA786BF6, 0x22513F1E, 0xAA51A79B, 0x2AD344CC,
+        0x7B5A41F0, 0xD37CFBAD, 0x1B069505, 0x41ECE491,
+        0xB4C332E6, 0x032268D4, 0xC9600ACC, 0xCE387E6D,
+        0xBF6BB16C, 0x6A70FB78, 0x0D03D9C9, 0xD4DF39DE,
+        0xE01063DA, 0x4736F464, 0x5AD328D8, 0xB347CC96,
+        0x75BB0FC3, 0x98511BFB, 0x4FFBCC35, 0xB58BCF6A,
+        0xE11F0ABC, 0xBFC5FE4A, 0xA70AEC10, 0xAC39570A,
+        0x3F04442F, 0x6188B153, 0xE0397A2E, 0x5727CB79,
+        0x9CEB418F, 0x1CACD68D, 0x2AD37C96, 0x0175CB9D,
+        0xC69DFF09, 0xC75B65F0, 0xD9DB40D8, 0xEC0E7779,
+        0x4744EAD4, 0xB11C3274, 0xDD24CB9E, 0x7E1C54BD,
+        0xF01144F9, 0xD2240EB1, 0x9675B3FD, 0xA3AC3755,
+        0xD47C27AF, 0x51C85F4D, 0x56907596, 0xA5BB15E6,
+        0x580304F0, 0xCA042CF1, 0x011A37EA, 0x8DBFAADB,
+        0x35BA3E4A, 0x3526FFA0, 0xC37B4D09, 0xBC306ED9,
+        0x98A52666, 0x5648F725, 0xFF5E569D, 0x0CED63D0,
+        0x7C63B2CF, 0x700B45E1, 0xD5EA50F1, 0x85A92872,
+        0xAF1FBDA7, 0xD4234870, 0xA7870BF3, 0x2D3B4D79,
+        0x42E04198, 0x0CD0EDE7, 0x26470DB8, 0xF881814C,
+        0x474D6AD7, 0x7C0C5E5C, 0xD1231959, 0x381B7298,
+        0xF5D2F4DB, 0xAB838653, 0x6E2F1E23, 0x83719C9E,
+        0xBD91E046, 0x9A56456E, 0xDC39200C, 0x20C8C571,
+        0x962BDA1C, 0xE1E696FF, 0xB141AB08, 0x7CCA89B9,
+        0x1A69E783, 0x02CC4843, 0xA2F7C579, 0x429EF47D,
+        0x427B169C, 0x5AC9F049, 0xDD8F0F00, 0x5C8165BF
+};
+
+static const u_int32_t cast_sbox2[256] = {
+        0x1F201094, 0xEF0BA75B, 0x69E3CF7E, 0x393F4380,
+        0xFE61CF7A, 0xEEC5207A, 0x55889C94, 0x72FC0651,
+        0xADA7EF79, 0x4E1D7235, 0xD55A63CE, 0xDE0436BA,
+        0x99C430EF, 0x5F0C0794, 0x18DCDB7D, 0xA1D6EFF3,
+        0xA0B52F7B, 0x59E83605, 0xEE15B094, 0xE9FFD909,
+        0xDC440086, 0xEF944459, 0xBA83CCB3, 0xE0C3CDFB,
+        0xD1DA4181, 0x3B092AB1, 0xF997F1C1, 0xA5E6CF7B,
+        0x01420DDB, 0xE4E7EF5B, 0x25A1FF41, 0xE180F806,
+        0x1FC41080, 0x179BEE7A, 0xD37AC6A9, 0xFE5830A4,
+        0x98DE8B7F, 0x77E83F4E, 0x79929269, 0x24FA9F7B,
+        0xE113C85B, 0xACC40083, 0xD7503525, 0xF7EA615F,
+        0x62143154, 0x0D554B63, 0x5D681121, 0xC866C359,
+        0x3D63CF73, 0xCEE234C0, 0xD4D87E87, 0x5C672B21,
+        0x071F6181, 0x39F7627F, 0x361E3084, 0xE4EB573B,
+        0x602F64A4, 0xD63ACD9C, 0x1BBC4635, 0x9E81032D,
+        0x2701F50C, 0x99847AB4, 0xA0E3DF79, 0xBA6CF38C,
+        0x10843094, 0x2537A95E, 0xF46F6FFE, 0xA1FF3B1F,
+        0x208CFB6A, 0x8F458C74, 0xD9E0A227, 0x4EC73A34,
+        0xFC884F69, 0x3E4DE8DF, 0xEF0E0088, 0x3559648D,
+        0x8A45388C, 0x1D804366, 0x721D9BFD, 0xA58684BB,
+        0xE8256333, 0x844E8212, 0x128D8098, 0xFED33FB4,
+        0xCE280AE1, 0x27E19BA5, 0xD5A6C252, 0xE49754BD,
+        0xC5D655DD, 0xEB667064, 0x77840B4D, 0xA1B6A801,
+        0x84DB26A9, 0xE0B56714, 0x21F043B7, 0xE5D05860,
+        0x54F03084, 0x066FF472, 0xA31AA153, 0xDADC4755,
+        0xB5625DBF, 0x68561BE6, 0x83CA6B94, 0x2D6ED23B,
+        0xECCF01DB, 0xA6D3D0BA, 0xB6803D5C, 0xAF77A709,
+        0x33B4A34C, 0x397BC8D6, 0x5EE22B95, 0x5F0E5304,
+        0x81ED6F61, 0x20E74364, 0xB45E1378, 0xDE18639B,
+        0x881CA122, 0xB96726D1, 0x8049A7E8, 0x22B7DA7B,
+        0x5E552D25, 0x5272D237, 0x79D2951C, 0xC60D894C,
+        0x488CB402, 0x1BA4FE5B, 0xA4B09F6B, 0x1CA815CF,
+        0xA20C3005, 0x8871DF63, 0xB9DE2FCB, 0x0CC6C9E9,
+        0x0BEEFF53, 0xE3214517, 0xB4542835, 0x9F63293C,
+        0xEE41E729, 0x6E1D2D7C, 0x50045286, 0x1E6685F3,
+        0xF33401C6, 0x30A22C95, 0x31A70850, 0x60930F13,
+        0x73F98417, 0xA1269859, 0xEC645C44, 0x52C877A9,
+        0xCDFF33A6, 0xA02B1741, 0x7CBAD9A2, 0x2180036F,
+        0x50D99C08, 0xCB3F4861, 0xC26BD765, 0x64A3F6AB,
+        0x80342676, 0x25A75E7B, 0xE4E6D1FC, 0x20C710E6,
+        0xCDF0B680, 0x17844D3B, 0x31EEF84D, 0x7E0824E4,
+        0x2CCB49EB, 0x846A3BAE, 0x8FF77888, 0xEE5D60F6,
+        0x7AF75673, 0x2FDD5CDB, 0xA11631C1, 0x30F66F43,
+        0xB3FAEC54, 0x157FD7FA, 0xEF8579CC, 0xD152DE58,
+        0xDB2FFD5E, 0x8F32CE19, 0x306AF97A, 0x02F03EF8,
+        0x99319AD5, 0xC242FA0F, 0xA7E3EBB0, 0xC68E4906,
+        0xB8DA230C, 0x80823028, 0xDCDEF3C8, 0xD35FB171,
+        0x088A1BC8, 0xBEC0C560, 0x61A3C9E8, 0xBCA8F54D,
+        0xC72FEFFA, 0x22822E99, 0x82C570B4, 0xD8D94E89,
+        0x8B1C34BC, 0x301E16E6, 0x273BE979, 0xB0FFEAA6,
+        0x61D9B8C6, 0x00B24869, 0xB7FFCE3F, 0x08DC283B,
+        0x43DAF65A, 0xF7E19798, 0x7619B72F, 0x8F1C9BA4,
+        0xDC8637A0, 0x16A7D3B1, 0x9FC393B7, 0xA7136EEB,
+        0xC6BCC63E, 0x1A513742, 0xEF6828BC, 0x520365D6,
+        0x2D6A77AB, 0x3527ED4B, 0x821FD216, 0x095C6E2E,
+        0xDB92F2FB, 0x5EEA29CB, 0x145892F5, 0x91584F7F,
+        0x5483697B, 0x2667A8CC, 0x85196048, 0x8C4BACEA,
+        0x833860D4, 0x0D23E0F9, 0x6C387E8A, 0x0AE6D249,
+        0xB284600C, 0xD835731D, 0xDCB1C647, 0xAC4C56EA,
+        0x3EBD81B3, 0x230EABB0, 0x6438BC87, 0xF0B5B1FA,
+        0x8F5EA2B3, 0xFC184642, 0x0A036B7A, 0x4FB089BD,
+        0x649DA589, 0xA345415E, 0x5C038323, 0x3E5D3BB9,
+        0x43D79572, 0x7E6DD07C, 0x06DFDF1E, 0x6C6CC4EF,
+        0x7160A539, 0x73BFBE70, 0x83877605, 0x4523ECF1
+};
+
+static const u_int32_t cast_sbox3[256] = {
+        0x8DEFC240, 0x25FA5D9F, 0xEB903DBF, 0xE810C907,
+        0x47607FFF, 0x369FE44B, 0x8C1FC644, 0xAECECA90,
+        0xBEB1F9BF, 0xEEFBCAEA, 0xE8CF1950, 0x51DF07AE,
+        0x920E8806, 0xF0AD0548, 0xE13C8D83, 0x927010D5,
+        0x11107D9F, 0x07647DB9, 0xB2E3E4D4, 0x3D4F285E,
+        0xB9AFA820, 0xFADE82E0, 0xA067268B, 0x8272792E,
+        0x553FB2C0, 0x489AE22B, 0xD4EF9794, 0x125E3FBC,
+        0x21FFFCEE, 0x825B1BFD, 0x9255C5ED, 0x1257A240,
+        0x4E1A8302, 0xBAE07FFF, 0x528246E7, 0x8E57140E,
+        0x3373F7BF, 0x8C9F8188, 0xA6FC4EE8, 0xC982B5A5,
+        0xA8C01DB7, 0x579FC264, 0x67094F31, 0xF2BD3F5F,
+        0x40FFF7C1, 0x1FB78DFC, 0x8E6BD2C1, 0x437BE59B,
+        0x99B03DBF, 0xB5DBC64B, 0x638DC0E6, 0x55819D99,
+        0xA197C81C, 0x4A012D6E, 0xC5884A28, 0xCCC36F71,
+        0xB843C213, 0x6C0743F1, 0x8309893C, 0x0FEDDD5F,
+        0x2F7FE850, 0xD7C07F7E, 0x02507FBF, 0x5AFB9A04,
+        0xA747D2D0, 0x1651192E, 0xAF70BF3E, 0x58C31380,
+        0x5F98302E, 0x727CC3C4, 0x0A0FB402, 0x0F7FEF82,
+        0x8C96FDAD, 0x5D2C2AAE, 0x8EE99A49, 0x50DA88B8,
+        0x8427F4A0, 0x1EAC5790, 0x796FB449, 0x8252DC15,
+        0xEFBD7D9B, 0xA672597D, 0xADA840D8, 0x45F54504,
+        0xFA5D7403, 0xE83EC305, 0x4F91751A, 0x925669C2,
+        0x23EFE941, 0xA903F12E, 0x60270DF2, 0x0276E4B6,
+        0x94FD6574, 0x927985B2, 0x8276DBCB, 0x02778176,
+        0xF8AF918D, 0x4E48F79E, 0x8F616DDF, 0xE29D840E,
+        0x842F7D83, 0x340CE5C8, 0x96BBB682, 0x93B4B148,
+        0xEF303CAB, 0x984FAF28, 0x779FAF9B, 0x92DC560D,
+        0x224D1E20, 0x8437AA88, 0x7D29DC96, 0x2756D3DC,
+        0x8B907CEE, 0xB51FD240, 0xE7C07CE3, 0xE566B4A1,
+        0xC3E9615E, 0x3CF8209D, 0x6094D1E3, 0xCD9CA341,
+        0x5C76460E, 0x00EA983B, 0xD4D67881, 0xFD47572C,
+        0xF76CEDD9, 0xBDA8229C, 0x127DADAA, 0x438A074E,
+        0x1F97C090, 0x081BDB8A, 0x93A07EBE, 0xB938CA15,
+        0x97B03CFF, 0x3DC2C0F8, 0x8D1AB2EC, 0x64380E51,
+        0x68CC7BFB, 0xD90F2788, 0x12490181, 0x5DE5FFD4,
+        0xDD7EF86A, 0x76A2E214, 0xB9A40368, 0x925D958F,
+        0x4B39FFFA, 0xBA39AEE9, 0xA4FFD30B, 0xFAF7933B,
+        0x6D498623, 0x193CBCFA, 0x27627545, 0x825CF47A,
+        0x61BD8BA0, 0xD11E42D1, 0xCEAD04F4, 0x127EA392,
+        0x10428DB7, 0x8272A972, 0x9270C4A8, 0x127DE50B,
+        0x285BA1C8, 0x3C62F44F, 0x35C0EAA5, 0xE805D231,
+        0x428929FB, 0xB4FCDF82, 0x4FB66A53, 0x0E7DC15B,
+        0x1F081FAB, 0x108618AE, 0xFCFD086D, 0xF9FF2889,
+        0x694BCC11, 0x236A5CAE, 0x12DECA4D, 0x2C3F8CC5,
+        0xD2D02DFE, 0xF8EF5896, 0xE4CF52DA, 0x95155B67,
+        0x494A488C, 0xB9B6A80C, 0x5C8F82BC, 0x89D36B45,
+        0x3A609437, 0xEC00C9A9, 0x44715253, 0x0A874B49,
+        0xD773BC40, 0x7C34671C, 0x02717EF6, 0x4FEB5536,
+        0xA2D02FFF, 0xD2BF60C4, 0xD43F03C0, 0x50B4EF6D,
+        0x07478CD1, 0x006E1888, 0xA2E53F55, 0xB9E6D4BC,
+        0xA2048016, 0x97573833, 0xD7207D67, 0xDE0F8F3D,
+        0x72F87B33, 0xABCC4F33, 0x7688C55D, 0x7B00A6B0,
+        0x947B0001, 0x570075D2, 0xF9BB88F8, 0x8942019E,
+        0x4264A5FF, 0x856302E0, 0x72DBD92B, 0xEE971B69,
+        0x6EA22FDE, 0x5F08AE2B, 0xAF7A616D, 0xE5C98767,
+        0xCF1FEBD2, 0x61EFC8C2, 0xF1AC2571, 0xCC8239C2,
+        0x67214CB8, 0xB1E583D1, 0xB7DC3E62, 0x7F10BDCE,
+        0xF90A5C38, 0x0FF0443D, 0x606E6DC6, 0x60543A49,
+        0x5727C148, 0x2BE98A1D, 0x8AB41738, 0x20E1BE24,
+        0xAF96DA0F, 0x68458425, 0x99833BE5, 0x600D457D,
+        0x282F9350, 0x8334B362, 0xD91D1120, 0x2B6D8DA0,
+        0x642B1E31, 0x9C305A00, 0x52BCE688, 0x1B03588A,
+        0xF7BAEFD5, 0x4142ED9C, 0xA4315C11, 0x83323EC5,
+        0xDFEF4636, 0xA133C501, 0xE9D3531C, 0xEE353783
+};
+
+static const u_int32_t cast_sbox4[256] = {
+        0x9DB30420, 0x1FB6E9DE, 0xA7BE7BEF, 0xD273A298,
+        0x4A4F7BDB, 0x64AD8C57, 0x85510443, 0xFA020ED1,
+        0x7E287AFF, 0xE60FB663, 0x095F35A1, 0x79EBF120,
+        0xFD059D43, 0x6497B7B1, 0xF3641F63, 0x241E4ADF,
+        0x28147F5F, 0x4FA2B8CD, 0xC9430040, 0x0CC32220,
+        0xFDD30B30, 0xC0A5374F, 0x1D2D00D9, 0x24147B15,
+        0xEE4D111A, 0x0FCA5167, 0x71FF904C, 0x2D195FFE,
+        0x1A05645F, 0x0C13FEFE, 0x081B08CA, 0x05170121,
+        0x80530100, 0xE83E5EFE, 0xAC9AF4F8, 0x7FE72701,
+        0xD2B8EE5F, 0x06DF4261, 0xBB9E9B8A, 0x7293EA25,
+        0xCE84FFDF, 0xF5718801, 0x3DD64B04, 0xA26F263B,
+        0x7ED48400, 0x547EEBE6, 0x446D4CA0, 0x6CF3D6F5,
+        0x2649ABDF, 0xAEA0C7F5, 0x36338CC1, 0x503F7E93,
+        0xD3772061, 0x11B638E1, 0x72500E03, 0xF80EB2BB,
+        0xABE0502E, 0xEC8D77DE, 0x57971E81, 0xE14F6746,
+        0xC9335400, 0x6920318F, 0x081DBB99, 0xFFC304A5,
+        0x4D351805, 0x7F3D5CE3, 0xA6C866C6, 0x5D5BCCA9,
+        0xDAEC6FEA, 0x9F926F91, 0x9F46222F, 0x3991467D,
+        0xA5BF6D8E, 0x1143C44F, 0x43958302, 0xD0214EEB,
+        0x022083B8, 0x3FB6180C, 0x18F8931E, 0x281658E6,
+        0x26486E3E, 0x8BD78A70, 0x7477E4C1, 0xB506E07C,
+        0xF32D0A25, 0x79098B02, 0xE4EABB81, 0x28123B23,
+        0x69DEAD38, 0x1574CA16, 0xDF871B62, 0x211C40B7,
+        0xA51A9EF9, 0x0014377B, 0x041E8AC8, 0x09114003,
+        0xBD59E4D2, 0xE3D156D5, 0x4FE876D5, 0x2F91A340,
+        0x557BE8DE, 0x00EAE4A7, 0x0CE5C2EC, 0x4DB4BBA6,
+        0xE756BDFF, 0xDD3369AC, 0xEC17B035, 0x06572327,
+        0x99AFC8B0, 0x56C8C391, 0x6B65811C, 0x5E146119,
+        0x6E85CB75, 0xBE07C002, 0xC2325577, 0x893FF4EC,
+        0x5BBFC92D, 0xD0EC3B25, 0xB7801AB7, 0x8D6D3B24,
+        0x20C763EF, 0xC366A5FC, 0x9C382880, 0x0ACE3205,
+        0xAAC9548A, 0xECA1D7C7, 0x041AFA32, 0x1D16625A,
+        0x6701902C, 0x9B757A54, 0x31D477F7, 0x9126B031,
+        0x36CC6FDB, 0xC70B8B46, 0xD9E66A48, 0x56E55A79,
+        0x026A4CEB, 0x52437EFF, 0x2F8F76B4, 0x0DF980A5,
+        0x8674CDE3, 0xEDDA04EB, 0x17A9BE04, 0x2C18F4DF,
+        0xB7747F9D, 0xAB2AF7B4, 0xEFC34D20, 0x2E096B7C,
+        0x1741A254, 0xE5B6A035, 0x213D42F6, 0x2C1C7C26,
+        0x61C2F50F, 0x6552DAF9, 0xD2C231F8, 0x25130F69,
+        0xD8167FA2, 0x0418F2C8, 0x001A96A6, 0x0D1526AB,
+        0x63315C21, 0x5E0A72EC, 0x49BAFEFD, 0x187908D9,
+        0x8D0DBD86, 0x311170A7, 0x3E9B640C, 0xCC3E10D7,
+        0xD5CAD3B6, 0x0CAEC388, 0xF73001E1, 0x6C728AFF,
+        0x71EAE2A1, 0x1F9AF36E, 0xCFCBD12F, 0xC1DE8417,
+        0xAC07BE6B, 0xCB44A1D8, 0x8B9B0F56, 0x013988C3,
+        0xB1C52FCA, 0xB4BE31CD, 0xD8782806, 0x12A3A4E2,
+        0x6F7DE532, 0x58FD7EB6, 0xD01EE900, 0x24ADFFC2,
+        0xF4990FC5, 0x9711AAC5, 0x001D7B95, 0x82E5E7D2,
+        0x109873F6, 0x00613096, 0xC32D9521, 0xADA121FF,
+        0x29908415, 0x7FBB977F, 0xAF9EB3DB, 0x29C9ED2A,
+        0x5CE2A465, 0xA730F32C, 0xD0AA3FE8, 0x8A5CC091,
+        0xD49E2CE7, 0x0CE454A9, 0xD60ACD86, 0x015F1919,
+        0x77079103, 0xDEA03AF6, 0x78A8565E, 0xDEE356DF,
+        0x21F05CBE, 0x8B75E387, 0xB3C50651, 0xB8A5C3EF,
+        0xD8EEB6D2, 0xE523BE77, 0xC2154529, 0x2F69EFDF,
+        0xAFE67AFB, 0xF470C4B2, 0xF3E0EB5B, 0xD6CC9876,
+        0x39E4460C, 0x1FDA8538, 0x1987832F, 0xCA007367,
+        0xA99144F8, 0x296B299E, 0x492FC295, 0x9266BEAB,
+        0xB5676E69, 0x9BD3DDDA, 0xDF7E052F, 0xDB25701C,
+        0x1B5E51EE, 0xF65324E6, 0x6AFCE36C, 0x0316CC04,
+        0x8644213E, 0xB7DC59D0, 0x7965291F, 0xCCD6FD43,
+        0x41823979, 0x932BCDF6, 0xB657C34D, 0x4EDFD282,
+        0x7AE5290C, 0x3CB9536B, 0x851E20FE, 0x9833557E,
+        0x13ECF0B0, 0xD3FFB372, 0x3F85C5C1, 0x0AEF7ED2
+};
+
+static const u_int32_t cast_sbox5[256] = {
+        0x7EC90C04, 0x2C6E74B9, 0x9B0E66DF, 0xA6337911,
+        0xB86A7FFF, 0x1DD358F5, 0x44DD9D44, 0x1731167F,
+        0x08FBF1FA, 0xE7F511CC, 0xD2051B00, 0x735ABA00,
+        0x2AB722D8, 0x386381CB, 0xACF6243A, 0x69BEFD7A,
+        0xE6A2E77F, 0xF0C720CD, 0xC4494816, 0xCCF5C180,
+        0x38851640, 0x15B0A848, 0xE68B18CB, 0x4CAADEFF,
+        0x5F480A01, 0x0412B2AA, 0x259814FC, 0x41D0EFE2,
+        0x4E40B48D, 0x248EB6FB, 0x8DBA1CFE, 0x41A99B02,
+        0x1A550A04, 0xBA8F65CB, 0x7251F4E7, 0x95A51725,
+        0xC106ECD7, 0x97A5980A, 0xC539B9AA, 0x4D79FE6A,
+        0xF2F3F763, 0x68AF8040, 0xED0C9E56, 0x11B4958B,
+        0xE1EB5A88, 0x8709E6B0, 0xD7E07156, 0x4E29FEA7,
+        0x6366E52D, 0x02D1C000, 0xC4AC8E05, 0x9377F571,
+        0x0C05372A, 0x578535F2, 0x2261BE02, 0xD642A0C9,
+        0xDF13A280, 0x74B55BD2, 0x682199C0, 0xD421E5EC,
+        0x53FB3CE8, 0xC8ADEDB3, 0x28A87FC9, 0x3D959981,
+        0x5C1FF900, 0xFE38D399, 0x0C4EFF0B, 0x062407EA,
+        0xAA2F4FB1, 0x4FB96976, 0x90C79505, 0xB0A8A774,
+        0xEF55A1FF, 0xE59CA2C2, 0xA6B62D27, 0xE66A4263,
+        0xDF65001F, 0x0EC50966, 0xDFDD55BC, 0x29DE0655,
+        0x911E739A, 0x17AF8975, 0x32C7911C, 0x89F89468,
+        0x0D01E980, 0x524755F4, 0x03B63CC9, 0x0CC844B2,
+        0xBCF3F0AA, 0x87AC36E9, 0xE53A7426, 0x01B3D82B,
+        0x1A9E7449, 0x64EE2D7E, 0xCDDBB1DA, 0x01C94910,
+        0xB868BF80, 0x0D26F3FD, 0x9342EDE7, 0x04A5C284,
+        0x636737B6, 0x50F5B616, 0xF24766E3, 0x8ECA36C1,
+        0x136E05DB, 0xFEF18391, 0xFB887A37, 0xD6E7F7D4,
+        0xC7FB7DC9, 0x3063FCDF, 0xB6F589DE, 0xEC2941DA,
+        0x26E46695, 0xB7566419, 0xF654EFC5, 0xD08D58B7,
+        0x48925401, 0xC1BACB7F, 0xE5FF550F, 0xB6083049,
+        0x5BB5D0E8, 0x87D72E5A, 0xAB6A6EE1, 0x223A66CE,
+        0xC62BF3CD, 0x9E0885F9, 0x68CB3E47, 0x086C010F,
+        0xA21DE820, 0xD18B69DE, 0xF3F65777, 0xFA02C3F6,
+        0x407EDAC3, 0xCBB3D550, 0x1793084D, 0xB0D70EBA,
+        0x0AB378D5, 0xD951FB0C, 0xDED7DA56, 0x4124BBE4,
+        0x94CA0B56, 0x0F5755D1, 0xE0E1E56E, 0x6184B5BE,
+        0x580A249F, 0x94F74BC0, 0xE327888E, 0x9F7B5561,
+        0xC3DC0280, 0x05687715, 0x646C6BD7, 0x44904DB3,
+        0x66B4F0A3, 0xC0F1648A, 0x697ED5AF, 0x49E92FF6,
+        0x309E374F, 0x2CB6356A, 0x85808573, 0x4991F840,
+        0x76F0AE02, 0x083BE84D, 0x28421C9A, 0x44489406,
+        0x736E4CB8, 0xC1092910, 0x8BC95FC6, 0x7D869CF4,
+        0x134F616F, 0x2E77118D, 0xB31B2BE1, 0xAA90B472,
+        0x3CA5D717, 0x7D161BBA, 0x9CAD9010, 0xAF462BA2,
+        0x9FE459D2, 0x45D34559, 0xD9F2DA13, 0xDBC65487,
+        0xF3E4F94E, 0x176D486F, 0x097C13EA, 0x631DA5C7,
+        0x445F7382, 0x175683F4, 0xCDC66A97, 0x70BE0288,
+        0xB3CDCF72, 0x6E5DD2F3, 0x20936079, 0x459B80A5,
+        0xBE60E2DB, 0xA9C23101, 0xEBA5315C, 0x224E42F2,
+        0x1C5C1572, 0xF6721B2C, 0x1AD2FFF3, 0x8C25404E,
+        0x324ED72F, 0x4067B7FD, 0x0523138E, 0x5CA3BC78,
+        0xDC0FD66E, 0x75922283, 0x784D6B17, 0x58EBB16E,
+        0x44094F85, 0x3F481D87, 0xFCFEAE7B, 0x77B5FF76,
+        0x8C2302BF, 0xAAF47556, 0x5F46B02A, 0x2B092801,
+        0x3D38F5F7, 0x0CA81F36, 0x52AF4A8A, 0x66D5E7C0,
+        0xDF3B0874, 0x95055110, 0x1B5AD7A8, 0xF61ED5AD,
+        0x6CF6E479, 0x20758184, 0xD0CEFA65, 0x88F7BE58,
+        0x4A046826, 0x0FF6F8F3, 0xA09C7F70, 0x5346ABA0,
+        0x5CE96C28, 0xE176EDA3, 0x6BAC307F, 0x376829D2,
+        0x85360FA9, 0x17E3FE2A, 0x24B79767, 0xF5A96B20,
+        0xD6CD2595, 0x68FF1EBF, 0x7555442C, 0xF19F06BE,
+        0xF9E0659A, 0xEEB9491D, 0x34010718, 0xBB30CAB8,
+        0xE822FE15, 0x88570983, 0x750E6249, 0xDA627E55,
+        0x5E76FFA8, 0xB1534546, 0x6D47DE08, 0xEFE9E7D4
+};
+
+static const u_int32_t cast_sbox6[256] = {
+        0xF6FA8F9D, 0x2CAC6CE1, 0x4CA34867, 0xE2337F7C,
+        0x95DB08E7, 0x016843B4, 0xECED5CBC, 0x325553AC,
+        0xBF9F0960, 0xDFA1E2ED, 0x83F0579D, 0x63ED86B9,
+        0x1AB6A6B8, 0xDE5EBE39, 0xF38FF732, 0x8989B138,
+        0x33F14961, 0xC01937BD, 0xF506C6DA, 0xE4625E7E,
+        0xA308EA99, 0x4E23E33C, 0x79CBD7CC, 0x48A14367,
+        0xA3149619, 0xFEC94BD5, 0xA114174A, 0xEAA01866,
+        0xA084DB2D, 0x09A8486F, 0xA888614A, 0x2900AF98,
+        0x01665991, 0xE1992863, 0xC8F30C60, 0x2E78EF3C,
+        0xD0D51932, 0xCF0FEC14, 0xF7CA07D2, 0xD0A82072,
+        0xFD41197E, 0x9305A6B0, 0xE86BE3DA, 0x74BED3CD,
+        0x372DA53C, 0x4C7F4448, 0xDAB5D440, 0x6DBA0EC3,
+        0x083919A7, 0x9FBAEED9, 0x49DBCFB0, 0x4E670C53,
+        0x5C3D9C01, 0x64BDB941, 0x2C0E636A, 0xBA7DD9CD,
+        0xEA6F7388, 0xE70BC762, 0x35F29ADB, 0x5C4CDD8D,
+        0xF0D48D8C, 0xB88153E2, 0x08A19866, 0x1AE2EAC8,
+        0x284CAF89, 0xAA928223, 0x9334BE53, 0x3B3A21BF,
+        0x16434BE3, 0x9AEA3906, 0xEFE8C36E, 0xF890CDD9,
+        0x80226DAE, 0xC340A4A3, 0xDF7E9C09, 0xA694A807,
+        0x5B7C5ECC, 0x221DB3A6, 0x9A69A02F, 0x68818A54,
+        0xCEB2296F, 0x53C0843A, 0xFE893655, 0x25BFE68A,
+        0xB4628ABC, 0xCF222EBF, 0x25AC6F48, 0xA9A99387,
+        0x53BDDB65, 0xE76FFBE7, 0xE967FD78, 0x0BA93563,
+        0x8E342BC1, 0xE8A11BE9, 0x4980740D, 0xC8087DFC,
+        0x8DE4BF99, 0xA11101A0, 0x7FD37975, 0xDA5A26C0,
+        0xE81F994F, 0x9528CD89, 0xFD339FED, 0xB87834BF,
+        0x5F04456D, 0x22258698, 0xC9C4C83B, 0x2DC156BE,
+        0x4F628DAA, 0x57F55EC5, 0xE2220ABE, 0xD2916EBF,
+        0x4EC75B95, 0x24F2C3C0, 0x42D15D99, 0xCD0D7FA0,
+        0x7B6E27FF, 0xA8DC8AF0, 0x7345C106, 0xF41E232F,
+        0x35162386, 0xE6EA8926, 0x3333B094, 0x157EC6F2,
+        0x372B74AF, 0x692573E4, 0xE9A9D848, 0xF3160289,
+        0x3A62EF1D, 0xA787E238, 0xF3A5F676, 0x74364853,
+        0x20951063, 0x4576698D, 0xB6FAD407, 0x592AF950,
+        0x36F73523, 0x4CFB6E87, 0x7DA4CEC0, 0x6C152DAA,
+        0xCB0396A8, 0xC50DFE5D, 0xFCD707AB, 0x0921C42F,
+        0x89DFF0BB, 0x5FE2BE78, 0x448F4F33, 0x754613C9,
+        0x2B05D08D, 0x48B9D585, 0xDC049441, 0xC8098F9B,
+        0x7DEDE786, 0xC39A3373, 0x42410005, 0x6A091751,
+        0x0EF3C8A6, 0x890072D6, 0x28207682, 0xA9A9F7BE,
+        0xBF32679D, 0xD45B5B75, 0xB353FD00, 0xCBB0E358,
+        0x830F220A, 0x1F8FB214, 0xD372CF08, 0xCC3C4A13,
+        0x8CF63166, 0x061C87BE, 0x88C98F88, 0x6062E397,
+        0x47CF8E7A, 0xB6C85283, 0x3CC2ACFB, 0x3FC06976,
+        0x4E8F0252, 0x64D8314D, 0xDA3870E3, 0x1E665459,
+        0xC10908F0, 0x513021A5, 0x6C5B68B7, 0x822F8AA0,
+        0x3007CD3E, 0x74719EEF, 0xDC872681, 0x073340D4,
+        0x7E432FD9, 0x0C5EC241, 0x8809286C, 0xF592D891,
+        0x08A930F6, 0x957EF305, 0xB7FBFFBD, 0xC266E96F,
+        0x6FE4AC98, 0xB173ECC0, 0xBC60B42A, 0x953498DA,
+        0xFBA1AE12, 0x2D4BD736, 0x0F25FAAB, 0xA4F3FCEB,
+        0xE2969123, 0x257F0C3D, 0x9348AF49, 0x361400BC,
+        0xE8816F4A, 0x3814F200, 0xA3F94043, 0x9C7A54C2,
+        0xBC704F57, 0xDA41E7F9, 0xC25AD33A, 0x54F4A084,
+        0xB17F5505, 0x59357CBE, 0xEDBD15C8, 0x7F97C5AB,
+        0xBA5AC7B5, 0xB6F6DEAF, 0x3A479C3A, 0x5302DA25,
+        0x653D7E6A, 0x54268D49, 0x51A477EA, 0x5017D55B,
+        0xD7D25D88, 0x44136C76, 0x0404A8C8, 0xB8E5A121,
+        0xB81A928A, 0x60ED5869, 0x97C55B96, 0xEAEC991B,
+        0x29935913, 0x01FDB7F1, 0x088E8DFA, 0x9AB6F6F5,
+        0x3B4CBF9F, 0x4A5DE3AB, 0xE6051D35, 0xA0E1D855,
+        0xD36B4CF1, 0xF544EDEB, 0xB0E93524, 0xBEBB8FBD,
+        0xA2D762CF, 0x49C92F54, 0x38B5F331, 0x7128A454,
+        0x48392905, 0xA65B1DB8, 0x851C97BD, 0xD675CF2F
+};
+
+static const u_int32_t cast_sbox7[256] = {
+        0x85E04019, 0x332BF567, 0x662DBFFF, 0xCFC65693,
+        0x2A8D7F6F, 0xAB9BC912, 0xDE6008A1, 0x2028DA1F,
+        0x0227BCE7, 0x4D642916, 0x18FAC300, 0x50F18B82,
+        0x2CB2CB11, 0xB232E75C, 0x4B3695F2, 0xB28707DE,
+        0xA05FBCF6, 0xCD4181E9, 0xE150210C, 0xE24EF1BD,
+        0xB168C381, 0xFDE4E789, 0x5C79B0D8, 0x1E8BFD43,
+        0x4D495001, 0x38BE4341, 0x913CEE1D, 0x92A79C3F,
+        0x089766BE, 0xBAEEADF4, 0x1286BECF, 0xB6EACB19,
+        0x2660C200, 0x7565BDE4, 0x64241F7A, 0x8248DCA9,
+        0xC3B3AD66, 0x28136086, 0x0BD8DFA8, 0x356D1CF2,
+        0x107789BE, 0xB3B2E9CE, 0x0502AA8F, 0x0BC0351E,
+        0x166BF52A, 0xEB12FF82, 0xE3486911, 0xD34D7516,
+        0x4E7B3AFF, 0x5F43671B, 0x9CF6E037, 0x4981AC83,
+        0x334266CE, 0x8C9341B7, 0xD0D854C0, 0xCB3A6C88,
+        0x47BC2829, 0x4725BA37, 0xA66AD22B, 0x7AD61F1E,
+        0x0C5CBAFA, 0x4437F107, 0xB6E79962, 0x42D2D816,
+        0x0A961288, 0xE1A5C06E, 0x13749E67, 0x72FC081A,
+        0xB1D139F7, 0xF9583745, 0xCF19DF58, 0xBEC3F756,
+        0xC06EBA30, 0x07211B24, 0x45C28829, 0xC95E317F,
+        0xBC8EC511, 0x38BC46E9, 0xC6E6FA14, 0xBAE8584A,
+        0xAD4EBC46, 0x468F508B, 0x7829435F, 0xF124183B,
+        0x821DBA9F, 0xAFF60FF4, 0xEA2C4E6D, 0x16E39264,
+        0x92544A8B, 0x009B4FC3, 0xABA68CED, 0x9AC96F78,
+        0x06A5B79A, 0xB2856E6E, 0x1AEC3CA9, 0xBE838688,
+        0x0E0804E9, 0x55F1BE56, 0xE7E5363B, 0xB3A1F25D,
+        0xF7DEBB85, 0x61FE033C, 0x16746233, 0x3C034C28,
+        0xDA6D0C74, 0x79AAC56C, 0x3CE4E1AD, 0x51F0C802,
+        0x98F8F35A, 0x1626A49F, 0xEED82B29, 0x1D382FE3,
+        0x0C4FB99A, 0xBB325778, 0x3EC6D97B, 0x6E77A6A9,
+        0xCB658B5C, 0xD45230C7, 0x2BD1408B, 0x60C03EB7,
+        0xB9068D78, 0xA33754F4, 0xF430C87D, 0xC8A71302,
+        0xB96D8C32, 0xEBD4E7BE, 0xBE8B9D2D, 0x7979FB06,
+        0xE7225308, 0x8B75CF77, 0x11EF8DA4, 0xE083C858,
+        0x8D6B786F, 0x5A6317A6, 0xFA5CF7A0, 0x5DDA0033,
+        0xF28EBFB0, 0xF5B9C310, 0xA0EAC280, 0x08B9767A,
+        0xA3D9D2B0, 0x79D34217, 0x021A718D, 0x9AC6336A,
+        0x2711FD60, 0x438050E3, 0x069908A8, 0x3D7FEDC4,
+        0x826D2BEF, 0x4EEB8476, 0x488DCF25, 0x36C9D566,
+        0x28E74E41, 0xC2610ACA, 0x3D49A9CF, 0xBAE3B9DF,
+        0xB65F8DE6, 0x92AEAF64, 0x3AC7D5E6, 0x9EA80509,
+        0xF22B017D, 0xA4173F70, 0xDD1E16C3, 0x15E0D7F9,
+        0x50B1B887, 0x2B9F4FD5, 0x625ABA82, 0x6A017962,
+        0x2EC01B9C, 0x15488AA9, 0xD716E740, 0x40055A2C,
+        0x93D29A22, 0xE32DBF9A, 0x058745B9, 0x3453DC1E,
+        0xD699296E, 0x496CFF6F, 0x1C9F4986, 0xDFE2ED07,
+        0xB87242D1, 0x19DE7EAE, 0x053E561A, 0x15AD6F8C,
+        0x66626C1C, 0x7154C24C, 0xEA082B2A, 0x93EB2939,
+        0x17DCB0F0, 0x58D4F2AE, 0x9EA294FB, 0x52CF564C,
+        0x9883FE66, 0x2EC40581, 0x763953C3, 0x01D6692E,
+        0xD3A0C108, 0xA1E7160E, 0xE4F2DFA6, 0x693ED285,
+        0x74904698, 0x4C2B0EDD, 0x4F757656, 0x5D393378,
+        0xA132234F, 0x3D321C5D, 0xC3F5E194, 0x4B269301,
+        0xC79F022F, 0x3C997E7E, 0x5E4F9504, 0x3FFAFBBD,
+        0x76F7AD0E, 0x296693F4, 0x3D1FCE6F, 0xC61E45BE,
+        0xD3B5AB34, 0xF72BF9B7, 0x1B0434C0, 0x4E72B567,
+        0x5592A33D, 0xB5229301, 0xCFD2A87F, 0x60AEB767,
+        0x1814386B, 0x30BCC33D, 0x38A0C07D, 0xFD1606F2,
+        0xC363519B, 0x589DD390, 0x5479F8E6, 0x1CB8D647,
+        0x97FD61A9, 0xEA7759F4, 0x2D57539D, 0x569A58CF,
+        0xE84E63AD, 0x462E1B78, 0x6580F87E, 0xF3817914,
+        0x91DA55F4, 0x40A230F3, 0xD1988F35, 0xB6E318D2,
+        0x3FFA50BC, 0x3D40F021, 0xC3C0BDAE, 0x4958C24C,
+        0x518F36B2, 0x84B1D370, 0x0FEDCE83, 0x878DDADA,
+        0xF2A279C7, 0x94E01BE8, 0x90716F4B, 0x954B8AA3
+};
+
+static const u_int32_t cast_sbox8[256] = {
+        0xE216300D, 0xBBDDFFFC, 0xA7EBDABD, 0x35648095,
+        0x7789F8B7, 0xE6C1121B, 0x0E241600, 0x052CE8B5,
+        0x11A9CFB0, 0xE5952F11, 0xECE7990A, 0x9386D174,
+        0x2A42931C, 0x76E38111, 0xB12DEF3A, 0x37DDDDFC,
+        0xDE9ADEB1, 0x0A0CC32C, 0xBE197029, 0x84A00940,
+        0xBB243A0F, 0xB4D137CF, 0xB44E79F0, 0x049EEDFD,
+        0x0B15A15D, 0x480D3168, 0x8BBBDE5A, 0x669DED42,
+        0xC7ECE831, 0x3F8F95E7, 0x72DF191B, 0x7580330D,
+        0x94074251, 0x5C7DCDFA, 0xABBE6D63, 0xAA402164,
+        0xB301D40A, 0x02E7D1CA, 0x53571DAE, 0x7A3182A2,
+        0x12A8DDEC, 0xFDAA335D, 0x176F43E8, 0x71FB46D4,
+        0x38129022, 0xCE949AD4, 0xB84769AD, 0x965BD862,
+        0x82F3D055, 0x66FB9767, 0x15B80B4E, 0x1D5B47A0,
+        0x4CFDE06F, 0xC28EC4B8, 0x57E8726E, 0x647A78FC,
+        0x99865D44, 0x608BD593, 0x6C200E03, 0x39DC5FF6,
+        0x5D0B00A3, 0xAE63AFF2, 0x7E8BD632, 0x70108C0C,
+        0xBBD35049, 0x2998DF04, 0x980CF42A, 0x9B6DF491,
+        0x9E7EDD53, 0x06918548, 0x58CB7E07, 0x3B74EF2E,
+        0x522FFFB1, 0xD24708CC, 0x1C7E27CD, 0xA4EB215B,
+        0x3CF1D2E2, 0x19B47A38, 0x424F7618, 0x35856039,
+        0x9D17DEE7, 0x27EB35E6, 0xC9AFF67B, 0x36BAF5B8,
+        0x09C467CD, 0xC18910B1, 0xE11DBF7B, 0x06CD1AF8,
+        0x7170C608, 0x2D5E3354, 0xD4DE495A, 0x64C6D006,
+        0xBCC0C62C, 0x3DD00DB3, 0x708F8F34, 0x77D51B42,
+        0x264F620F, 0x24B8D2BF, 0x15C1B79E, 0x46A52564,
+        0xF8D7E54E, 0x3E378160, 0x7895CDA5, 0x859C15A5,
+        0xE6459788, 0xC37BC75F, 0xDB07BA0C, 0x0676A3AB,
+        0x7F229B1E, 0x31842E7B, 0x24259FD7, 0xF8BEF472,
+        0x835FFCB8, 0x6DF4C1F2, 0x96F5B195, 0xFD0AF0FC,
+        0xB0FE134C, 0xE2506D3D, 0x4F9B12EA, 0xF215F225,
+        0xA223736F, 0x9FB4C428, 0x25D04979, 0x34C713F8,
+        0xC4618187, 0xEA7A6E98, 0x7CD16EFC, 0x1436876C,
+        0xF1544107, 0xBEDEEE14, 0x56E9AF27, 0xA04AA441,
+        0x3CF7C899, 0x92ECBAE6, 0xDD67016D, 0x151682EB,
+        0xA842EEDF, 0xFDBA60B4, 0xF1907B75, 0x20E3030F,
+        0x24D8C29E, 0xE139673B, 0xEFA63FB8, 0x71873054,
+        0xB6F2CF3B, 0x9F326442, 0xCB15A4CC, 0xB01A4504,
+        0xF1E47D8D, 0x844A1BE5, 0xBAE7DFDC, 0x42CBDA70,
+        0xCD7DAE0A, 0x57E85B7A, 0xD53F5AF6, 0x20CF4D8C,
+        0xCEA4D428, 0x79D130A4, 0x3486EBFB, 0x33D3CDDC,
+        0x77853B53, 0x37EFFCB5, 0xC5068778, 0xE580B3E6,
+        0x4E68B8F4, 0xC5C8B37E, 0x0D809EA2, 0x398FEB7C,
+        0x132A4F94, 0x43B7950E, 0x2FEE7D1C, 0x223613BD,
+        0xDD06CAA2, 0x37DF932B, 0xC4248289, 0xACF3EBC3,
+        0x5715F6B7, 0xEF3478DD, 0xF267616F, 0xC148CBE4,
+        0x9052815E, 0x5E410FAB, 0xB48A2465, 0x2EDA7FA4,
+        0xE87B40E4, 0xE98EA084, 0x5889E9E1, 0xEFD390FC,
+        0xDD07D35B, 0xDB485694, 0x38D7E5B2, 0x57720101,
+        0x730EDEBC, 0x5B643113, 0x94917E4F, 0x503C2FBA,
+        0x646F1282, 0x7523D24A, 0xE0779695, 0xF9C17A8F,
+        0x7A5B2121, 0xD187B896, 0x29263A4D, 0xBA510CDF,
+        0x81F47C9F, 0xAD1163ED, 0xEA7B5965, 0x1A00726E,
+        0x11403092, 0x00DA6D77, 0x4A0CDD61, 0xAD1F4603,
+        0x605BDFB0, 0x9EEDC364, 0x22EBE6A8, 0xCEE7D28A,
+        0xA0E736A0, 0x5564A6B9, 0x10853209, 0xC7EB8F37,
+        0x2DE705CA, 0x8951570F, 0xDF09822B, 0xBD691A6C,
+        0xAA12E4F2, 0x87451C0F, 0xE0F6A27A, 0x3ADA4819,
+        0x4CF1764F, 0x0D771C2B, 0x67CDB156, 0x350D8384,
+        0x5938FA0F, 0x42399EF3, 0x36997B07, 0x0E84093D,
+        0x4AA93E61, 0x8360D87B, 0x1FA98B0C, 0x1149382C,
+        0xE97625A5, 0x0614D1B7, 0x0E25244B, 0x0C768347,
+        0x589E8D82, 0x0D2059D1, 0xA466BB1E, 0xF8DA0A82,
+        0x04F19130, 0xBA6E4EC0, 0x99265164, 0x1EE7230D,
+        0x50B2AD80, 0xEAEE6801, 0x8DB2A283, 0xEA8BF59E
+};
+
+/* Macros to access 8-bit bytes out of a 32-bit word */
+#define U8a(x) ( (u_int8_t) (x>>24) )
+#define U8b(x) ( (u_int8_t) ((x>>16)&255) )
+#define U8c(x) ( (u_int8_t) ((x>>8)&255) )
+#define U8d(x) ( (u_int8_t) ((x)&255) )
+
+/* Circular left shift */
+#define ROL(x, n) ( ((x)<<(n)) | ((x)>>(32-(n))) )
+
+/* CAST-128 uses three different round functions */
+#define F1(l, r, i) \
+        t = ROL(key->xkey[i] + r, key->xkey[i+16]); \
+        l ^= ((cast_sbox1[U8a(t)] ^ cast_sbox2[U8b(t)]) - \
+         cast_sbox3[U8c(t)]) + cast_sbox4[U8d(t)];
+#define F2(l, r, i) \
+        t = ROL(key->xkey[i] ^ r, key->xkey[i+16]); \
+        l ^= ((cast_sbox1[U8a(t)] - cast_sbox2[U8b(t)]) + \
+         cast_sbox3[U8c(t)]) ^ cast_sbox4[U8d(t)];
+#define F3(l, r, i) \
+        t = ROL(key->xkey[i] - r, key->xkey[i+16]); \
+        l ^= ((cast_sbox1[U8a(t)] + cast_sbox2[U8b(t)]) ^ \
+         cast_sbox3[U8c(t)]) - cast_sbox4[U8d(t)];
+
+
+/***** Encryption Function *****/
+
+void cast_encrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock)
+{
+u_int32_t t, l, r;
+
+        /* Get inblock into l,r */
+        l = ((u_int32_t)inblock[0] << 24) | ((u_int32_t)inblock[1] << 16) |
+         ((u_int32_t)inblock[2] << 8) | (u_int32_t)inblock[3];
+        r = ((u_int32_t)inblock[4] << 24) | ((u_int32_t)inblock[5] << 16) |
+         ((u_int32_t)inblock[6] << 8) | (u_int32_t)inblock[7];
+        /* Do the work */
+        F1(l, r,  0);
+        F2(r, l,  1);
+        F3(l, r,  2);
+        F1(r, l,  3);
+        F2(l, r,  4);
+        F3(r, l,  5);
+        F1(l, r,  6);
+        F2(r, l,  7);
+        F3(l, r,  8);
+        F1(r, l,  9);
+        F2(l, r, 10);
+        F3(r, l, 11);
+        /* Only do full 16 rounds if key length > 80 bits */
+        if (key->rounds > 12) {
+                F1(l, r, 12);
+                F2(r, l, 13);
+                F3(l, r, 14);
+                F1(r, l, 15);
+        }
+        /* Put l,r into outblock */
+        outblock[0] = U8a(r);
+        outblock[1] = U8b(r);
+        outblock[2] = U8c(r);
+        outblock[3] = U8d(r);
+        outblock[4] = U8a(l);
+        outblock[5] = U8b(l);
+        outblock[6] = U8c(l);
+        outblock[7] = U8d(l);
+        /* Wipe clean */
+        t = l = r = 0;
+}
+
+
+/***** Decryption Function *****/
+
+void cast_decrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock)
+{
+u_int32_t t, l, r;
+
+        /* Get inblock into l,r */
+        r = ((u_int32_t)inblock[0] << 24) | ((u_int32_t)inblock[1] << 16) |
+         ((u_int32_t)inblock[2] << 8) | (u_int32_t)inblock[3];
+        l = ((u_int32_t)inblock[4] << 24) | ((u_int32_t)inblock[5] << 16) |
+         ((u_int32_t)inblock[6] << 8) | (u_int32_t)inblock[7];
+        /* Do the work */
+        /* Only do full 16 rounds if key length > 80 bits */
+        if (key->rounds > 12) {
+                F1(r, l, 15);
+                F3(l, r, 14);
+                F2(r, l, 13);
+                F1(l, r, 12);
+        }
+        F3(r, l, 11);
+        F2(l, r, 10);
+        F1(r, l,  9);
+        F3(l, r,  8);
+        F2(r, l,  7);
+        F1(l, r,  6);
+        F3(r, l,  5);
+        F2(l, r,  4);
+        F1(r, l,  3);
+        F3(l, r,  2);
+        F2(r, l,  1);
+        F1(l, r,  0);
+        /* Put l,r into outblock */
+        outblock[0] = U8a(l);
+        outblock[1] = U8b(l);
+        outblock[2] = U8c(l);
+        outblock[3] = U8d(l);
+        outblock[4] = U8a(r);
+        outblock[5] = U8b(r);
+        outblock[6] = U8c(r);
+        outblock[7] = U8d(r);
+        /* Wipe clean */
+        t = l = r = 0;
+}
+
+
+/***** Key Schedual *****/
+
+void cast_setkey(cast_key* key, u_int8_t* rawkey, int keybytes)
+{
+u_int32_t t[4], z[4], x[4];
+int i;
+
+        /* Set number of rounds to 12 or 16, depending on key length */
+        key->rounds = (keybytes <= 10 ? 12 : 16);
+
+        /* Copy key to workspace x */
+        for (i = 0; i < 4; i++) {
+                x[i] = 0;
+                if ((i*4+0) < keybytes) x[i] = (u_int32_t)rawkey[i*4+0] << 24;
+                if ((i*4+1) < keybytes) x[i] |= (u_int32_t)rawkey[i*4+1] << 16;
+                if ((i*4+2) < keybytes) x[i] |= (u_int32_t)rawkey[i*4+2] << 8;
+                if ((i*4+3) < keybytes) x[i] |= (u_int32_t)rawkey[i*4+3];
+        }
+        /* Generate 32 subkeys, four at a time */
+        for (i = 0; i < 32; i+=4) {
+                switch (i & 4) {
+                 case 0:
+                        t[0] = z[0] = x[0] ^ cast_sbox5[U8b(x[3])] ^
+                         cast_sbox6[U8d(x[3])] ^ cast_sbox7[U8a(x[3])] ^
+                         cast_sbox8[U8c(x[3])] ^ cast_sbox7[U8a(x[2])];
+                        t[1] = z[1] = x[2] ^ cast_sbox5[U8a(z[0])] ^
+                         cast_sbox6[U8c(z[0])] ^ cast_sbox7[U8b(z[0])] ^
+                         cast_sbox8[U8d(z[0])] ^ cast_sbox8[U8c(x[2])];
+                        t[2] = z[2] = x[3] ^ cast_sbox5[U8d(z[1])] ^
+                         cast_sbox6[U8c(z[1])] ^ cast_sbox7[U8b(z[1])] ^
+                         cast_sbox8[U8a(z[1])] ^ cast_sbox5[U8b(x[2])];
+                        t[3] = z[3] = x[1] ^ cast_sbox5[U8c(z[2])] ^
+                         cast_sbox6[U8b(z[2])] ^ cast_sbox7[U8d(z[2])] ^
+                         cast_sbox8[U8a(z[2])] ^ cast_sbox6[U8d(x[2])];
+                        break;
+                 case 4:
+                        t[0] = x[0] = z[2] ^ cast_sbox5[U8b(z[1])] ^
+                         cast_sbox6[U8d(z[1])] ^ cast_sbox7[U8a(z[1])] ^
+                         cast_sbox8[U8c(z[1])] ^ cast_sbox7[U8a(z[0])];
+                        t[1] = x[1] = z[0] ^ cast_sbox5[U8a(x[0])] ^
+                         cast_sbox6[U8c(x[0])] ^ cast_sbox7[U8b(x[0])] ^
+                         cast_sbox8[U8d(x[0])] ^ cast_sbox8[U8c(z[0])];
+                        t[2] = x[2] = z[1] ^ cast_sbox5[U8d(x[1])] ^
+                         cast_sbox6[U8c(x[1])] ^ cast_sbox7[U8b(x[1])] ^
+                         cast_sbox8[U8a(x[1])] ^ cast_sbox5[U8b(z[0])];
+                        t[3] = x[3] = z[3] ^ cast_sbox5[U8c(x[2])] ^
+                         cast_sbox6[U8b(x[2])] ^ cast_sbox7[U8d(x[2])] ^
+                         cast_sbox8[U8a(x[2])] ^ cast_sbox6[U8d(z[0])];
+                        break;
+                }
+                switch (i & 12) {
+                 case 0:
+                 case 12:
+                        key->xkey[i+0] = cast_sbox5[U8a(t[2])] ^ cast_sbox6[U8b(t[2])] ^
+                         cast_sbox7[U8d(t[1])] ^ cast_sbox8[U8c(t[1])];
+                        key->xkey[i+1] = cast_sbox5[U8c(t[2])] ^ cast_sbox6[U8d(t[2])] ^
+                         cast_sbox7[U8b(t[1])] ^ cast_sbox8[U8a(t[1])];
+                        key->xkey[i+2] = cast_sbox5[U8a(t[3])] ^ cast_sbox6[U8b(t[3])] ^
+                         cast_sbox7[U8d(t[0])] ^ cast_sbox8[U8c(t[0])];
+                        key->xkey[i+3] = cast_sbox5[U8c(t[3])] ^ cast_sbox6[U8d(t[3])] ^
+                         cast_sbox7[U8b(t[0])] ^ cast_sbox8[U8a(t[0])];
+                        break;
+                 case 4:
+                 case 8:
+                        key->xkey[i+0] = cast_sbox5[U8d(t[0])] ^ cast_sbox6[U8c(t[0])] ^
+                         cast_sbox7[U8a(t[3])] ^ cast_sbox8[U8b(t[3])];
+                        key->xkey[i+1] = cast_sbox5[U8b(t[0])] ^ cast_sbox6[U8a(t[0])] ^
+                         cast_sbox7[U8c(t[3])] ^ cast_sbox8[U8d(t[3])];
+                        key->xkey[i+2] = cast_sbox5[U8d(t[1])] ^ cast_sbox6[U8c(t[1])] ^
+                         cast_sbox7[U8a(t[2])] ^ cast_sbox8[U8b(t[2])];
+                        key->xkey[i+3] = cast_sbox5[U8b(t[1])] ^ cast_sbox6[U8a(t[1])] ^
+                         cast_sbox7[U8c(t[2])] ^ cast_sbox8[U8d(t[2])];
+                        break;
+                }
+                switch (i & 12) {
+                 case 0:
+                        key->xkey[i+0] ^= cast_sbox5[U8c(z[0])];
+                        key->xkey[i+1] ^= cast_sbox6[U8c(z[1])];
+                        key->xkey[i+2] ^= cast_sbox7[U8b(z[2])];
+                        key->xkey[i+3] ^= cast_sbox8[U8a(z[3])];
+                        break;
+                 case 4:
+                        key->xkey[i+0] ^= cast_sbox5[U8a(x[2])];
+                        key->xkey[i+1] ^= cast_sbox6[U8b(x[3])];
+                        key->xkey[i+2] ^= cast_sbox7[U8d(x[0])];
+                        key->xkey[i+3] ^= cast_sbox8[U8d(x[1])];
+                        break;
+                 case 8:
+                        key->xkey[i+0] ^= cast_sbox5[U8b(z[2])];
+                        key->xkey[i+1] ^= cast_sbox6[U8a(z[3])];
+                        key->xkey[i+2] ^= cast_sbox7[U8c(z[0])];
+                        key->xkey[i+3] ^= cast_sbox8[U8c(z[1])];
+                        break;
+                 case 12:
+                        key->xkey[i+0] ^= cast_sbox5[U8d(x[0])];
+                        key->xkey[i+1] ^= cast_sbox6[U8d(x[1])];
+                        key->xkey[i+2] ^= cast_sbox7[U8a(x[2])];
+                        key->xkey[i+3] ^= cast_sbox8[U8b(x[3])];
+                        break;
+                }
+                if (i >= 16) {
+                        key->xkey[i+0] &= 31;
+                        key->xkey[i+1] &= 31;
+                        key->xkey[i+2] &= 31;
+                        key->xkey[i+3] &= 31;
+                }
+        }
+        /* Wipe clean */
+        for (i = 0; i < 4; i++) {
+                t[i] = x[i] = z[i] = 0;
+        }
+}
+
+/* Made in Canada */
+
diff --git a/src/lib/libc/crypt/crypt.3 b/src/lib/libc/crypt/crypt.3
new file mode 100644
index 0000000000..239c9b3089
--- /dev/null
+++ b/src/lib/libc/crypt/crypt.3
@@ -0,0 +1,298 @@
+.\" $OpenBSD: crypt.3,v 1.12 1999/03/18 11:08:33 aaron Exp $
+.\"
+.\" FreeSec: libcrypt
+.\"
+.\" Copyright (c) 1994 David Burren
+.\" 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.
+.\" 4. Neither the name of the author nor the names of other contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" Manual page, using -mandoc macros
+.\"
+.Dd March 9, 1994
+.Dt CRYPT 3
+.Os
+.Sh NAME
+.Nm crypt ,
+.Nm setkey ,
+.Nm encrypt ,
+.Nm des_setkey ,
+.Nm des_cipher
+.Nd DES encryption
+.Sh SYNOPSIS
+.Fd #include <unistd.h>
+.Ft char
+.Fn *crypt "const char *key" "const char *setting"
+.Ft int
+.Fn setkey "char *key"
+.Ft int
+.Fn encrypt "char *block" "int flag"
+.Ft int
+.Fn des_setkey "const char *key"
+.Ft int
+.Fn des_cipher "const char *in" "char *out" "int32_t salt" "int count"
+.Sh DESCRIPTION
+The
+.Fn crypt
+function performs password encryption, based on the
+.Tn NBS
+Data Encryption Standard (DES).
+Additional code has been added to deter key search attempts and to use
+stronger hashing algorithms.
+The first argument to
+.Fn crypt
+is a
+.Dv null Ns -terminated
+string, typically a user's typed password.
+The second is in one of three forms:
+if it begins with an underscore (``_'') then an extended format is used
+in interpreting both the key and the setting, as outlined below. If it begins
+with an string character (``$'') and a number then a different algorithm
+is used depending on the number. At the moment a ``$1'' chooses MD5 hashing
+and a ``$2'' chooses Blowfish hashing, see below for more information.
+.Ss Extended crypt:
+.Pp
+The
+.Ar key
+is divided into groups of 8 characters (the last group is null-padded)
+and the low-order 7 bits of each character (56 bits per group) are
+used to form the DES key as follows:
+the first group of 56 bits becomes the initial DES key.
+For each additional group, the XOR of the encryption of the current DES
+key with itself and the group bits becomes the next DES key.
+.Pp
+The setting is a 9-character array consisting of an underscore followed
+by 4 bytes of iteration count and 4 bytes of salt.
+These are encoded as printable characters, 6 bits per character,
+least significant character first.
+The values 0 to 63 are encoded as ``./0-9A-Za-z''.
+This allows 24 bits for both
+.Fa count
+and
+.Fa salt .
+.Ss "MD5" crypt:
+.Pp
+For 
+.Tn MD5 
+crypt the version number, 
+.Fa salt 
+and the hashed password are separated
+by the ``$'' character. The maximum length of a password is limited by
+the length counter of the MD5 context, which is about
+2**64. A valid MD5 password entry looks like this: 
+.Pp
+``$1$caeiHQwX$hsKqOjrFRRN6K32OWkCBf1''.
+.Pp
+The whole MD5 password string is passed as 
+.Fa setting
+for interpretation.
+.Ss "Blowfish" crypt:
+.Pp
+The 
+.Tn Blowfish 
+version of crypt has 128 bits of 
+.Fa salt 
+in order to make building
+dictionaries of common passwords space consuming. The initial state
+of the 
+.Tn Blowfish 
+cipher is expanded using the 
+.Fa salt
+and the
+.Fa password 
+repeating the process a variable number of rounds, which is encoded in
+the password string. The maximum password length is 72. The final Blowfish
+password entry is created by encrypting
+the string ``OrpheanBeholderScryDoubt'' with the 
+.Tn Blowfish 
+state 64 times.
+.Pp
+The version number, the logarithm of the number of rounds and 
+the concatenation of salt and
+hashed password are separated by the ``$'' character. An encoded ``8''
+would specify 256 rounds.
+A valid Blowfish password looks like this:
+.Pp
+``$2a$12$eIAq8PR8sIUnJ1HaohxX2O9x9Qlm2vK97LJ5dsXdmB.eXF42qjchC''.
+.Pp
+The whole Blowfish password string is passed as 
+.Fa setting
+for interpretation.
+.Ss "Traditional" crypt:
+.Pp
+The first 8 bytes of the key are null-padded, and the low-order 7 bits of
+each character is used to form the 56-bit
+.Tn DES
+key.
+.Pp
+The setting is a 2-character array of the ASCII-encoded salt.
+Thus only 12 bits of
+.Fa salt
+are used.
+.Fa count
+is set to 25.
+.Ss DES Algorithm:
+.Pp
+The
+.Fa salt
+introduces disorder in the
+.Tn DES
+algorithm in one of 16777216 or 4096 possible ways
+(ie. with 24 or 12 bits: if bit
+.Em i
+of the
+.Ar salt
+is set, then bits
+.Em i
+and
+.Em i+24
+are swapped in the
+.Tn DES
+E-box output).
+.Pp
+The DES key is used to encrypt a 64-bit constant using
+.Ar count
+iterations of
+.Tn DES .
+The value returned is a
+.Dv null Ns -terminated
+string, 20 or 13 bytes (plus null) in length, consisting of the
+.Ar setting
+followed by the encoded 64-bit encryption.
+.Pp
+The functions,
+.Fn encrypt ,
+.Fn setkey ,
+.Fn des_setkey
+and
+.Fn des_cipher
+provide access to the
+.Tn DES
+algorithm itself.
+.Fn setkey
+is passed a 64-byte array of binary values (numeric 0 or 1).
+A 56-bit key is extracted from this array by dividing the
+array into groups of 8, and ignoring the last bit in each group.
+That bit is reserved for a byte parity check by DES, but is ignored
+by these functions.
+.Pp
+The
+.Fa block
+argument to
+.Fn encrypt
+is also a 64-byte array of binary values.
+If the value of
+.Fa flag
+is 0,
+.Fa block
+is encrypted otherwise it is decrypted.
+The result is returned in the original array
+.Fa block
+after using the key specified by
+.Fn setkey
+to process it.
+.Pp
+The argument to
+.Fn des_setkey
+is a character array of length 8.
+The least significant bit (the parity bit) in each character is ignored,
+and the remaining bits are concatenated to form a 56-bit key.
+The function
+.Fn des_cipher
+encrypts (or decrypts if
+.Fa count
+is negative) the 64-bits stored in the 8 characters at
+.Fa in
+using
+.Xr abs 3
+of
+.Fa count
+iterations of
+.Tn DES
+and stores the 64-bit result in the 8 characters at
+.Fa out
+(which may be the same as
+.Fa in
+).
+The
+.Fa salt
+specifies perturbations to the
+.Tn DES
+E-box output as described above.
+.Pp
+The function
+.Fn crypt
+returns a pointer to the encrypted value on success, and NULL on failure.
+The functions
+.Fn setkey ,
+.Fn encrypt ,
+.Fn des_setkey ,
+and
+.Fn des_cipher
+return 0 on success and 1 on failure.
+.Pp
+The
+.Fn crypt ,
+.Fn setkey
+and
+.Fn des_setkey
+functions all manipulate the same key space.
+.Sh SEE ALSO
+.Xr login 1 ,
+.Xr passwd 1 ,
+.Xr blowfish 3 ,
+.Xr getpass 3 ,
+.Xr md5 3 ,
+.Xr passwd 5
+.Sh BUGS
+The
+.Fn crypt
+function returns a pointer to static data, and subsequent calls to
+.Fn crypt
+will modify the same object.
+.Sh HISTORY
+A rotor-based
+.Fn crypt
+function appeared in
+.At v6 .
+The current style
+.Fn crypt
+first appeared in
+.At v7 .
+.Pp
+This library (FreeSec 1.0) was developed outside the United States of America
+as an unencumbered replacement for the U.S.-only libcrypt encryption
+library.
+Programs linked against the 
+.Fn crypt
+interface may be exported from the U.S.A. only if they use 
+.Fn crypt
+solely for authentication purposes and avoid use of
+the other programmer interfaces listed above. Special care has been taken
+in the library so that programs which only use the 
+.Fn crypt
+interface do not pull in the other components.
+.Sh AUTHOR
+David Burren <davidb@werj.com.au>
diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
new file mode 100644
index 0000000000..8fd319a4f3
--- /dev/null
+++ b/src/lib/libc/crypt/crypt.c
@@ -0,0 +1,714 @@
+/*      $OpenBSD: crypt.c,v 1.13 1998/03/22 19:01:18 niklas Exp $       */
+
+/*
+ * FreeSec: libcrypt
+ *
+ * Copyright (c) 1994 David Burren
+ * 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.
+ * 4. Neither the name of the author nor the names of other contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * This is an original implementation of the DES and the crypt(3) interfaces
+ * by David Burren <davidb@werj.com.au>.
+ *
+ * An excellent reference on the underlying algorithm (and related
+ * algorithms) is:
+ *
+ *      B. Schneier, Applied Cryptography: protocols, algorithms,
+ *      and source code in C, John Wiley & Sons, 1994.
+ *
+ * Note that in that book's description of DES the lookups for the initial,
+ * pbox, and final permutations are inverted (this has been brought to the
+ * attention of the author).  A list of errata for this book has been
+ * posted to the sci.crypt newsgroup by the author and is available for FTP.
+ *
+ * NOTE:
+ * This file has a static version of des_setkey() so that crypt.o exports
+ * only the crypt() interface. This is required to make binaries linked
+ * against crypt.o exportable or re-exportable from the USA.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: crypt.c,v 1.13 1998/03/22 19:01:18 niklas Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <pwd.h>
+#include <string.h>
+
+#ifdef DEBUG
+# include <stdio.h>
+#endif
+
+static u_char   IP[64] = {
+        58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12,  4,
+        62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16,  8,
+        57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11,  3,
+        61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15,  7
+};
+
+static u_char   inv_key_perm[64];
+static u_char   u_key_perm[56];
+static u_char   key_perm[56] = {
+        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
+};
+
+static u_char   key_shifts[16] = {
+        1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
+};
+
+static u_char   inv_comp_perm[56];
+static u_char   comp_perm[48] = {
+        14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
+        23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
+        41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
+        44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
+};
+
+/*
+ *      No E box is used, as it's replaced by some ANDs, shifts, and ORs.
+ */
+
+static u_char   u_sbox[8][64];
+static u_char   sbox[8][64] = {
+        {
+                14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+                 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+                 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+                15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13
+        },
+        {
+                15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+                 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+                 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+                13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9
+        },
+        {
+                10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+                13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+                13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+                 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12
+        },
+        {
+                 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+                13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+                10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+                 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14
+        },
+        {
+                 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+                14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+                 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+                11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3
+        },
+        {
+                12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+                10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+                 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+                 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13
+        },
+        {
+                 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+                13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+                 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+                 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12
+        },
+        {
+                13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+                 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+                 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
+                 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
+        }
+};
+
+static u_char   un_pbox[32];
+static u_char   pbox[32] = {
+        16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
+         2,  8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
+};
+
+static u_int32_t bits32[32] =
+{
+        0x80000000, 0x40000000, 0x20000000, 0x10000000,
+        0x08000000, 0x04000000, 0x02000000, 0x01000000,
+        0x00800000, 0x00400000, 0x00200000, 0x00100000,
+        0x00080000, 0x00040000, 0x00020000, 0x00010000,
+        0x00008000, 0x00004000, 0x00002000, 0x00001000,
+        0x00000800, 0x00000400, 0x00000200, 0x00000100,
+        0x00000080, 0x00000040, 0x00000020, 0x00000010,
+        0x00000008, 0x00000004, 0x00000002, 0x00000001
+};
+
+static u_char   bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
+
+static u_int32_t saltbits;
+static int32_t  old_salt;
+static u_int32_t *bits28, *bits24;
+static u_char   init_perm[64], final_perm[64];
+static u_int32_t en_keysl[16], en_keysr[16];
+static u_int32_t de_keysl[16], de_keysr[16];
+static int      des_initialised = 0;
+static u_char   m_sbox[4][4096];
+static u_int32_t psbox[4][256];
+static u_int32_t ip_maskl[8][256], ip_maskr[8][256];
+static u_int32_t fp_maskl[8][256], fp_maskr[8][256];
+static u_int32_t key_perm_maskl[8][128], key_perm_maskr[8][128];
+static u_int32_t comp_maskl[8][128], comp_maskr[8][128];
+static u_int32_t old_rawkey0, old_rawkey1;
+
+static u_char   ascii64[] =
+         "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+/*        0000000000111111111122222222223333333333444444444455555555556666 */
+/*        0123456789012345678901234567890123456789012345678901234567890123 */
+
+static __inline int
+ascii_to_bin(ch)
+        char ch;
+{
+        if (ch > 'z')
+                return(0);
+        if (ch >= 'a')
+                return(ch - 'a' + 38);
+        if (ch > 'Z')
+                return(0);
+        if (ch >= 'A')
+                return(ch - 'A' + 12);
+        if (ch > '9')
+                return(0);
+        if (ch >= '.')
+                return(ch - '.');
+        return(0);
+}
+
+static void
+des_init()
+{
+        int     i, j, b, k, inbit, obit;
+        u_int32_t       *p, *il, *ir, *fl, *fr;
+
+        old_rawkey0 = old_rawkey1 = 0;
+        saltbits = 0;
+        old_salt = 0;
+        bits24 = (bits28 = bits32 + 4) + 4;
+
+        /*
+         * Invert the S-boxes, reordering the input bits.
+         */
+        for (i = 0; i < 8; i++)
+                for (j = 0; j < 64; j++) {
+                        b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf);
+                        u_sbox[i][j] = sbox[i][b];
+                }
+
+        /*
+         * Convert the inverted S-boxes into 4 arrays of 8 bits.
+         * Each will handle 12 bits of the S-box input.
+         */
+        for (b = 0; b < 4; b++)
+                for (i = 0; i < 64; i++)
+                        for (j = 0; j < 64; j++)
+                                m_sbox[b][(i << 6) | j] =
+                                        (u_sbox[(b << 1)][i] << 4) |
+                                        u_sbox[(b << 1) + 1][j];
+
+        /*
+         * Set up the initial & final permutations into a useful form, and
+         * initialise the inverted key permutation.
+         */
+        for (i = 0; i < 64; i++) {
+                init_perm[final_perm[i] = IP[i] - 1] = i;
+                inv_key_perm[i] = 255;
+        }
+
+        /*
+         * Invert the key permutation and initialise the inverted key
+         * compression permutation.
+         */
+        for (i = 0; i < 56; i++) {
+                u_key_perm[i] = key_perm[i] - 1;
+                inv_key_perm[key_perm[i] - 1] = i;
+                inv_comp_perm[i] = 255;
+        }
+
+        /*
+         * Invert the key compression permutation.
+         */
+        for (i = 0; i < 48; i++) {
+                inv_comp_perm[comp_perm[i] - 1] = i;
+        }
+
+        /*
+         * Set up the OR-mask arrays for the initial and final permutations,
+         * and for the key initial and compression permutations.
+         */
+        for (k = 0; k < 8; k++) {
+                for (i = 0; i < 256; i++) {
+                        *(il = &ip_maskl[k][i]) = 0;
+                        *(ir = &ip_maskr[k][i]) = 0;
+                        *(fl = &fp_maskl[k][i]) = 0;
+                        *(fr = &fp_maskr[k][i]) = 0;
+                        for (j = 0; j < 8; j++) {
+                                inbit = 8 * k + j;
+                                if (i & bits8[j]) {
+                                        if ((obit = init_perm[inbit]) < 32)
+                                                *il |= bits32[obit];
+                                        else
+                                                *ir |= bits32[obit-32];
+                                        if ((obit = final_perm[inbit]) < 32)
+                                                *fl |= bits32[obit];
+                                        else
+                                                *fr |= bits32[obit - 32];
+                                }
+                        }
+                }
+                for (i = 0; i < 128; i++) {
+                        *(il = &key_perm_maskl[k][i]) = 0;
+                        *(ir = &key_perm_maskr[k][i]) = 0;
+                        for (j = 0; j < 7; j++) {
+                                inbit = 8 * k + j;
+                                if (i & bits8[j + 1]) {
+                                        if ((obit = inv_key_perm[inbit]) == 255)
+                                                continue;
+                                        if (obit < 28)
+                                                *il |= bits28[obit];
+                                        else
+                                                *ir |= bits28[obit - 28];
+                                }
+                        }
+                        *(il = &comp_maskl[k][i]) = 0;
+                        *(ir = &comp_maskr[k][i]) = 0;
+                        for (j = 0; j < 7; j++) {
+                                inbit = 7 * k + j;
+                                if (i & bits8[j + 1]) {
+                                        if ((obit=inv_comp_perm[inbit]) == 255)
+                                                continue;
+                                        if (obit < 24)
+                                                *il |= bits24[obit];
+                                        else
+                                                *ir |= bits24[obit - 24];
+                                }
+                        }
+                }
+        }
+
+        /*
+         * Invert the P-box permutation, and convert into OR-masks for
+         * handling the output of the S-box arrays setup above.
+         */
+        for (i = 0; i < 32; i++)
+                un_pbox[pbox[i] - 1] = i;
+
+        for (b = 0; b < 4; b++)
+                for (i = 0; i < 256; i++) {
+                        *(p = &psbox[b][i]) = 0;
+                        for (j = 0; j < 8; j++) {
+                                if (i & bits8[j])
+                                        *p |= bits32[un_pbox[8 * b + j]];
+                        }
+                }
+
+        des_initialised = 1;
+}
+
+static void
+setup_salt(salt)
+        int32_t salt;
+{
+        u_int32_t       obit, saltbit;
+        int     i;
+
+        if (salt == old_salt)
+                return;
+        old_salt = salt;
+
+        saltbits = 0;
+        saltbit = 1;
+        obit = 0x800000;
+        for (i = 0; i < 24; i++) {
+                if (salt & saltbit)
+                        saltbits |= obit;
+                saltbit <<= 1;
+                obit >>= 1;
+        }
+}
+
+static int
+des_setkey(key)
+        const char *key;
+{
+        u_int32_t k0, k1, rawkey0, rawkey1;
+        int     shifts, round;
+
+        if (!des_initialised)
+                des_init();
+
+        rawkey0 = ntohl(*(u_int32_t *) key);
+        rawkey1 = ntohl(*(u_int32_t *) (key + 4));
+
+        if ((rawkey0 | rawkey1)
+            && rawkey0 == old_rawkey0
+            && rawkey1 == old_rawkey1) {
+                /*
+                 * Already setup for this key.
+                 * This optimisation fails on a zero key (which is weak and
+                 * has bad parity anyway) in order to simplify the starting
+                 * conditions.
+                 */
+                return(0);
+        }
+        old_rawkey0 = rawkey0;
+        old_rawkey1 = rawkey1;
+
+        /*
+         *      Do key permutation and split into two 28-bit subkeys.
+         */
+        k0 = key_perm_maskl[0][rawkey0 >> 25]
+           | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f]
+           | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f]
+           | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f]
+           | key_perm_maskl[4][rawkey1 >> 25]
+           | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f]
+           | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f]
+           | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f];
+        k1 = key_perm_maskr[0][rawkey0 >> 25]
+           | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f]
+           | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f]
+           | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f]
+           | key_perm_maskr[4][rawkey1 >> 25]
+           | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f]
+           | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f]
+           | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f];
+        /*
+         *      Rotate subkeys and do compression permutation.
+         */
+        shifts = 0;
+        for (round = 0; round < 16; round++) {
+                u_int32_t       t0, t1;
+
+                shifts += key_shifts[round];
+
+                t0 = (k0 << shifts) | (k0 >> (28 - shifts));
+                t1 = (k1 << shifts) | (k1 >> (28 - shifts));
+
+                de_keysl[15 - round] =
+                en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f]
+                                | comp_maskl[1][(t0 >> 14) & 0x7f]
+                                | comp_maskl[2][(t0 >> 7) & 0x7f]
+                                | comp_maskl[3][t0 & 0x7f]
+                                | comp_maskl[4][(t1 >> 21) & 0x7f]
+                                | comp_maskl[5][(t1 >> 14) & 0x7f]
+                                | comp_maskl[6][(t1 >> 7) & 0x7f]
+                                | comp_maskl[7][t1 & 0x7f];
+
+                de_keysr[15 - round] =
+                en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f]
+                                | comp_maskr[1][(t0 >> 14) & 0x7f]
+                                | comp_maskr[2][(t0 >> 7) & 0x7f]
+                                | comp_maskr[3][t0 & 0x7f]
+                                | comp_maskr[4][(t1 >> 21) & 0x7f]
+                                | comp_maskr[5][(t1 >> 14) & 0x7f]
+                                | comp_maskr[6][(t1 >> 7) & 0x7f]
+                                | comp_maskr[7][t1 & 0x7f];
+        }
+        return(0);
+}
+
+static int
+do_des(l_in, r_in, l_out, r_out, count)
+        u_int32_t l_in, r_in, *l_out, *r_out;
+        int count;
+{
+        /*
+         *      l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format.
+         */
+        u_int32_t       l, r, *kl, *kr, *kl1, *kr1;
+        u_int32_t       f, r48l, r48r;
+        int             round;
+
+        if (count == 0) {
+                return(1);
+        } else if (count > 0) {
+                /*
+                 * Encrypting
+                 */
+                kl1 = en_keysl;
+                kr1 = en_keysr;
+        } else {
+                /*
+                 * Decrypting
+                 */
+                count = -count;
+                kl1 = de_keysl;
+                kr1 = de_keysr;
+        }
+
+        /*
+         *      Do initial permutation (IP).
+         */
+        l = ip_maskl[0][l_in >> 24]
+          | ip_maskl[1][(l_in >> 16) & 0xff]
+          | ip_maskl[2][(l_in >> 8) & 0xff]
+          | ip_maskl[3][l_in & 0xff]
+          | ip_maskl[4][r_in >> 24]
+          | ip_maskl[5][(r_in >> 16) & 0xff]
+          | ip_maskl[6][(r_in >> 8) & 0xff]
+          | ip_maskl[7][r_in & 0xff];
+        r = ip_maskr[0][l_in >> 24]
+          | ip_maskr[1][(l_in >> 16) & 0xff]
+          | ip_maskr[2][(l_in >> 8) & 0xff]
+          | ip_maskr[3][l_in & 0xff]
+          | ip_maskr[4][r_in >> 24]
+          | ip_maskr[5][(r_in >> 16) & 0xff]
+          | ip_maskr[6][(r_in >> 8) & 0xff]
+          | ip_maskr[7][r_in & 0xff];
+
+        while (count--) {
+                /*
+                 * Do each round.
+                 */
+                kl = kl1;
+                kr = kr1;
+                round = 16;
+                while (round--) {
+                        /*
+                         * Expand R to 48 bits (simulate the E-box).
+                         */
+                        r48l    = ((r & 0x00000001) << 23)
+                                | ((r & 0xf8000000) >> 9)
+                                | ((r & 0x1f800000) >> 11)
+                                | ((r & 0x01f80000) >> 13)
+                                | ((r & 0x001f8000) >> 15);
+
+                        r48r    = ((r & 0x0001f800) << 7)
+                                | ((r & 0x00001f80) << 5)
+                                | ((r & 0x000001f8) << 3)
+                                | ((r & 0x0000001f) << 1)
+                                | ((r & 0x80000000) >> 31);
+                        /*
+                         * Do salting for crypt() and friends, and
+                         * XOR with the permuted key.
+                         */
+                        f = (r48l ^ r48r) & saltbits;
+                        r48l ^= f ^ *kl++;
+                        r48r ^= f ^ *kr++;
+                        /*
+                         * Do sbox lookups (which shrink it back to 32 bits)
+                         * and do the pbox permutation at the same time.
+                         */
+                        f = psbox[0][m_sbox[0][r48l >> 12]]
+                          | psbox[1][m_sbox[1][r48l & 0xfff]]
+                          | psbox[2][m_sbox[2][r48r >> 12]]
+                          | psbox[3][m_sbox[3][r48r & 0xfff]];
+                        /*
+                         * Now that we've permuted things, complete f().
+                         */
+                        f ^= l;
+                        l = r;
+                        r = f;
+                }
+                r = l;
+                l = f;
+        }
+        /*
+         * Do final permutation (inverse of IP).
+         */
+        *l_out  = fp_maskl[0][l >> 24]
+                | fp_maskl[1][(l >> 16) & 0xff]
+                | fp_maskl[2][(l >> 8) & 0xff]
+                | fp_maskl[3][l & 0xff]
+                | fp_maskl[4][r >> 24]
+                | fp_maskl[5][(r >> 16) & 0xff]
+                | fp_maskl[6][(r >> 8) & 0xff]
+                | fp_maskl[7][r & 0xff];
+        *r_out  = fp_maskr[0][l >> 24]
+                | fp_maskr[1][(l >> 16) & 0xff]
+                | fp_maskr[2][(l >> 8) & 0xff]
+                | fp_maskr[3][l & 0xff]
+                | fp_maskr[4][r >> 24]
+                | fp_maskr[5][(r >> 16) & 0xff]
+                | fp_maskr[6][(r >> 8) & 0xff]
+                | fp_maskr[7][r & 0xff];
+        return(0);
+}
+
+static int
+des_cipher(in, out, salt, count)
+        const char *in;
+        char *out;
+        int32_t salt;
+        int count;
+{
+        u_int32_t l_out, r_out, rawl, rawr;
+        u_int32_t x[2];
+        int     retval;
+
+        if (!des_initialised)
+                des_init();
+
+        setup_salt(salt);
+
+        memcpy(x, in, sizeof x);
+        rawl = ntohl(x[0]);
+        rawr = ntohl(x[1]);
+        retval = do_des(rawl, rawr, &l_out, &r_out, count);
+
+        x[0] = htonl(l_out);
+        x[1] = htonl(r_out);
+        memcpy(out, x, sizeof x);
+        return(retval);
+}
+
+char *
+crypt(key, setting)
+        const char *key;
+        const char *setting;
+{
+        int             i;
+        u_int32_t       count, salt, l, r0, r1, keybuf[2];
+        u_char          *p, *q;
+        static u_char   output[21];
+        extern char     *md5crypt __P((const char *, const char *));
+        extern char     *bcrypt __P((const char *, const char *));
+
+        if (setting[0] == '$') {
+                switch (setting[1]) {
+                case '1':
+                        return (md5crypt(key, setting));
+                default:
+                        return bcrypt(key, setting);
+                }
+        }
+
+        if (!des_initialised)
+                des_init();
+
+        /*
+         * Copy the key, shifting each character up by one bit
+         * and padding with zeros.
+         */
+        q = (u_char *) keybuf;
+        while ((q - (u_char *) keybuf) < sizeof(keybuf)) {
+                if ((*q++ = *key << 1))
+                        key++;
+        }
+        if (des_setkey((u_char *) keybuf))
+                return(NULL);
+
+        if (*setting == _PASSWORD_EFMT1) {
+                /*
+                 * "new"-style:
+                 *      setting - underscore, 4 bytes of count, 4 bytes of salt
+                 *      key - unlimited characters
+                 */
+                for (i = 1, count = 0; i < 5; i++)
+                        count |= ascii_to_bin(setting[i]) << (i - 1) * 6;
+
+                for (i = 5, salt = 0; i < 9; i++)
+                        salt |= ascii_to_bin(setting[i]) << (i - 5) * 6;
+
+                while (*key) {
+                        /*
+                         * Encrypt the key with itself.
+                         */
+                        if (des_cipher((u_char*)keybuf, (u_char*)keybuf, 0, 1))
+                                return(NULL);
+                        /*
+                         * And XOR with the next 8 characters of the key.
+                         */
+                        q = (u_char *) keybuf;
+                        while (((q - (u_char *) keybuf) < sizeof(keybuf)) &&
+                                        *key)
+                                *q++ ^= *key++ << 1;
+
+                        if (des_setkey((u_char *) keybuf))
+                                return(NULL);
+                }
+                strncpy((char *)output, setting, 9);
+
+                /*
+                 * Double check that we weren't given a short setting.
+                 * If we were, the above code will probably have created
+                 * wierd values for count and salt, but we don't really care.
+                 * Just make sure the output string doesn't have an extra
+                 * NUL in it.
+                 */
+                output[9] = '\0';
+                p = output + strlen((const char *)output);
+        } else {
+                /*
+                 * "old"-style:
+                 *      setting - 2 bytes of salt
+                 *      key - up to 8 characters
+                 */
+                count = 25;
+
+                salt = (ascii_to_bin(setting[1]) << 6)
+                     |  ascii_to_bin(setting[0]);
+
+                output[0] = setting[0];
+                /*
+                 * If the encrypted password that the salt was extracted from
+                 * is only 1 character long, the salt will be corrupted.  We
+                 * need to ensure that the output string doesn't have an extra
+                 * NUL in it!
+                 */
+                output[1] = setting[1] ? setting[1] : output[0];
+
+                p = output + 2;
+        }
+        setup_salt(salt);
+        /*
+         * Do it.
+         */
+        if (do_des(0, 0, &r0, &r1, count))
+                return(NULL);
+        /*
+         * Now encode the result...
+         */
+        l = (r0 >> 8);
+        *p++ = ascii64[(l >> 18) & 0x3f];
+        *p++ = ascii64[(l >> 12) & 0x3f];
+        *p++ = ascii64[(l >> 6) & 0x3f];
+        *p++ = ascii64[l & 0x3f];
+
+        l = (r0 << 16) | ((r1 >> 16) & 0xffff);
+        *p++ = ascii64[(l >> 18) & 0x3f];
+        *p++ = ascii64[(l >> 12) & 0x3f];
+        *p++ = ascii64[(l >> 6) & 0x3f];
+        *p++ = ascii64[l & 0x3f];
+
+        l = r1 << 2;
+        *p++ = ascii64[(l >> 12) & 0x3f];
+        *p++ = ascii64[(l >> 6) & 0x3f];
+        *p++ = ascii64[l & 0x3f];
+        *p = 0;
+
+        return((char *)output);
+}
diff --git a/src/lib/libc/crypt/md5crypt.c b/src/lib/libc/crypt/md5crypt.c
new file mode 100644
index 0000000000..7ec60f38e0
--- /dev/null
+++ b/src/lib/libc/crypt/md5crypt.c
@@ -0,0 +1,157 @@
+/*      $OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $   */
+
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+ * ----------------------------------------------------------------------------
+ *
+ * $FreeBSD: crypt.c,v 1.5 1996/10/14 08:34:02 phk Exp $
+ *
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <md5.h>
+#include <string.h>
+
+static unsigned char itoa64[] =         /* 0 ... 63 => ascii - 64 */
+        "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+static void to64 __P((char *, u_int32_t, int));
+
+static void
+to64(s, v, n)
+        char *s;
+        u_int32_t v;
+        int n;
+{
+        while (--n >= 0) {
+                *s++ = itoa64[v&0x3f];
+                v >>= 6;
+        }
+}
+
+/*
+ * UNIX password
+ *
+ * Use MD5 for what it is best at...
+ */
+
+char *
+md5crypt(pw, salt)
+        register const char *pw;
+        register const char *salt;
+{
+        /*
+         * This string is magic for this algorithm.  Having
+         * it this way, we can get get better later on
+         */
+        static unsigned char    *magic = (unsigned char *)"$1$";
+
+        static char     passwd[120], *p;
+        static const unsigned char *sp,*ep;
+        unsigned char   final[16];
+        int sl,pl,i;
+        MD5_CTX ctx,ctx1;
+        u_int32_t l;
+
+        /* Refine the Salt first */
+        sp = (const unsigned char *)salt;
+
+        /* If it starts with the magic string, then skip that */
+        if(!strncmp((const char *)sp,(const char *)magic,strlen((const char *)magic)))
+                sp += strlen((const char *)magic);
+
+        /* It stops at the first '$', max 8 chars */
+        for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
+                continue;
+
+        /* get the length of the true salt */
+        sl = ep - sp;
+
+        MD5Init(&ctx);
+
+        /* The password first, since that is what is most unknown */
+        MD5Update(&ctx,(const unsigned char *)pw,strlen(pw));
+
+        /* Then our magic string */
+        MD5Update(&ctx,magic,strlen((const char *)magic));
+
+        /* Then the raw salt */
+        MD5Update(&ctx,sp,sl);
+
+        /* Then just as many characters of the MD5(pw,salt,pw) */
+        MD5Init(&ctx1);
+        MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
+        MD5Update(&ctx1,sp,sl);
+        MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
+        MD5Final(final,&ctx1);
+        for(pl = strlen(pw); pl > 0; pl -= 16)
+                MD5Update(&ctx,final,pl>16 ? 16 : pl);
+
+        /* Don't leave anything around in vm they could use. */
+        memset(final,0,sizeof final);
+
+        /* Then something really weird... */
+        for (i = strlen(pw); i ; i >>= 1)
+                if(i&1)
+                    MD5Update(&ctx, final, 1);
+                else
+                    MD5Update(&ctx, (const unsigned char *)pw, 1);
+
+        /* Now make the output string */
+        strcpy(passwd,(const char *)magic);
+        strncat(passwd,(const char *)sp,sl);
+        strcat(passwd,"$");
+
+        MD5Final(final,&ctx);
+
+        /*
+         * and now, just to make sure things don't run too fast
+         * On a 60 Mhz Pentium this takes 34 msec, so you would
+         * need 30 seconds to build a 1000 entry dictionary...
+         */
+        for(i=0;i<1000;i++) {
+                MD5Init(&ctx1);
+                if(i & 1)
+                        MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
+                else
+                        MD5Update(&ctx1,final,16);
+
+                if(i % 3)
+                        MD5Update(&ctx1,sp,sl);
+
+                if(i % 7)
+                        MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
+
+                if(i & 1)
+                        MD5Update(&ctx1,final,16);
+                else
+                        MD5Update(&ctx1,(const unsigned char *)pw,strlen(pw));
+                MD5Final(final,&ctx1);
+        }
+
+        p = passwd + strlen(passwd);
+
+        l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
+        l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
+        l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
+        l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
+        l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
+        l =                    final[11]                ; to64(p,l,2); p += 2;
+        *p = '\0';
+
+        /* Don't leave anything around in vm they could use. */
+        memset(final,0,sizeof final);
+
+        return passwd;
+}
+
diff --git a/src/lib/libc/crypt/morecrypt.c b/src/lib/libc/crypt/morecrypt.c
new file mode 100644
index 0000000000..e9e0ced4c1
--- /dev/null
+++ b/src/lib/libc/crypt/morecrypt.c
@@ -0,0 +1,628 @@
+/*      $OpenBSD: morecrypt.c,v 1.9 1998/03/22 19:01:20 niklas Exp $    */
+
+/*
+ * FreeSec: libcrypt
+ *
+ * Copyright (c) 1994 David Burren
+ * 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.
+ * 4. Neither the name of the author nor the names of other contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * This is an original implementation of the DES and the crypt(3) interfaces
+ * by David Burren <davidb@werj.com.au>.
+ *
+ * An excellent reference on the underlying algorithm (and related
+ * algorithms) is:
+ *
+ *      B. Schneier, Applied Cryptography: protocols, algorithms,
+ *      and source code in C, John Wiley & Sons, 1994.
+ *
+ * Note that in that book's description of DES the lookups for the initial,
+ * pbox, and final permutations are inverted (this has been brought to the
+ * attention of the author).  A list of errata for this book has been
+ * posted to the sci.crypt newsgroup by the author and is available for FTP.
+ *
+ * NOTE:
+ * This file must copy certain chunks of crypt.c for legal reasons.
+ * crypt.c can only export the interface crypt(), to make binaries
+ * exportable from the USA. Hence, to also have the other crypto interfaces
+ * available we have to copy pieces...
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: morecrypt.c,v 1.9 1998/03/22 19:01:20 niklas Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <pwd.h>
+#include <string.h>
+
+#ifdef DEBUG
+# include <stdio.h>
+#endif
+
+static u_char   IP[64] = {
+        58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12,  4,
+        62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16,  8,
+        57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11,  3,
+        61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15,  7
+};
+
+static u_char   inv_key_perm[64];
+static u_char   u_key_perm[56];
+static u_char   key_perm[56] = {
+        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
+};
+
+static u_char   key_shifts[16] = {
+        1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
+};
+
+static u_char   inv_comp_perm[56];
+static u_char   comp_perm[48] = {
+        14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
+        23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
+        41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
+        44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
+};
+
+/*
+ *      No E box is used, as it's replaced by some ANDs, shifts, and ORs.
+ */
+
+static u_char   u_sbox[8][64];
+static u_char   sbox[8][64] = {
+        {
+                14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+                 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+                 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+                15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13
+        },
+        {
+                15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+                 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+                 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+                13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9
+        },
+        {
+                10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+                13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+                13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+                 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12
+        },
+        {
+                 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+                13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+                10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+                 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14
+        },
+        {
+                 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+                14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+                 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+                11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3
+        },
+        {
+                12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+                10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+                 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+                 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13
+        },
+        {
+                 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+                13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+                 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+                 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12
+        },
+        {
+                13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+                 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+                 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
+                 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
+        }
+};
+
+static u_char   un_pbox[32];
+static u_char   pbox[32] = {
+        16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
+         2,  8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
+};
+
+static u_int32_t bits32[32] =
+{
+        0x80000000, 0x40000000, 0x20000000, 0x10000000,
+        0x08000000, 0x04000000, 0x02000000, 0x01000000,
+        0x00800000, 0x00400000, 0x00200000, 0x00100000,
+        0x00080000, 0x00040000, 0x00020000, 0x00010000,
+        0x00008000, 0x00004000, 0x00002000, 0x00001000,
+        0x00000800, 0x00000400, 0x00000200, 0x00000100,
+        0x00000080, 0x00000040, 0x00000020, 0x00000010,
+        0x00000008, 0x00000004, 0x00000002, 0x00000001
+};
+
+static u_char   bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
+
+static u_int32_t saltbits;
+static int32_t  old_salt;
+static u_int32_t *bits28, *bits24;
+static u_char   init_perm[64], final_perm[64];
+static u_int32_t en_keysl[16], en_keysr[16];
+static u_int32_t de_keysl[16], de_keysr[16];
+static int      des_initialised = 0;
+static u_char   m_sbox[4][4096];
+static u_int32_t psbox[4][256];
+static u_int32_t ip_maskl[8][256], ip_maskr[8][256];
+static u_int32_t fp_maskl[8][256], fp_maskr[8][256];
+static u_int32_t key_perm_maskl[8][128], key_perm_maskr[8][128];
+static u_int32_t comp_maskl[8][128], comp_maskr[8][128];
+static u_int32_t old_rawkey0, old_rawkey1;
+
+static __inline int
+ascii_to_bin(ch)
+        char ch;
+{
+        if (ch > 'z')
+                return(0);
+        if (ch >= 'a')
+                return(ch - 'a' + 38);
+        if (ch > 'Z')
+                return(0);
+        if (ch >= 'A')
+                return(ch - 'A' + 12);
+        if (ch > '9')
+                return(0);
+        if (ch >= '.')
+                return(ch - '.');
+        return(0);
+}
+
+void
+des_init()
+{
+        int     i, j, b, k, inbit, obit;
+        u_int32_t       *p, *il, *ir, *fl, *fr;
+
+        old_rawkey0 = old_rawkey1 = 0;
+        saltbits = 0;
+        old_salt = 0;
+        bits24 = (bits28 = bits32 + 4) + 4;
+
+        /*
+         * Invert the S-boxes, reordering the input bits.
+         */
+        for (i = 0; i < 8; i++)
+                for (j = 0; j < 64; j++) {
+                        b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf);
+                        u_sbox[i][j] = sbox[i][b];
+                }
+
+        /*
+         * Convert the inverted S-boxes into 4 arrays of 8 bits.
+         * Each will handle 12 bits of the S-box input.
+         */
+        for (b = 0; b < 4; b++)
+                for (i = 0; i < 64; i++)
+                        for (j = 0; j < 64; j++)
+                                m_sbox[b][(i << 6) | j] =
+                                        (u_sbox[(b << 1)][i] << 4) |
+                                        u_sbox[(b << 1) + 1][j];
+
+        /*
+         * Set up the initial & final permutations into a useful form, and
+         * initialise the inverted key permutation.
+         */
+        for (i = 0; i < 64; i++) {
+                init_perm[final_perm[i] = IP[i] - 1] = i;
+                inv_key_perm[i] = 255;
+        }
+
+        /*
+         * Invert the key permutation and initialise the inverted key
+         * compression permutation.
+         */
+        for (i = 0; i < 56; i++) {
+                u_key_perm[i] = key_perm[i] - 1;
+                inv_key_perm[key_perm[i] - 1] = i;
+                inv_comp_perm[i] = 255;
+        }
+
+        /*
+         * Invert the key compression permutation.
+         */
+        for (i = 0; i < 48; i++) {
+                inv_comp_perm[comp_perm[i] - 1] = i;
+        }
+
+        /*
+         * Set up the OR-mask arrays for the initial and final permutations,
+         * and for the key initial and compression permutations.
+         */
+        for (k = 0; k < 8; k++) {
+                for (i = 0; i < 256; i++) {
+                        *(il = &ip_maskl[k][i]) = 0;
+                        *(ir = &ip_maskr[k][i]) = 0;
+                        *(fl = &fp_maskl[k][i]) = 0;
+                        *(fr = &fp_maskr[k][i]) = 0;
+                        for (j = 0; j < 8; j++) {
+                                inbit = 8 * k + j;
+                                if (i & bits8[j]) {
+                                        if ((obit = init_perm[inbit]) < 32)
+                                                *il |= bits32[obit];
+                                        else
+                                                *ir |= bits32[obit-32];
+                                        if ((obit = final_perm[inbit]) < 32)
+                                                *fl |= bits32[obit];
+                                        else
+                                                *fr |= bits32[obit - 32];
+                                }
+                        }
+                }
+                for (i = 0; i < 128; i++) {
+                        *(il = &key_perm_maskl[k][i]) = 0;
+                        *(ir = &key_perm_maskr[k][i]) = 0;
+                        for (j = 0; j < 7; j++) {
+                                inbit = 8 * k + j;
+                                if (i & bits8[j + 1]) {
+                                        if ((obit = inv_key_perm[inbit]) == 255)
+                                                continue;
+                                        if (obit < 28)
+                                                *il |= bits28[obit];
+                                        else
+                                                *ir |= bits28[obit - 28];
+                                }
+                        }
+                        *(il = &comp_maskl[k][i]) = 0;
+                        *(ir = &comp_maskr[k][i]) = 0;
+                        for (j = 0; j < 7; j++) {
+                                inbit = 7 * k + j;
+                                if (i & bits8[j + 1]) {
+                                        if ((obit=inv_comp_perm[inbit]) == 255)
+                                                continue;
+                                        if (obit < 24)
+                                                *il |= bits24[obit];
+                                        else
+                                                *ir |= bits24[obit - 24];
+                                }
+                        }
+                }
+        }
+
+        /*
+         * Invert the P-box permutation, and convert into OR-masks for
+         * handling the output of the S-box arrays setup above.
+         */
+        for (i = 0; i < 32; i++)
+                un_pbox[pbox[i] - 1] = i;
+
+        for (b = 0; b < 4; b++)
+                for (i = 0; i < 256; i++) {
+                        *(p = &psbox[b][i]) = 0;
+                        for (j = 0; j < 8; j++) {
+                                if (i & bits8[j])
+                                        *p |= bits32[un_pbox[8 * b + j]];
+                        }
+                }
+
+        des_initialised = 1;
+}
+
+void
+setup_salt(salt)
+        int32_t salt;
+{
+        u_int32_t       obit, saltbit;
+        int     i;
+
+        if (salt == old_salt)
+                return;
+        old_salt = salt;
+
+        saltbits = 0;
+        saltbit = 1;
+        obit = 0x800000;
+        for (i = 0; i < 24; i++) {
+                if (salt & saltbit)
+                        saltbits |= obit;
+                saltbit <<= 1;
+                obit >>= 1;
+        }
+}
+
+int
+do_des(l_in, r_in, l_out, r_out, count)
+        u_int32_t l_in, r_in, *l_out, *r_out;
+        int count;
+{
+        /*
+         *      l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format.
+         */
+        u_int32_t       l, r, *kl, *kr, *kl1, *kr1;
+        u_int32_t       f, r48l, r48r;
+        int             round;
+
+        if (count == 0) {
+                return(1);
+        } else if (count > 0) {
+                /*
+                 * Encrypting
+                 */
+                kl1 = en_keysl;
+                kr1 = en_keysr;
+        } else {
+                /*
+                 * Decrypting
+                 */
+                count = -count;
+                kl1 = de_keysl;
+                kr1 = de_keysr;
+        }
+
+        /*
+         *      Do initial permutation (IP).
+         */
+        l = ip_maskl[0][l_in >> 24]
+          | ip_maskl[1][(l_in >> 16) & 0xff]
+          | ip_maskl[2][(l_in >> 8) & 0xff]
+          | ip_maskl[3][l_in & 0xff]
+          | ip_maskl[4][r_in >> 24]
+          | ip_maskl[5][(r_in >> 16) & 0xff]
+          | ip_maskl[6][(r_in >> 8) & 0xff]
+          | ip_maskl[7][r_in & 0xff];
+        r = ip_maskr[0][l_in >> 24]
+          | ip_maskr[1][(l_in >> 16) & 0xff]
+          | ip_maskr[2][(l_in >> 8) & 0xff]
+          | ip_maskr[3][l_in & 0xff]
+          | ip_maskr[4][r_in >> 24]
+          | ip_maskr[5][(r_in >> 16) & 0xff]
+          | ip_maskr[6][(r_in >> 8) & 0xff]
+          | ip_maskr[7][r_in & 0xff];
+
+        while (count--) {
+                /*
+                 * Do each round.
+                 */
+                kl = kl1;
+                kr = kr1;
+                round = 16;
+                while (round--) {
+                        /*
+                         * Expand R to 48 bits (simulate the E-box).
+                         */
+                        r48l    = ((r & 0x00000001) << 23)
+                                | ((r & 0xf8000000) >> 9)
+                                | ((r & 0x1f800000) >> 11)
+                                | ((r & 0x01f80000) >> 13)
+                                | ((r & 0x001f8000) >> 15);
+
+                        r48r    = ((r & 0x0001f800) << 7)
+                                | ((r & 0x00001f80) << 5)
+                                | ((r & 0x000001f8) << 3)
+                                | ((r & 0x0000001f) << 1)
+                                | ((r & 0x80000000) >> 31);
+                        /*
+                         * Do salting for crypt() and friends, and
+                         * XOR with the permuted key.
+                         */
+                        f = (r48l ^ r48r) & saltbits;
+                        r48l ^= f ^ *kl++;
+                        r48r ^= f ^ *kr++;
+                        /*
+                         * Do sbox lookups (which shrink it back to 32 bits)
+                         * and do the pbox permutation at the same time.
+                         */
+                        f = psbox[0][m_sbox[0][r48l >> 12]]
+                          | psbox[1][m_sbox[1][r48l & 0xfff]]
+                          | psbox[2][m_sbox[2][r48r >> 12]]
+                          | psbox[3][m_sbox[3][r48r & 0xfff]];
+                        /*
+                         * Now that we've permuted things, complete f().
+                         */
+                        f ^= l;
+                        l = r;
+                        r = f;
+                }
+                r = l;
+                l = f;
+        }
+        /*
+         * Do final permutation (inverse of IP).
+         */
+        *l_out  = fp_maskl[0][l >> 24]
+                | fp_maskl[1][(l >> 16) & 0xff]
+                | fp_maskl[2][(l >> 8) & 0xff]
+                | fp_maskl[3][l & 0xff]
+                | fp_maskl[4][r >> 24]
+                | fp_maskl[5][(r >> 16) & 0xff]
+                | fp_maskl[6][(r >> 8) & 0xff]
+                | fp_maskl[7][r & 0xff];
+        *r_out  = fp_maskr[0][l >> 24]
+                | fp_maskr[1][(l >> 16) & 0xff]
+                | fp_maskr[2][(l >> 8) & 0xff]
+                | fp_maskr[3][l & 0xff]
+                | fp_maskr[4][r >> 24]
+                | fp_maskr[5][(r >> 16) & 0xff]
+                | fp_maskr[6][(r >> 8) & 0xff]
+                | fp_maskr[7][r & 0xff];
+        return(0);
+}
+
+int
+des_cipher(in, out, salt, count)
+        const char *in;
+        char *out;
+        long salt;
+        int count;
+{
+        u_int32_t l_out, r_out, rawl, rawr;
+        u_int32_t x[2];
+        int     retval;
+
+        if (!des_initialised)
+                des_init();
+
+        setup_salt((int32_t)salt);
+
+        memcpy(x, in, sizeof x);
+        rawl = ntohl(x[0]);
+        rawr = ntohl(x[1]);
+        retval = do_des(rawl, rawr, &l_out, &r_out, count);
+
+        x[0] = htonl(l_out);
+        x[1] = htonl(r_out);
+        memcpy(out, x, sizeof x);
+        return(retval);
+}
+
+int
+des_setkey(key)
+        const char *key;
+{
+        u_int32_t k0, k1, rawkey0, rawkey1;
+        int     shifts, round;
+
+        if (!des_initialised)
+                des_init();
+
+        rawkey0 = ntohl(*(u_int32_t *) key);
+        rawkey1 = ntohl(*(u_int32_t *) (key + 4));
+
+        if ((rawkey0 | rawkey1)
+            && rawkey0 == old_rawkey0
+            && rawkey1 == old_rawkey1) {
+                /*
+                 * Already setup for this key.
+                 * This optimisation fails on a zero key (which is weak and
+                 * has bad parity anyway) in order to simplify the starting
+                 * conditions.
+                 */
+                return(0);
+        }
+        old_rawkey0 = rawkey0;
+        old_rawkey1 = rawkey1;
+
+        /*
+         *      Do key permutation and split into two 28-bit subkeys.
+         */
+        k0 = key_perm_maskl[0][rawkey0 >> 25]
+           | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f]
+           | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f]
+           | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f]
+           | key_perm_maskl[4][rawkey1 >> 25]
+           | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f]
+           | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f]
+           | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f];
+        k1 = key_perm_maskr[0][rawkey0 >> 25]
+           | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f]
+           | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f]
+           | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f]
+           | key_perm_maskr[4][rawkey1 >> 25]
+           | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f]
+           | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f]
+           | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f];
+        /*
+         *      Rotate subkeys and do compression permutation.
+         */
+        shifts = 0;
+        for (round = 0; round < 16; round++) {
+                u_int32_t       t0, t1;
+
+                shifts += key_shifts[round];
+
+                t0 = (k0 << shifts) | (k0 >> (28 - shifts));
+                t1 = (k1 << shifts) | (k1 >> (28 - shifts));
+
+                de_keysl[15 - round] =
+                en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f]
+                                | comp_maskl[1][(t0 >> 14) & 0x7f]
+                                | comp_maskl[2][(t0 >> 7) & 0x7f]
+                                | comp_maskl[3][t0 & 0x7f]
+                                | comp_maskl[4][(t1 >> 21) & 0x7f]
+                                | comp_maskl[5][(t1 >> 14) & 0x7f]
+                                | comp_maskl[6][(t1 >> 7) & 0x7f]
+                                | comp_maskl[7][t1 & 0x7f];
+
+                de_keysr[15 - round] =
+                en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f]
+                                | comp_maskr[1][(t0 >> 14) & 0x7f]
+                                | comp_maskr[2][(t0 >> 7) & 0x7f]
+                                | comp_maskr[3][t0 & 0x7f]
+                                | comp_maskr[4][(t1 >> 21) & 0x7f]
+                                | comp_maskr[5][(t1 >> 14) & 0x7f]
+                                | comp_maskr[6][(t1 >> 7) & 0x7f]
+                                | comp_maskr[7][t1 & 0x7f];
+        }
+        return(0);
+}
+
+int
+setkey(key)
+        const char *key;
+{
+        int     i, j;
+        u_int32_t packed_keys[2];
+        u_char  *p;
+
+        p = (u_char *) packed_keys;
+
+        for (i = 0; i < 8; i++) {
+                p[i] = 0;
+                for (j = 0; j < 8; j++)
+                        if (*key++ & 1)
+                                p[i] |= bits8[j];
+        }
+        return(des_setkey(p));
+}
+
+int
+encrypt(block, flag)
+        char *block;
+        int flag;
+{
+        u_int32_t io[2];
+        u_char  *p;
+        int     i, j, retval;
+
+        if (!des_initialised)
+                des_init();
+
+        setup_salt((int32_t)0);
+        p = (u_char *)block;
+        for (i = 0; i < 2; i++) {
+                io[i] = 0L;
+                for (j = 0; j < 32; j++)
+                        if (*p++ & 1)
+                                io[i] |= bits32[j];
+        }
+        retval = do_des(io[0], io[1], io, io + 1, flag ? -1 : 1);
+        for (i = 0; i < 2; i++)
+                for (j = 0; j < 32; j++)
+                        block[(i << 5) | j] = (io[i] & bits32[j]) ? 1 : 0;
+        return(retval);
+}
diff --git a/src/lib/libc/crypt/skipjack.c b/src/lib/libc/crypt/skipjack.c
new file mode 100644
index 0000000000..e700f40c39
--- /dev/null
+++ b/src/lib/libc/crypt/skipjack.c
@@ -0,0 +1,258 @@
+/* 
+ * Further optimized test implementation of SKIPJACK algorithm 
+ * Mark Tillotson <markt@chaos.org.uk>, 25 June 98
+ * Optimizations suit RISC (lots of registers) machine best.
+ *
+ * based on unoptimized implementation of
+ * Panu Rissanen <bande@lut.fi> 960624
+ *
+ * SKIPJACK and KEA Algorithm Specifications 
+ * Version 2.0 
+ * 29 May 1998
+*/
+
+#include <sys/param.h>
+#include <skipjack.h>
+#include <stdlib.h>
+
+static const u_int8_t ftable[0x100] =
+{ 
+        0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, 
+        0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, 
+        0xe7, 0x2d, 0x4d, 0x8a, 0xce, 0x4c, 0xca, 0x2e, 
+        0x52, 0x95, 0xd9, 0x1e, 0x4e, 0x38, 0x44, 0x28, 
+        0x0a, 0xdf, 0x02, 0xa0, 0x17, 0xf1, 0x60, 0x68, 
+        0x12, 0xb7, 0x7a, 0xc3, 0xe9, 0xfa, 0x3d, 0x53, 
+        0x96, 0x84, 0x6b, 0xba, 0xf2, 0x63, 0x9a, 0x19, 
+        0x7c, 0xae, 0xe5, 0xf5, 0xf7, 0x16, 0x6a, 0xa2, 
+        0x39, 0xb6, 0x7b, 0x0f, 0xc1, 0x93, 0x81, 0x1b, 
+        0xee, 0xb4, 0x1a, 0xea, 0xd0, 0x91, 0x2f, 0xb8, 
+        0x55, 0xb9, 0xda, 0x85, 0x3f, 0x41, 0xbf, 0xe0, 
+        0x5a, 0x58, 0x80, 0x5f, 0x66, 0x0b, 0xd8, 0x90, 
+        0x35, 0xd5, 0xc0, 0xa7, 0x33, 0x06, 0x65, 0x69, 
+        0x45, 0x00, 0x94, 0x56, 0x6d, 0x98, 0x9b, 0x76, 
+        0x97, 0xfc, 0xb2, 0xc2, 0xb0, 0xfe, 0xdb, 0x20, 
+        0xe1, 0xeb, 0xd6, 0xe4, 0xdd, 0x47, 0x4a, 0x1d, 
+        0x42, 0xed, 0x9e, 0x6e, 0x49, 0x3c, 0xcd, 0x43, 
+        0x27, 0xd2, 0x07, 0xd4, 0xde, 0xc7, 0x67, 0x18, 
+        0x89, 0xcb, 0x30, 0x1f, 0x8d, 0xc6, 0x8f, 0xaa, 
+        0xc8, 0x74, 0xdc, 0xc9, 0x5d, 0x5c, 0x31, 0xa4, 
+        0x70, 0x88, 0x61, 0x2c, 0x9f, 0x0d, 0x2b, 0x87, 
+        0x50, 0x82, 0x54, 0x64, 0x26, 0x7d, 0x03, 0x40, 
+        0x34, 0x4b, 0x1c, 0x73, 0xd1, 0xc4, 0xfd, 0x3b, 
+        0xcc, 0xfb, 0x7f, 0xab, 0xe6, 0x3e, 0x5b, 0xa5, 
+        0xad, 0x04, 0x23, 0x9c, 0x14, 0x51, 0x22, 0xf0, 
+        0x29, 0x79, 0x71, 0x7e, 0xff, 0x8c, 0x0e, 0xe2, 
+        0x0c, 0xef, 0xbc, 0x72, 0x75, 0x6f, 0x37, 0xa1, 
+        0xec, 0xd3, 0x8e, 0x62, 0x8b, 0x86, 0x10, 0xe8, 
+        0x08, 0x77, 0x11, 0xbe, 0x92, 0x4f, 0x24, 0xc5, 
+        0x32, 0x36, 0x9d, 0xcf, 0xf3, 0xa6, 0xbb, 0xac, 
+        0x5e, 0x6c, 0xa9, 0x13, 0x57, 0x25, 0xb5, 0xe3, 
+        0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46
+};
+
+/*
+ * For each key byte generate a table to represent the function 
+ *    ftable [in ^ keybyte]
+ *
+ * These tables used to save an XOR in each stage of the G-function
+ * the tables are hopefully pointed to by register allocated variables
+ * k0, k1..k9
+ */
+void
+subkey_table_gen (u_int8_t *key, u_int8_t **key_tables)
+{
+        int i, k;
+
+        for (k = 0; k < 10; k++) {
+                u_int8_t   key_byte = key[k];
+                u_int8_t * table = (u_int8_t *) malloc(0x100);
+                /* XXX */
+
+                key_tables[k] = table;
+                for (i = 0; i < 0x100; i++)
+                        table[i] = ftable[i ^ key_byte];
+        }
+}
+
+
+#define g(k0, k1, k2, k3, ih, il, oh, ol) \
+{ \
+        oh = k##k0 [il] ^ ih; \
+        ol = k##k1 [oh] ^ il; \
+        oh = k##k2 [ol] ^ oh; \
+        ol = k##k3 [oh] ^ ol; \
+}
+
+#define g0(ih, il, oh, ol) g(0, 1, 2, 3, ih, il, oh, ol)
+#define g4(ih, il, oh, ol) g(4, 5, 6, 7, ih, il, oh, ol)
+#define g8(ih, il, oh, ol) g(8, 9, 0, 1, ih, il, oh, ol)
+#define g2(ih, il, oh, ol) g(2, 3, 4, 5, ih, il, oh, ol)
+#define g6(ih, il, oh, ol) g(6, 7, 8, 9, ih, il, oh, ol)
+
+ 
+#define g_inv(k0, k1, k2, k3, ih, il, oh, ol) \
+{ \
+        ol = k##k3 [ih] ^ il; \
+        oh = k##k2 [ol] ^ ih; \
+        ol = k##k1 [oh] ^ ol; \
+        oh = k##k0 [ol] ^ oh; \
+}
+
+
+#define g0_inv(ih, il, oh, ol) g_inv(0, 1, 2, 3, ih, il, oh, ol)
+#define g4_inv(ih, il, oh, ol) g_inv(4, 5, 6, 7, ih, il, oh, ol)
+#define g8_inv(ih, il, oh, ol) g_inv(8, 9, 0, 1, ih, il, oh, ol)
+#define g2_inv(ih, il, oh, ol) g_inv(2, 3, 4, 5, ih, il, oh, ol)
+#define g6_inv(ih, il, oh, ol) g_inv(6, 7, 8, 9, ih, il, oh, ol)
+
+/* optimized version of Skipjack algorithm
+ *
+ * the appropriate g-function is inlined for each round
+ *
+ * the data movement is minimized by rotating the names of the 
+ * variables w1..w4, not their contents (saves 3 moves per round)
+ *
+ * the loops are completely unrolled (needed to staticize choice of g)
+ *
+ * compiles to about 470 instructions on a Sparc (gcc -O)
+ * which is about 58 instructions per byte, 14 per round.
+ * gcc seems to leave in some unnecessary and with 0xFF operations
+ * but only in the latter part of the functions.  Perhaps it
+ * runs out of resources to properly optimize long inlined function?
+ * in theory should get about 11 instructions per round, not 14
+ */
+
+void
+skipjack_forwards(u_int8_t *plain, u_int8_t *cipher, u_int8_t **key_tables)
+{
+        u_int8_t wh1 = plain[0];  u_int8_t wl1 = plain[1];
+        u_int8_t wh2 = plain[2];  u_int8_t wl2 = plain[3];
+        u_int8_t wh3 = plain[4];  u_int8_t wl3 = plain[5];
+        u_int8_t wh4 = plain[6];  u_int8_t wl4 = plain[7];
+
+        u_int8_t * k0 = key_tables [0];
+        u_int8_t * k1 = key_tables [1];
+        u_int8_t * k2 = key_tables [2];
+        u_int8_t * k3 = key_tables [3];
+        u_int8_t * k4 = key_tables [4];
+        u_int8_t * k5 = key_tables [5];
+        u_int8_t * k6 = key_tables [6];
+        u_int8_t * k7 = key_tables [7];
+        u_int8_t * k8 = key_tables [8];
+        u_int8_t * k9 = key_tables [9];
+
+        /* first 8 rounds */
+        g0 (wh1,wl1, wh1,wl1); wl4 ^= wl1 ^ 1; wh4 ^= wh1;
+        g4 (wh4,wl4, wh4,wl4); wl3 ^= wl4 ^ 2; wh3 ^= wh4;
+        g8 (wh3,wl3, wh3,wl3); wl2 ^= wl3 ^ 3; wh2 ^= wh3;
+        g2 (wh2,wl2, wh2,wl2); wl1 ^= wl2 ^ 4; wh1 ^= wh2;
+        g6 (wh1,wl1, wh1,wl1); wl4 ^= wl1 ^ 5; wh4 ^= wh1;
+        g0 (wh4,wl4, wh4,wl4); wl3 ^= wl4 ^ 6; wh3 ^= wh4;
+        g4 (wh3,wl3, wh3,wl3); wl2 ^= wl3 ^ 7; wh2 ^= wh3;
+        g8 (wh2,wl2, wh2,wl2); wl1 ^= wl2 ^ 8; wh1 ^= wh2;
+
+        /* second 8 rounds */
+        wh2 ^= wh1; wl2 ^= wl1 ^ 9 ; g2 (wh1,wl1, wh1,wl1);
+        wh1 ^= wh4; wl1 ^= wl4 ^ 10; g6 (wh4,wl4, wh4,wl4);
+        wh4 ^= wh3; wl4 ^= wl3 ^ 11; g0 (wh3,wl3, wh3,wl3);
+        wh3 ^= wh2; wl3 ^= wl2 ^ 12; g4 (wh2,wl2, wh2,wl2);
+        wh2 ^= wh1; wl2 ^= wl1 ^ 13; g8 (wh1,wl1, wh1,wl1);
+        wh1 ^= wh4; wl1 ^= wl4 ^ 14; g2 (wh4,wl4, wh4,wl4);
+        wh4 ^= wh3; wl4 ^= wl3 ^ 15; g6 (wh3,wl3, wh3,wl3);
+        wh3 ^= wh2; wl3 ^= wl2 ^ 16; g0 (wh2,wl2, wh2,wl2);
+
+        /* third 8 rounds */
+        g4 (wh1,wl1, wh1,wl1); wl4 ^= wl1 ^ 17; wh4 ^= wh1;
+        g8 (wh4,wl4, wh4,wl4); wl3 ^= wl4 ^ 18; wh3 ^= wh4;
+        g2 (wh3,wl3, wh3,wl3); wl2 ^= wl3 ^ 19; wh2 ^= wh3;
+        g6 (wh2,wl2, wh2,wl2); wl1 ^= wl2 ^ 20; wh1 ^= wh2;
+        g0 (wh1,wl1, wh1,wl1); wl4 ^= wl1 ^ 21; wh4 ^= wh1;
+        g4 (wh4,wl4, wh4,wl4); wl3 ^= wl4 ^ 22; wh3 ^= wh4;
+        g8 (wh3,wl3, wh3,wl3); wl2 ^= wl3 ^ 23; wh2 ^= wh3;
+        g2 (wh2,wl2, wh2,wl2); wl1 ^= wl2 ^ 24; wh1 ^= wh2;
+
+        /* last 8 rounds */
+        wh2 ^= wh1; wl2 ^= wl1 ^ 25; g6 (wh1,wl1, wh1,wl1);
+        wh1 ^= wh4; wl1 ^= wl4 ^ 26; g0 (wh4,wl4, wh4,wl4);
+        wh4 ^= wh3; wl4 ^= wl3 ^ 27; g4 (wh3,wl3, wh3,wl3);
+        wh3 ^= wh2; wl3 ^= wl2 ^ 28; g8 (wh2,wl2, wh2,wl2);
+        wh2 ^= wh1; wl2 ^= wl1 ^ 29; g2 (wh1,wl1, wh1,wl1);
+        wh1 ^= wh4; wl1 ^= wl4 ^ 30; g6 (wh4,wl4, wh4,wl4);
+        wh4 ^= wh3; wl4 ^= wl3 ^ 31; g0 (wh3,wl3, wh3,wl3);
+        wh3 ^= wh2; wl3 ^= wl2 ^ 32; g4 (wh2,wl2, wh2,wl2);
+
+        /* pack into byte vector */
+        cipher [0] = wh1;  cipher [1] = wl1;
+        cipher [2] = wh2;  cipher [3] = wl2;
+        cipher [4] = wh3;  cipher [5] = wl3;
+        cipher [6] = wh4;  cipher [7] = wl4;
+}
+
+
+void
+skipjack_backwards (u_int8_t *cipher, u_int8_t *plain, u_int8_t **key_tables)
+{
+        /* setup 4 16-bit portions */
+        u_int8_t wh1 = cipher[0];  u_int8_t wl1 = cipher[1];
+        u_int8_t wh2 = cipher[2];  u_int8_t wl2 = cipher[3];
+        u_int8_t wh3 = cipher[4];  u_int8_t wl3 = cipher[5];
+        u_int8_t wh4 = cipher[6];  u_int8_t wl4 = cipher[7];
+
+        u_int8_t * k0 = key_tables [0];
+        u_int8_t * k1 = key_tables [1];
+        u_int8_t * k2 = key_tables [2];
+        u_int8_t * k3 = key_tables [3];
+        u_int8_t * k4 = key_tables [4];
+        u_int8_t * k5 = key_tables [5];
+        u_int8_t * k6 = key_tables [6];
+        u_int8_t * k7 = key_tables [7];
+        u_int8_t * k8 = key_tables [8];
+        u_int8_t * k9 = key_tables [9];
+
+        /* first 8 rounds */
+        g4_inv (wh2,wl2, wh2,wl2); wl3 ^= wl2 ^ 32; wh3 ^= wh2;
+        g0_inv (wh3,wl3, wh3,wl3); wl4 ^= wl3 ^ 31; wh4 ^= wh3;
+        g6_inv (wh4,wl4, wh4,wl4); wl1 ^= wl4 ^ 30; wh1 ^= wh4;
+        g2_inv (wh1,wl1, wh1,wl1); wl2 ^= wl1 ^ 29; wh2 ^= wh1;
+        g8_inv (wh2,wl2, wh2,wl2); wl3 ^= wl2 ^ 28; wh3 ^= wh2;
+        g4_inv (wh3,wl3, wh3,wl3); wl4 ^= wl3 ^ 27; wh4 ^= wh3;
+        g0_inv (wh4,wl4, wh4,wl4); wl1 ^= wl4 ^ 26; wh1 ^= wh4;
+        g6_inv (wh1,wl1, wh1,wl1); wl2 ^= wl1 ^ 25; wh2 ^= wh1;
+
+        /* second 8 rounds */
+        wh1 ^= wh2; wl1 ^= wl2 ^ 24; g2_inv (wh2,wl2, wh2,wl2);
+        wh2 ^= wh3; wl2 ^= wl3 ^ 23; g8_inv (wh3,wl3, wh3,wl3);
+        wh3 ^= wh4; wl3 ^= wl4 ^ 22; g4_inv (wh4,wl4, wh4,wl4);
+        wh4 ^= wh1; wl4 ^= wl1 ^ 21; g0_inv (wh1,wl1, wh1,wl1);
+        wh1 ^= wh2; wl1 ^= wl2 ^ 20; g6_inv (wh2,wl2, wh2,wl2);
+        wh2 ^= wh3; wl2 ^= wl3 ^ 19; g2_inv (wh3,wl3, wh3,wl3);
+        wh3 ^= wh4; wl3 ^= wl4 ^ 18; g8_inv (wh4,wl4, wh4,wl4);
+        wh4 ^= wh1; wl4 ^= wl1 ^ 17; g4_inv (wh1,wl1, wh1,wl1);
+
+        /* third 8 rounds */
+        g0_inv (wh2,wl2, wh2,wl2); wl3 ^= wl2 ^ 16; wh3 ^= wh2;
+        g6_inv (wh3,wl3, wh3,wl3); wl4 ^= wl3 ^ 15; wh4 ^= wh3;
+        g2_inv (wh4,wl4, wh4,wl4); wl1 ^= wl4 ^ 14; wh1 ^= wh4;
+        g8_inv (wh1,wl1, wh1,wl1); wl2 ^= wl1 ^ 13; wh2 ^= wh1;
+        g4_inv (wh2,wl2, wh2,wl2); wl3 ^= wl2 ^ 12; wh3 ^= wh2;
+        g0_inv (wh3,wl3, wh3,wl3); wl4 ^= wl3 ^ 11; wh4 ^= wh3;
+        g6_inv (wh4,wl4, wh4,wl4); wl1 ^= wl4 ^ 10; wh1 ^= wh4;
+        g2_inv (wh1,wl1, wh1,wl1); wl2 ^= wl1 ^ 9;  wh2 ^= wh1;
+
+        /* last 8 rounds */
+        wh1 ^= wh2; wl1 ^= wl2 ^ 8; g8_inv (wh2,wl2, wh2,wl2);
+        wh2 ^= wh3; wl2 ^= wl3 ^ 7; g4_inv (wh3,wl3, wh3,wl3);
+        wh3 ^= wh4; wl3 ^= wl4 ^ 6; g0_inv (wh4,wl4, wh4,wl4);
+        wh4 ^= wh1; wl4 ^= wl1 ^ 5; g6_inv (wh1,wl1, wh1,wl1);
+        wh1 ^= wh2; wl1 ^= wl2 ^ 4; g2_inv (wh2,wl2, wh2,wl2);
+        wh2 ^= wh3; wl2 ^= wl3 ^ 3; g8_inv (wh3,wl3, wh3,wl3);
+        wh3 ^= wh4; wl3 ^= wl4 ^ 2; g4_inv (wh4,wl4, wh4,wl4);
+        wh4 ^= wh1; wl4 ^= wl1 ^ 1; g0_inv (wh1,wl1, wh1,wl1);
+
+        /* pack into byte vector */
+        plain [0] = wh1;  plain [1] = wl1;
+        plain [2] = wh2;  plain [3] = wl2;
+        plain [4] = wh3;  plain [5] = wl3;
+        plain [6] = wh4;  plain [7] = wl4;
+}
diff --git a/src/lib/libc/include/namespace.h b/src/lib/libc/include/namespace.h
new file mode 100644
index 0000000000..4a51f15ddf
--- /dev/null
+++ b/src/lib/libc/include/namespace.h
@@ -0,0 +1,18 @@
+/*      $OpenBSD: namespace.h,v 1.2 1996/08/19 08:28:08 tholo Exp $     */
+
+#define catclose        _catclose
+#define catgets         _catgets
+#define catopen         _catopen
+#define err             _err
+#define errx            _errx
+#define strtoq          _strtoq
+#define strtouq         _strtouq
+#define sys_errlist     _sys_errlist
+#define sys_nerr        _sys_nerr
+#define sys_siglist     _sys_siglist
+#define verr            _verr
+#define verrx           _verrx
+#define vwarn           _vwarn
+#define vwarnx          _vwarnx
+#define warn            _warn
+#define warnx           _warnx
diff --git a/src/lib/libc/include/thread_private.h b/src/lib/libc/include/thread_private.h
new file mode 100644
index 0000000000..0027468269
--- /dev/null
+++ b/src/lib/libc/include/thread_private.h
@@ -0,0 +1,179 @@
+/*
+ *
+ * Support for thread-safety in libc and libc_r common code using macros 
+ * to declare thread-safe data structures.
+ *
+ * $OpenBSD: thread_private.h,v 1.2 1999/01/06 05:19:32 d Exp $
+ */
+
+#ifndef _THREAD_PRIVATE_H_
+#define _THREAD_PRIVATE_H_
+
+/*
+ * Parts of this file are
+ * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
+ * All rights reserved.
+ *
+ * $Id: thread_private.h,v 1.2 1999/01/06 05:19:32 d Exp $
+ * $OpenBSD: thread_private.h,v 1.2 1999/01/06 05:19:32 d Exp $
+ */
+
+/*
+ * This global flag is non-zero when a process has created one
+ * or more threads. It is used to avoid calling locking functions
+ * when they are not required. In libc, this is always assumed
+ * to be zero.
+ */
+
+extern volatile int     __isthreaded;
+
+#ifdef _THREAD_SAFE
+
+#include <pthread.h>
+#include "pthread_private.h"
+
+/*
+ * File lock contention is difficult to diagnose without knowing
+ * where locks were set. Allow a debug library to be built which
+ * records the source file and line number of each lock call.
+ */
+#ifdef  _FLOCK_DEBUG
+#define _FLOCKFILE(x)   _flockfile_debug(x, __FILE__, __LINE__)
+#else
+#define _FLOCKFILE(x)   flockfile(x)
+#endif
+
+/*
+ * These macros help in making persistent storage thread-specific.
+ * Libc makes extensive use of private static data structures
+ * that hold state across function invocation, and these macros
+ * are no-ops when _THREAD_SAFE is not defined. 
+ * In a thread-safe library, the static variables are used only for
+ * initialising the per-thread instances of the state variables.
+ */
+
+/*
+ * Give names to the private variables used to hold per-thread
+ * data structures.
+ */
+#ifdef __STDC__
+#define __THREAD_MUTEXP_NAME(name)      _thread_mutexp_inst__ ## name
+#define __THREAD_MUTEX_NAME(name)       _thread_mutex_inst__ ## name
+#define __THREAD_KEY_NAME(name)         _thread_key_inst__ ## name
+#else
+#define __THREAD_MUTEXP_NAME(name)      _thread_mutexp_inst__/**/name
+#define __THREAD_MUTEX_NAME(name)       _thread_mutex_inst__/**/name
+#define __THREAD_KEY_NAME(name)         _thread_key_inst__/**/name
+#endif
+
+/*
+ * Mutex declare, lock and unlock macros.
+ */
+#define _THREAD_PRIVATE_MUTEX(name)                                     \
+        static struct pthread_mutex __THREAD_MUTEXP_NAME(name) =        \
+                PTHREAD_MUTEX_STATIC_INITIALIZER;                       \
+        static pthread_mutex_t __THREAD_MUTEX_NAME(name) =              \
+                &__THREAD_MUTEXP_NAME(name);
+                
+#define _THREAD_PRIVATE_MUTEX_LOCK(name)                                \
+        pthread_mutex_lock(&__THREAD_MUTEX_NAME(name))
+                
+#define _THREAD_PRIVATE_MUTEX_UNLOCK(name)                              \
+        pthread_mutex_unlock(&__THREAD_MUTEX_NAME(name))
+
+/*
+ * A mutexed data structure used to hold the persistent state's key.
+ */
+struct _thread_private_key_struct {
+        struct pthread_mutex    lockd;
+        pthread_mutex_t         lock;
+        int                     init;
+        pthread_key_t           key;
+};
+
+/*
+ * Declaration of a per-thread state key.
+ */
+#define _THREAD_PRIVATE_KEY(name)                                       \
+        static volatile struct _thread_private_key_struct               \
+        __THREAD_KEY_NAME(name) = {                                     \
+                PTHREAD_MUTEX_STATIC_INITIALIZER,                       \
+                &__THREAD_KEY_NAME(name).lockd,                         \
+                0                                                       \
+        };
+
+/*
+ * Initialisation of storage space for a per-thread state variable.
+ * A pointer to a per-thread *copy* of the _initv parameter is returned.
+ * It calls malloc the first time and the space is automatically free'd
+ * when the thread dies. If you need something a bit more complicated
+ * than free() you will need to roll-your-own.
+ */
+#define _THREAD_PRIVATE(keyname, _initv, _errv)                         \
+        ({                                                              \
+                struct _thread_private_key_struct * __k =               \
+                        &__THREAD_KEY_NAME(keyname);                    \
+                void* __p;                                              \
+                extern void free __P((void*));                          \
+                extern void* malloc __P((size_t));                      \
+                                                                        \
+                if (!__isthreaded) {                                    \
+                        /* non-threaded behaviour */                    \
+                        __p = &(_initv);                                \
+                        goto _ok;                                       \
+                }                                                       \
+                                                                        \
+                /* create key for first thread */                       \
+                pthread_mutex_lock(&__k->lock);                         \
+                if (__k->init == 0) {                                   \
+                        if (pthread_key_create(&__k->key, free)) {      \
+                                pthread_mutex_unlock(&__k->lock);       \
+                                goto _err;                              \
+                        }                                               \
+                        __k->init = 1;                                  \
+                }                                                       \
+                pthread_mutex_unlock(&__k->lock);                       \
+                                                                        \
+                if ((__p = pthread_getspecific(__k->key)) == NULL) {    \
+                        /* alloc space on 1st call in this thread */    \
+                        if ((__p = malloc(sizeof(_initv))) == NULL)     \
+                                goto _err;                              \
+                                if (pthread_setspecific(__k->key, __p) != 0) { \
+                                        free(__p);                      \
+                                        goto _err;                      \
+                                }                                       \
+                        /* initialise with _initv */                    \
+                memcpy(__p, &_initv, sizeof(_initv));                   \
+                }                                                       \
+                goto _ok;                                               \
+        _err:                                                           \
+                __p = (_errv);                                          \
+        _ok:                                                            \
+                __p;                                                    \
+        })
+
+/*
+ * Macros for locking and unlocking FILEs. These test if the
+ * process is threaded to avoid locking when not required.
+ */
+#define FLOCKFILE(fp)           if (__isthreaded) _FLOCKFILE(fp)
+#define FUNLOCKFILE(fp)         if (__isthreaded) funlockfile(fp)
+
+#else /* !_THREAD_SAFE */
+
+/*
+ * Do-nothing macros for single-threaded case.
+ */
+#define _FD_LOCK(f,o,p)                         (0)
+#define _FD_UNLOCK(f,o)                         /* nothing */
+#define _THREAD_PRIVATE_KEY(_key)               /* nothing */
+#define _THREAD_PRIVATE(keyname, _initv, _errv) (&(_initv))
+#define _THREAD_PRIVATE_MUTEX(_name)            /* nothing */
+#define _THREAD_PRIVATE_MUTEX_LOCK(_name)       /* nothing */
+#define _THREAD_PRIVATE_MUTEX_UNLOCK(_name)     /* nothing */
+#define FLOCKFILE(fp)                           /* nothing */
+#define FUNLOCKFILE(fp)                         /* nothing */
+
+#endif /* !_THREAD_SAFE */
+
+#endif _THREAD_PRIVATE_H_
diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
new file mode 100644
index 0000000000..35a9632a94
--- /dev/null
+++ b/src/lib/libc/net/Makefile.inc
@@ -0,0 +1,56 @@
+#       $OpenBSD: Makefile.inc,v 1.17 1998/11/20 11:18:43 d Exp $
+
+# net sources
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
+
+CFLAGS+=-DRESOLVSORT
+
+SRCS+=  base64.c gethostnamadr.c getnetbyaddr.c getnetbyname.c getnetent.c \
+        getnetnamadr.c getproto.c getprotoent.c getprotoname.c getservbyname.c \
+        getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \
+        inet_makeaddr.c inet_neta.c inet_netof.c inet_network.c \
+        inet_net_ntop.c inet_net_pton.c inet_ntoa.c inet_ntop.c \
+        inet_pton.c ipx_addr.c ipx_ntoa.c \
+        iso_addr.c linkaddr.c ns_addr.c ns_ntoa.c nsap_addr.c rcmd.c recv.c \
+        res_comp.c res_data.c res_debug.c res_init.c res_mkquery.c res_query.c \
+        res_random.c res_send.c send.c sethostent.c ethers.c rcmdsh.c
+
+# machine-dependent net sources
+# m-d Makefile.inc must include sources for:
+#       htonl() htons() ntohl() ntohs()
+
+.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net/Makefile.inc"
+
+MAN+=   byteorder.3 ethers.3 gethostbyname.3 getnetent.3 getprotoent.3 \
+        getservent.3 inet.3 inet_net.3 iso_addr.3 link_addr.3 ns.3 ipx.3 \
+        rcmd.3 rcmdsh.3 resolver.3
+
+MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
+        byteorder.3 ntohs.3 byteorder.3 htobe16.3 byteorder.3 htobe32.3 \
+        byteorder.3 betoh16.3 byteorder.3 betoh32.3 byteorder.3 htole16.3 \
+        byteorder.3 htole32.3 byteorder.3 letoh16.3 byteorder.3 letoh32.3 \
+        byteorder.3 swap16.3 byteorder.3 swap32.3
+MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
+        ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3 ethers.3 ether_addr.3
+MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
+        gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
+        gethostbyname.3 herror.3 gethostbyname.3 gethostbyname2.3 \
+        gethostbyname.3 hstrerror.3
+MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
+        getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
+MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
+        getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
+MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
+        getservent.3 getservbyport.3 getservent.3 setservent.3
+MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
+        inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \
+        inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 network.3 \
+        inet.3 ntoa.3 inet.3 inet_ntop.3 inet.3 inet_pton.3
+MLINKS+=iso_addr.3 iso_ntoa.3
+MLINKS+=link_addr.3 link_ntoa.3
+MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
+MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
+MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.3 rcmd.3 ruserok.3
+MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
+        resolver.3 res_mkquery.3 resolver.3 res_send.3 resolver.3 res_query.3 \
+        resolver.3 res_search.3
diff --git a/src/lib/libc/net/base64.c b/src/lib/libc/net/base64.c
new file mode 100644
index 0000000000..452fe5afcc
--- /dev/null
+++ b/src/lib/libc/net/base64.c
@@ -0,0 +1,317 @@
+/*      $OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $      */
+
+/*
+ * Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+/*
+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
+ *
+ * International Business Machines, Inc. (hereinafter called IBM) grants
+ * permission under its copyrights to use, copy, modify, and distribute this
+ * Software with or without fee, provided that the above copyright notice and
+ * all paragraphs of this notice appear in all copies, and that the name of IBM
+ * not be used in connection with the marketing of any product incorporating
+ * the Software or modifications thereof, without specific, written prior
+ * permission.
+ *
+ * To the extent it has a right to do so, IBM grants an immunity from suit
+ * under its patents, if any, for the use, sale or manufacture of products to
+ * the extent that such products are used for performing Domain Name System
+ * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
+ * granted for any product per se or for any other function of any product.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <ctype.h>
+#include <resolv.h>
+#include <stdio.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#define Assert(Cond) if (!(Cond)) abort()
+
+static const char Base64[] =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char Pad64 = '=';
+
+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
+   The following encoding technique is taken from RFC 1521 by Borenstein
+   and Freed.  It is reproduced here in a slightly edited form for
+   convenience.
+
+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
+   represented per printable character. (The extra 65th character, "=",
+   is used to signify a special processing function.)
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters. Proceeding from left to right, a
+   24-bit input group is formed by concatenating 3 8-bit input groups.
+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
+   of which is translated into a single digit in the base64 alphabet.
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters. The character referenced by the index is placed in the
+   output string.
+
+                         Table 1: The Base64 Alphabet
+
+      Value Encoding  Value Encoding  Value Encoding  Value Encoding
+          0 A            17 R            34 i            51 z
+          1 B            18 S            35 j            52 0
+          2 C            19 T            36 k            53 1
+          3 D            20 U            37 l            54 2
+          4 E            21 V            38 m            55 3
+          5 F            22 W            39 n            56 4
+          6 G            23 X            40 o            57 5
+          7 H            24 Y            41 p            58 6
+          8 I            25 Z            42 q            59 7
+          9 J            26 a            43 r            60 8
+         10 K            27 b            44 s            61 9
+         11 L            28 c            45 t            62 +
+         12 M            29 d            46 u            63 /
+         13 N            30 e            47 v
+         14 O            31 f            48 w         (pad) =
+         15 P            32 g            49 x
+         16 Q            33 h            50 y
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded.  A full encoding quantum is
+   always completed at the end of a quantity.  When fewer than 24 input
+   bits are available in an input group, zero bits are added (on the
+   right) to form an integral number of 6-bit groups.  Padding at the
+   end of the data is performed using the '=' character.
+
+   Since all base64 input is an integral number of octets, only the
+         -------------------------------------------------                       
+   following cases can arise:
+   
+       (1) the final quantum of encoding input is an integral
+           multiple of 24 bits; here, the final unit of encoded
+           output will be an integral multiple of 4 characters
+           with no "=" padding,
+       (2) the final quantum of encoding input is exactly 8 bits;
+           here, the final unit of encoded output will be two
+           characters followed by two "=" padding characters, or
+       (3) the final quantum of encoding input is exactly 16 bits;
+           here, the final unit of encoded output will be three
+           characters followed by one "=" padding character.
+   */
+
+int
+b64_ntop(src, srclength, target, targsize)
+        u_char const *src;
+        size_t srclength;
+        char *target;
+        size_t targsize;
+{
+        size_t datalength = 0;
+        u_char input[3];
+        u_char output[4];
+        int i;
+
+        while (2 < srclength) {
+                input[0] = *src++;
+                input[1] = *src++;
+                input[2] = *src++;
+                srclength -= 3;
+
+                output[0] = input[0] >> 2;
+                output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
+                output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
+                output[3] = input[2] & 0x3f;
+                Assert(output[0] < 64);
+                Assert(output[1] < 64);
+                Assert(output[2] < 64);
+                Assert(output[3] < 64);
+
+                if (datalength + 4 > targsize)
+                        return (-1);
+                target[datalength++] = Base64[output[0]];
+                target[datalength++] = Base64[output[1]];
+                target[datalength++] = Base64[output[2]];
+                target[datalength++] = Base64[output[3]];
+        }
+    
+        /* Now we worry about padding. */
+        if (0 != srclength) {
+                /* Get what's left. */
+                input[0] = input[1] = input[2] = '\0';
+                for (i = 0; i < srclength; i++)
+                        input[i] = *src++;
+        
+                output[0] = input[0] >> 2;
+                output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
+                output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
+                Assert(output[0] < 64);
+                Assert(output[1] < 64);
+                Assert(output[2] < 64);
+
+                if (datalength + 4 > targsize)
+                        return (-1);
+                target[datalength++] = Base64[output[0]];
+                target[datalength++] = Base64[output[1]];
+                if (srclength == 1)
+                        target[datalength++] = Pad64;
+                else
+                        target[datalength++] = Base64[output[2]];
+                target[datalength++] = Pad64;
+        }
+        if (datalength >= targsize)
+                return (-1);
+        target[datalength] = '\0';      /* Returned value doesn't count \0. */
+        return (datalength);
+}
+
+/* skips all whitespace anywhere.
+   converts characters, four at a time, starting at (or after)
+   src from base - 64 numbers into three 8 bit bytes in the target area.
+   it returns the number of data bytes stored at the target, or -1 on error.
+ */
+
+int
+b64_pton(src, target, targsize)
+        char const *src;
+        u_char *target;
+        size_t targsize;
+{
+        int tarindex, state, ch;
+        char *pos;
+
+        state = 0;
+        tarindex = 0;
+
+        while ((ch = *src++) != '\0') {
+                if (isspace(ch))        /* Skip whitespace anywhere. */
+                        continue;
+
+                if (ch == Pad64)
+                        break;
+
+                pos = strchr(Base64, ch);
+                if (pos == 0)           /* A non-base64 character. */
+                        return (-1);
+
+                switch (state) {
+                case 0:
+                        if (target) {
+                                if (tarindex >= targsize)
+                                        return (-1);
+                                target[tarindex] = (pos - Base64) << 2;
+                        }
+                        state = 1;
+                        break;
+                case 1:
+                        if (target) {
+                                if (tarindex + 1 >= targsize)
+                                        return (-1);
+                                target[tarindex]   |=  (pos - Base64) >> 4;
+                                target[tarindex+1]  = ((pos - Base64) & 0x0f)
+                                                        << 4 ;
+                        }
+                        tarindex++;
+                        state = 2;
+                        break;
+                case 2:
+                        if (target) {
+                                if (tarindex + 1 >= targsize)
+                                        return (-1);
+                                target[tarindex]   |=  (pos - Base64) >> 2;
+                                target[tarindex+1]  = ((pos - Base64) & 0x03)
+                                                        << 6;
+                        }
+                        tarindex++;
+                        state = 3;
+                        break;
+                case 3:
+                        if (target) {
+                                if (tarindex >= targsize)
+                                        return (-1);
+                                target[tarindex] |= (pos - Base64);
+                        }
+                        tarindex++;
+                        state = 0;
+                        break;
+                }
+        }
+
+        /*
+         * We are done decoding Base-64 chars.  Let's see if we ended
+         * on a byte boundary, and/or with erroneous trailing characters.
+         */
+
+        if (ch == Pad64) {              /* We got a pad char. */
+                ch = *src++;            /* Skip it, get next. */
+                switch (state) {
+                case 0:         /* Invalid = in first position */
+                case 1:         /* Invalid = in second position */
+                        return (-1);
+
+                case 2:         /* Valid, means one byte of info */
+                        /* Skip any number of spaces. */
+                        for (; ch != '\0'; ch = *src++)
+                                if (!isspace(ch))
+                                        break;
+                        /* Make sure there is another trailing = sign. */
+                        if (ch != Pad64)
+                                return (-1);
+                        ch = *src++;            /* Skip the = */
+                        /* Fall through to "single trailing =" case. */
+                        /* FALLTHROUGH */
+
+                case 3:         /* Valid, means two bytes of info */
+                        /*
+                         * We know this char is an =.  Is there anything but
+                         * whitespace after it?
+                         */
+                        for (; ch != '\0'; ch = *src++)
+                                if (!isspace(ch))
+                                        return (-1);
+
+                        /*
+                         * Now make sure for cases 2 and 3 that the "extra"
+                         * bits that slopped past the last full byte were
+                         * zeros.  If we don't check them, they become a
+                         * subliminal channel.
+                         */
+                        if (target && target[tarindex] != 0)
+                                return (-1);
+                }
+        } else {
+                /*
+                 * We ended by seeing the end of the string.  Make sure we
+                 * have no partial bytes lying around.
+                 */
+                if (state != 0)
+                        return (-1);
+        }
+
+        return (tarindex);
+}
diff --git a/src/lib/libc/net/byteorder.3 b/src/lib/libc/net/byteorder.3
new file mode 100644
index 0000000000..f2788b25dc
--- /dev/null
+++ b/src/lib/libc/net/byteorder.3
@@ -0,0 +1,155 @@
+.\"     $OpenBSD: byteorder.3,v 1.5 1997/11/19 23:30:17 niklas Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt BYTEORDER 3
+.Os BSD 4.2
+.Sh NAME
+.Nm htonl ,
+.Nm htons ,
+.Nm ntohl ,
+.Nm ntohs ,
+.Nm htobe32 ,
+.Nm htobe16 ,
+.Nm betoh32 ,
+.Nm betoh16 ,
+.Nm htole32 ,
+.Nm htole16 ,
+.Nm letoh32 ,
+.Nm letoh16 ,
+.Nm swap32 ,
+.Nm swap16
+.Nd convert values between different byte orderings
+.Sh SYNOPSIS
+.Fd #include <sys/types.h>
+.Fd #include <machine/endian.h>
+.Ft u_int32_t
+.Fn htonl "u_int32_t host32"
+.Ft u_int16_t
+.Fn htons "u_int16_t host16"
+.Ft u_int32_t
+.Fn ntohl "u_int32_t net32"
+.Ft u_int16_t
+.Fn ntohs "u_int16_t net16"
+.Ft u_int32_t
+.Fn htobe32 "u_int32_t host32"
+.Ft u_int16_t
+.Fn htobe16 "u_int16_t host16"
+.Ft u_int32_t
+.Fn betoh32 "u_int32_t big32"
+.Ft u_int16_t
+.Fn betoh16 "u_int16_t big16"
+.Ft u_int32_t
+.Fn htole32 "u_int32_t host32"
+.Ft u_int16_t
+.Fn htole16 "u_int16_t host16"
+.Ft u_int32_t
+.Fn letoh32 "u_int32_t little32"
+.Ft u_int16_t
+.Fn letoh16 "u_int16_t little16"
+.Ft u_int32_t
+.Fn swap32 "u_int32_t val32"
+.Ft u_int16_t
+.Fn swap16 "u_int16_t val16"
+.Sh DESCRIPTION
+These routines convert 16 and 32 bit quantities between different
+byte orderings.  The "swap" functions reverse the byte ordering of
+the given quantity, the others converts either from/to the native
+byte order used by the host to/from either little- or big-endian (a.k.a
+network) order.
+.Pp
+Apart from the "swap" functions, the names can be described by this form:
+{src-order}to{dst-order}{size}.
+Both {src-order} and {dst-order} can take the following forms:
+.Bl -tag -width "be "
+.It Em h
+host order
+.It Em n
+network order (big-endian)
+.It Em be
+big-endian (Most significant byte first)
+.It Em le
+little-endian (Least significant byte first)
+.El
+.Pp
+One of the specified orderings must be "h".
+{Size} will take these forms:
+.Bl -tag -width "32 "
+.It Em l
+long (32-bit, used in conjunction with forms involving "n")
+.It Em s
+short (16-bit, used in conjunction with forms involving "n")
+.It Em 16
+16-bit
+.It Em 32
+32-bit
+.El
+.Pp
+The "swap" functions are of the form: swap{size}.
+.Pp
+Names involving "n" convert quantities between network
+byte order and host byte order.  The last letter (s/l) is a mnemonic
+for the traditional names for such quantities, short and long,
+respectively.  Today, the C concept of "short"/"long" integers
+need not coincide with this traditional misunderstanding.
+On machines which have a byte order which is the same as the network
+order, routines are defined as null macros.
+.Pp
+The functions involving either "be", "le" or "swap" use the numbers
+(16/32) for specifying the bitwidth of the quantities they operate on.
+Currently all supported architectures are either big- or little-endian
+so either the "be" or the "le" variants are implemented as null macros.
+.Pp
+The routines mentioned above which have either {src-order} or {dst-order}
+set to "n" are most often used in
+conjunction with Internet addresses and ports as returned by
+.Xr gethostbyname 3
+and
+.Xr getservent 3 .
+.Sh SEE ALSO
+.Xr gethostbyname 3 ,
+.Xr getservent 3
+.Sh HISTORY
+The
+.Nm byteorder
+functions appeared in 
+.Bx 4.2 .
+.Sh BUGS
+On the
+.Tn vax ,
+.Tn alpha ,
+.Tn i386 ,
+and so far
+.Tn mips
+bytes are handled backwards from most everyone else in
+the world.  This is not expected to be fixed in the near future.
diff --git a/src/lib/libc/net/ethers.3 b/src/lib/libc/net/ethers.3
new file mode 100644
index 0000000000..74d153fce6
--- /dev/null
+++ b/src/lib/libc/net/ethers.3
@@ -0,0 +1,109 @@
+.\"     $OpenBSD: ethers.3,v 1.10 1999/03/18 11:09:15 aaron Exp $
+.\"
+.\" Written by roland@frob.com.  Public domain.
+.\"
+.Dd December 16, 1993
+.Dt ETHERS 3
+.Os
+.Sh NAME
+.Nm ether_aton ,
+.Nm ether_ntoa ,
+.Nm ether_addr ,
+.Nm ether_ntohost ,
+.Nm ether_hostton ,
+.Nm ether_line
+.Nd get ethers entry
+.Sh SYNOPSIS
+.Fd #include <netinet/if_ether.h>
+.Ft char *
+.Fn ether_ntoa "struct ether_addr *e"
+.Ft struct ether_addr *
+.Fn ether_aton "char *s"
+.Ft int
+.Fn ether_ntohost "char *hostname" "struct ether_addr *e"
+.Ft int
+.Fn ether_hostton "char *hostname" "struct ether_addr *e"
+.Ft int
+.Fn ether_line "char *l" "struct ether_addr *e" "char *hostname"
+.Sh DESCRIPTION
+Ethernet addresses are represented by the 
+following structure:
+.Bd -literal -offset indent
+struct ether_addr {
+        u_int8_t  ether_addr_octet[6];
+};
+.Ed
+.Pp
+The
+.Fn ether_ntoa
+function converts this structure into an ASCII string of the form
+``xx:xx:xx:xx:xx:xx'', consisting of 6 hexadecimal numbers separated
+by colons.  It returns a pointer to a static buffer that is reused for
+each call.
+The
+.Fn ether_aton
+converts an ASCII string of the same form and to a structure
+containing the 6 octets of the address.  It returns a pointer to a
+static structure that is reused for each call.
+.Pp
+The
+.Fn ether_ntohost
+and
+.Fn ether_hostton
+functions interrogate the data base mapping host names to Ethernet
+addresses,
+.Pa /etc/ethers .
+The
+.Fn ether_ntohost
+function looks up the given Ethernet address and writes the associated
+host name into the character buffer passed.  This buffer should be
+.Ev MAXHOSTNAMELEN
+characters in size.
+The
+.Fn ether_hostton
+function looks up the given host name and writes the associated
+Ethernet address into the structure passed.  Both functions return
+zero if they find the requested host name or address, and -1 if not.
+.Pp
+Each call reads
+.Pa /etc/ethers 
+from the beginning; if a + appears alone on a line in the file, then
+.Fn ether_hostton
+will consult the
+.Pa ethers.byname
+YP map, and
+.Fn ether_ntohost
+will consult the
+.Pa ethers.byaddr
+YP map.
+.Pp
+The
+.Fn ether_line
+function parses a line from the
+.Pa /etc/ethers
+file and fills in the passed ``struct ether_addr'' and character
+buffer with the Ethernet address and host name on the line.  It
+returns zero if the line was successfully parsed and -1 if not.
+The character buffer should be
+.Ev MAXHOSTNAMELEN
+characters in size.
+.Sh FILES
+.Bl -tag -width /etc/ethers -compact
+.It Pa /etc/ethers
+.El
+.Sh SEE ALSO
+.Xr ethers 5
+.Sh HISTORY
+The
+.Fn ether_ntoa ,
+.Fn ether_aton ,
+.Fn ether_ntohost ,
+.Fn ether_hostton ,
+and
+.Fn ether_line
+functions were adopted from SunOS and appeared in
+NetBSD 0.9b.
+.Sh BUGS
+The data space used by these functions is static; if future use
+requires the data, it should be copied before any subsequent calls to
+these functions overwrite it.
diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c
new file mode 100644
index 0000000000..94ae5c996a
--- /dev/null
+++ b/src/lib/libc/net/ethers.c
@@ -0,0 +1,270 @@
+/*      $OpenBSD: ethers.c,v 1.10 1998/11/18 23:28:54 deraadt Exp $     */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* 
+ * ethers(3) a la Sun.
+ * Originally Written by Roland McGrath <roland@frob.com> 10/14/93.
+ * Substantially modified by Todd C. Miller <Todd.Miller@courtesan.com>
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: ethers.c,v 1.10 1998/11/18 23:28:54 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <sys/param.h>
+#include <paths.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifndef _PATH_ETHERS
+#define _PATH_ETHERS    "/etc/ethers"
+#endif
+
+static char * _ether_aton __P((char *, struct ether_addr *));
+
+char *
+ether_ntoa(e)
+        struct ether_addr *e;
+{
+        static char a[] = "xx:xx:xx:xx:xx:xx";
+
+        if (e->ether_addr_octet[0] > 0xFF || e->ether_addr_octet[1] > 0xFF ||
+            e->ether_addr_octet[2] > 0xFF || e->ether_addr_octet[3] > 0xFF ||
+            e->ether_addr_octet[4] > 0xFF || e->ether_addr_octet[5] > 0xFF) {
+                errno = EINVAL;
+                return (NULL);
+        }
+
+        (void)sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
+            e->ether_addr_octet[0], e->ether_addr_octet[1],
+            e->ether_addr_octet[2], e->ether_addr_octet[3],
+            e->ether_addr_octet[4], e->ether_addr_octet[5]);
+
+        return (a);
+}
+
+static char *
+_ether_aton(s, e)
+        char *s;
+        struct ether_addr *e;
+{
+        int i;
+        long l;
+        char *pp;
+
+        while (isspace(*s))
+                s++;
+
+        /* expect 6 hex octets separated by ':' or space/NUL if last octet */
+        for (i = 0; i < 6; i++) {
+                l = strtol(s, &pp, 16);
+                if (pp == s || l > 0xFF || l < 0)
+                        return (NULL);
+                if (!(*pp == ':' || (i == 5 && (isspace(*pp) || *pp == '\0'))))
+                        return (NULL);
+                e->ether_addr_octet[i] = (u_char)l;
+                s = pp + 1;
+        }
+
+        /* return character after the octets ala strtol(3) */
+        return (pp);
+}
+
+struct ether_addr *
+ether_aton(s)
+        char *s;
+{
+        static struct ether_addr n;
+
+        return (_ether_aton(s, &n) ? &n : NULL);
+}
+
+int
+ether_ntohost(hostname, e)
+        char *hostname;
+        struct ether_addr *e;
+{
+        FILE *f; 
+        char buf[BUFSIZ+1], *p;
+        size_t len;
+        struct ether_addr try;
+#ifdef YP
+        char trybuf[sizeof("xx:xx:xx:xx:xx:xx")];
+        int trylen;
+#endif
+
+        if (e->ether_addr_octet[0] > 0xFF || e->ether_addr_octet[1] > 0xFF ||
+            e->ether_addr_octet[2] > 0xFF || e->ether_addr_octet[3] > 0xFF ||
+            e->ether_addr_octet[4] > 0xFF || e->ether_addr_octet[5] > 0xFF) {
+                errno = EINVAL;
+                return (-1);
+        }
+
+#ifdef YP
+        sprintf(trybuf, "%x:%x:%x:%x:%x:%x", 
+            e->ether_addr_octet[0], e->ether_addr_octet[1],
+            e->ether_addr_octet[2], e->ether_addr_octet[3],
+            e->ether_addr_octet[4], e->ether_addr_octet[5]);
+        trylen = strlen(trybuf);
+#endif
+
+        f = fopen(_PATH_ETHERS, "r");
+        if (f == NULL)
+                return (-1);
+        while ((p = fgetln(f, &len)) != NULL) {
+                if (p[len-1] == '\n')
+                        len--;
+                if (len > sizeof(buf) - 2)
+                        continue;
+                (void)memcpy(buf, p, len);
+                buf[len] = '\n';        /* code assumes newlines later on */
+                buf[len+1] = '\0';
+#ifdef YP
+                /* A + in the file means try YP now.  */
+                if (!strncmp(buf, "+\n", sizeof(buf))) {
+                        char *ypbuf, *ypdom;
+                        int ypbuflen;
+
+                        if (yp_get_default_domain(&ypdom))
+                                continue;
+                        if (yp_match(ypdom, "ethers.byaddr", trybuf,
+                            trylen, &ypbuf, &ypbuflen))
+                                continue;
+                        if (ether_line(ypbuf, &try, hostname) == 0) {
+                                free(ypbuf);
+                                (void)fclose(f);
+                                return (0);
+                        }
+                        free(ypbuf);
+                        continue;
+                }
+#endif
+                if (ether_line(buf, &try, hostname) == 0 &&
+                    memcmp((void *)&try, (void *)e, sizeof(try)) == 0) {
+                        (void)fclose(f);
+                        return (0);
+                }     
+        }
+        (void)fclose(f);
+        errno = ENOENT;
+        return (-1);
+}
+
+int
+ether_hostton(hostname, e)
+        char *hostname;
+        struct ether_addr *e;
+{
+        FILE *f;
+        char buf[BUFSIZ+1], *p;
+        char try[MAXHOSTNAMELEN];
+        size_t len;
+#ifdef YP
+        int hostlen = strlen(hostname);
+#endif
+
+        f = fopen(_PATH_ETHERS, "r");
+        if (f==NULL)
+                return (-1);
+
+        while ((p = fgetln(f, &len)) != NULL) {
+                if (p[len-1] == '\n')
+                        len--;
+                if (len > sizeof(buf) - 2)
+                        continue;
+                memcpy(buf, p, len);
+                buf[len] = '\n';        /* code assumes newlines later on */
+                buf[len+1] = '\0';
+#ifdef YP
+                /* A + in the file means try YP now.  */
+                if (!strncmp(buf, "+\n", sizeof(buf))) {
+                        char *ypbuf, *ypdom;
+                        int ypbuflen;
+
+                        if (yp_get_default_domain(&ypdom))
+                                continue;
+                        if (yp_match(ypdom, "ethers.byname", hostname, hostlen,
+                            &ypbuf, &ypbuflen))
+                                continue;
+                        if (ether_line(ypbuf, e, try) == 0) {
+                                free(ypbuf);
+                                (void)fclose(f);
+                                return (0);
+                        }
+                        free(ypbuf);
+                        continue;
+                }
+#endif
+                if (ether_line(buf, e, try) == 0 && strcmp(hostname, try) == 0) {
+                        (void)fclose(f);
+                        return (0);
+                }
+        }
+        (void)fclose(f);
+        errno = ENOENT;
+        return (-1);
+}
+
+int
+ether_line(line, e, hostname)
+        char *line;
+        struct ether_addr *e;
+        char *hostname;
+{
+        char *p;
+        size_t n;
+
+        /* Parse "xx:xx:xx:xx:xx:xx" */
+        if ((p = _ether_aton(line, e)) == NULL || (*p != ' ' && *p != '\t'))
+                goto bad;
+
+        /* Now get the hostname */
+        while (isspace(*p))
+                p++;
+        if (*p == '\0')
+                goto bad;
+        n = strcspn(p, " \t\n");
+        if (n >= MAXHOSTNAMELEN)
+                goto bad;
+        (void)strncpy(hostname, p, n);
+        hostname[n] = '\0';
+        return (0);
+
+bad:
+        errno = EINVAL;
+        return (-1);
+}
diff --git a/src/lib/libc/net/gethostbyname.3 b/src/lib/libc/net/gethostbyname.3
new file mode 100644
index 0000000000..e28fed361c
--- /dev/null
+++ b/src/lib/libc/net/gethostbyname.3
@@ -0,0 +1,266 @@
+.\"     $OpenBSD: gethostbyname.3,v 1.10 1999/02/27 21:55:27 deraadt Exp $
+.\"
+.\" Copyright (c) 1983, 1987, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd March 13, 1997
+.Dt GETHOSTBYNAME 3
+.Os
+.Sh NAME
+.Nm gethostbyname ,
+.Nm gethostbyname2 ,
+.Nm gethostbyaddr ,
+.Nm gethostent ,
+.Nm sethostent ,
+.Nm endhostent ,
+.Nm hstrerror ,
+.Nm herror
+.Nd get network host entry
+.Sh SYNOPSIS
+.Fd #include <netdb.h>
+.Fd extern int h_errno;
+.Ft struct hostent *
+.Fn gethostbyname "const char *name"
+.Ft struct hostent *
+.Fn gethostbyname2 "const char *name" "int af"
+.Ft struct hostent *
+.Fn gethostbyaddr "const char *addr" "int len" "int type"
+.Ft struct hostent *
+.Fn gethostent void
+.Ft void
+.Fn sethostent "int stayopen"
+.Ft void
+.Fn endhostent void
+.Ft void
+.Fn herror "const char *string"
+.Ft const char *
+.Fn hstrerror "int err"
+.Sh DESCRIPTION
+The
+.Fn gethostbyname
+and
+.Fn gethostbyaddr
+functions
+each return a pointer to an object with the
+following structure describing an internet host
+referenced by name or by address, respectively.
+This structure contains either the information obtained from the name server,
+.Xr named 8 ,
+broken-out fields from a line in 
+.Pa /etc/hosts ,
+or database entries supplied by the
+.Xr yp 8
+system .
+If the local name server is not running these routines do a lookup in
+.Pa /etc/hosts .
+.Bd -literal
+struct  hostent {
+        char    *h_name;        /* official name of host */
+        char    **h_aliases;    /* alias list */
+        int     h_addrtype;     /* host address type */
+        int     h_length;       /* length of address */
+        char    **h_addr_list;  /* list of addresses from name server */
+};
+#define h_addr  h_addr_list[0]  /* address, for backward compatibility */
+.Ed
+.Pp
+The members of this structure are:
+.Bl -tag -width h_addr_list
+.It Fa h_name
+Official name of the host.
+.It Fa h_aliases
+A zero terminated array of alternate names for the host.
+.It Fa h_addrtype
+The type of address being returned.
+.It Fa h_length
+The length, in bytes, of the address.
+.It Fa h_addr_list
+A zero terminated array of network addresses for the host.
+Host addresses are returned in network byte order.
+.It Fa h_addr
+The first address in
+.Fa h_addr_list ;
+this is for backward compatibility.
+.El
+.Pp
+When using the nameserver,
+.Fn gethostbyname
+will search for the named host in the current domain and its parents
+unless the name ends in a dot.
+If the name contains no dot, and if the environment variable
+.Dq Ev HOSTALIASES
+contains the name of an alias file, the alias file will first be searched
+for an alias matching the input name.
+See
+.Xr hostname 7
+for the domain search procedure and the alias file format.
+.Pp
+.Fn gethostbyname2
+is an advanced form of
+.Fn gethostbyname
+which allows lookups in address families other than
+.Dv AF_INET ,
+for example
+.Dv AF_INET6 .
+.Pp
+The
+.Fn sethostent
+function
+may be used to request the use of a connected
+.Tn TCP
+socket for queries.
+If the
+.Fa stayopen
+flag is non-zero,
+this sets the option to send all queries to the name server using
+.Tn TCP
+and to retain the connection after each call to 
+.Fn gethostbyname
+or
+.Fn gethostbyaddr .
+Otherwise, queries are performed using
+.Tn UDP
+datagrams.
+.Pp
+The
+.Fn endhostent
+function
+closes the
+.Tn TCP
+connection.
+.Pp
+The
+.Fn herror
+function prints an error message describing the failure.  If its argument
+.Fa string
+is
+.Pf non Dv -NULL ,
+it is prepended to the message string and separated from it by a colon
+and a space.  The error message is printed with a trailing newline.
+The contents of the error message is the same as that returned by 
+.Fn hstrerror
+with argument
+.Fa h_errno .
+.Sh FILES
+.Bl -tag -width /etc/hosts -compact
+.It Pa /etc/hosts
+.El
+.Sh DIAGNOSTICS
+Error return status from 
+.Fn gethostbyname ,
+.Fn gethostbyname2 ,
+and
+.Fn gethostbyaddr
+is indicated by return of a null pointer.
+The external integer
+.Va h_errno
+may then be checked to see whether this is a temporary failure
+or an invalid or unknown host.
+.Pp
+The variable
+.Va h_errno
+can have the following values:
+.Bl -tag -width HOST_NOT_FOUND
+.It Dv HOST_NOT_FOUND
+No such host is known.
+.It Dv TRY_AGAIN
+This is usually a temporary error
+and means that the local server did not receive
+a response from an authoritative server.
+A retry at some later time may succeed.
+.It Dv NO_RECOVERY
+Some unexpected server failure was encountered.
+This is a non-recoverable error.
+.It Dv NO_DATA
+The requested name is valid but does not have an IP address; 
+this is not a temporary error.  
+This means that the name is known to the name server but there is no address
+associated with this name.
+Another type of request to the name server using this domain name
+will result in an answer;
+for example, a mail-forwarder may be registered for this domain.
+.El
+.Sh SEE ALSO
+.Xr resolver 3 ,
+.Xr hosts 5 ,
+.Xr hostname 7 ,
+.Xr named 8
+.Sh CAVEAT
+The
+.Fn gethostent
+function
+reads the next line of
+.Pa /etc/hosts ,
+opening the file if necessary.
+.Pp
+The
+.Fn sethostent
+function
+opens and/or rewinds the file
+.Pa /etc/hosts .
+If the
+.Fa stayopen
+argument is non-zero,
+the file will not be closed after each call to
+.Fn gethostbyname ,
+.Fn gethostbyname2 ,
+or
+.Fn gethostbyaddr .
+.Pp
+The
+.Fn endhostent
+function
+closes the file.
+.Sh HISTORY
+The
+.Fn herror
+function appeared in 
+.Bx 4.3 .
+The
+.Fn endhostent ,
+.Fn gethostbyaddr ,
+.Fn gethostbyname ,
+.Fn gethostent ,
+and
+.Fn sethostent
+functions appeared in
+.Bx 4.2 .
+.Sh BUGS
+These functions use static data storage;
+if the data is needed for future use, it should be
+copied before any subsequent calls overwrite it.
+Only the Internet
+address formats are currently understood.
+.Pp
+YP does not support any address families other than 
+.Dv AF_INET
+and uses
+the traditional database format.
diff --git a/src/lib/libc/net/gethostnamadr.c b/src/lib/libc/net/gethostnamadr.c
new file mode 100644
index 0000000000..6ff456fb0c
--- /dev/null
+++ b/src/lib/libc/net/gethostnamadr.c
@@ -0,0 +1,1147 @@
+/*-
+ * Copyright (c) 1985, 1988, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.31 1998/11/20 11:18:44 d Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <netdb.h>
+#include <resolv.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <syslog.h>
+#include <stdlib.h>
+#ifdef YP
+#include <rpc/rpc.h>
+#include <rpcsvc/yp.h>
+#include <rpcsvc/ypclnt.h>
+#include "ypinternal.h"
+#endif
+#include "thread_private.h"
+
+#define MULTI_PTRS_ARE_ALIASES 1        /* XXX - experimental */
+
+#define MAXALIASES      35
+#define MAXADDRS        35
+
+static char *h_addr_ptrs[MAXADDRS + 1];
+
+#ifdef YP
+static char *__ypdomain;
+#endif
+
+static struct hostent host;
+static char *host_aliases[MAXALIASES];
+static char hostbuf[BUFSIZ+1];
+static union {
+        struct in_addr _host_in_addr;
+        u_char _host_addr[16];          /* IPv4 or IPv6 */
+} _host_addr_u;
+#define host_addr _host_addr_u._host_addr
+static FILE *hostf = NULL;
+static int stayopen = 0;
+
+static void map_v4v6_address __P((const char *src, char *dst));
+static void map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
+
+#ifdef RESOLVSORT
+static void addrsort __P((char **, int));
+#endif
+
+int _hokchar __P((const char *));
+
+static const char AskedForGot[] =
+                          "gethostby*.getanswer: asked for \"%s\", got \"%s\"";
+
+#if PACKETSZ > 1024
+#define MAXPACKET       PACKETSZ
+#else
+#define MAXPACKET       1024
+#endif
+
+typedef union {
+        HEADER hdr;
+        u_char buf[MAXPACKET];
+} querybuf;
+
+typedef union {
+        int32_t al;
+        char ac;
+} align;
+
+static struct hostent *getanswer __P((const querybuf *, int, const char *,
+                                      int));
+
+extern int h_errno;
+
+int
+_hokchar(p)
+        const char *p;
+{
+        char c;
+
+        /*
+         * Many people do not obey RFC 822 and 1035.  The valid
+         * characters are a-z, A-Z, 0-9, '-' and . But the others
+         * tested for below can happen, and we must be more permissive
+         * than the resolver until those idiots clean up their act.
+         * We let '/' through, but not '..'
+         */
+        while ((c = *p++)) {
+                if (('a' <= c && c <= 'z') ||
+                    ('A' <= c && c <= 'Z') ||
+                    ('0' <= c && c <= '9'))
+                        continue;
+                if (strchr("-_/", c))
+                        continue;
+                if (c == '.' && *p != '.')
+                        continue;
+                return 0;
+        }
+        return 1;
+}
+
+static struct hostent *
+getanswer(answer, anslen, qname, qtype)
+        const querybuf *answer;
+        int anslen;
+        const char *qname;
+        int qtype;
+{
+        register const HEADER *hp;
+        register const u_char *cp;
+        register int n;
+        const u_char *eom;
+        char *bp, **ap, **hap;
+        int type, class, buflen, ancount, qdcount;
+        int haveanswer, had_error;
+        int toobig = 0;
+        char tbuf[MAXDNAME];
+        const char *tname;
+        int (*name_ok) __P((const char *));
+
+        tname = qname;
+        host.h_name = NULL;
+        eom = answer->buf + anslen;
+        switch (qtype) {
+        case T_A:
+        case T_AAAA:
+#ifdef USE_RESOLV_NAME_OK
+                name_ok = res_hnok;
+                break;
+#endif
+        case T_PTR:
+#ifdef USE_RESOLV_NAME_OK
+                name_ok = res_dnok;
+#else
+                name_ok = _hokchar;
+#endif
+                break;
+        default:
+                return (NULL);
+        }
+        /*
+         * find first satisfactory answer
+         */
+        hp = &answer->hdr;
+        ancount = ntohs(hp->ancount);
+        qdcount = ntohs(hp->qdcount);
+        bp = hostbuf;
+        buflen = sizeof hostbuf;
+        cp = answer->buf + HFIXEDSZ;
+        if (qdcount != 1) {
+                h_errno = NO_RECOVERY;
+                return (NULL);
+        }
+        n = dn_expand(answer->buf, eom, cp, bp, buflen);
+        if ((n < 0) || !(*name_ok)(bp)) {
+                h_errno = NO_RECOVERY;
+                return (NULL);
+        }
+        cp += n + QFIXEDSZ;
+        if (qtype == T_A || qtype == T_AAAA) {
+                /* res_send() has already verified that the query name is the
+                 * same as the one we sent; this just gets the expanded name
+                 * (i.e., with the succeeding search-domain tacked on).
+                 */
+                n = strlen(bp) + 1;             /* for the \0 */
+                host.h_name = bp;
+                bp += n;
+                buflen -= n;
+                /* The qname can be abbreviated, but h_name is now absolute. */
+                qname = host.h_name;
+        }
+        ap = host_aliases;
+        *ap = NULL;
+        host.h_aliases = host_aliases;
+        hap = h_addr_ptrs;
+        *hap = NULL;
+        host.h_addr_list = h_addr_ptrs;
+        haveanswer = 0;
+        had_error = 0;
+        while (ancount-- > 0 && cp < eom && !had_error) {
+                n = dn_expand(answer->buf, eom, cp, bp, buflen);
+                if ((n < 0) || !(*name_ok)(bp)) {
+                        had_error++;
+                        continue;
+                }
+                cp += n;                        /* name */
+                type = _getshort(cp);
+                cp += INT16SZ;                  /* type */
+                class = _getshort(cp);
+                cp += INT16SZ + INT32SZ;        /* class, TTL */
+                n = _getshort(cp);
+                cp += INT16SZ;                  /* len */
+                if (class != C_IN) {
+                        /* XXX - debug? syslog? */
+                        cp += n;
+                        continue;               /* XXX - had_error++ ? */
+                }
+                if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
+                        if (ap >= &host_aliases[MAXALIASES-1])
+                                continue;
+                        n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
+                        if ((n < 0) || !(*name_ok)(tbuf)) {
+                                had_error++;
+                                continue;
+                        }
+                        cp += n;
+                        /* Store alias. */
+                        *ap++ = bp;
+                        n = strlen(bp) + 1;     /* for the \0 */
+                        bp += n;
+                        buflen -= n;
+                        /* Get canonical name. */
+                        n = strlen(tbuf) + 1;   /* for the \0 */
+                        if (n > buflen) {
+                                had_error++;
+                                continue;
+                        }
+                        strcpy(bp, tbuf);
+                        host.h_name = bp;
+                        bp += n;
+                        buflen -= n;
+                        continue;
+                }
+                if (qtype == T_PTR && type == T_CNAME) {
+                        n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
+                        if ((n < 0) || !res_hnok(tbuf)) {
+                                had_error++;
+                                continue;
+                        }
+                        cp += n;
+                        /* Get canonical name. */
+                        n = strlen(tbuf) + 1;   /* for the \0 */
+                        if (n > buflen) {
+                                had_error++;
+                                continue;
+                        }
+                        strcpy(bp, tbuf);
+                        tname = bp;
+                        bp += n;
+                        buflen -= n;
+                        continue;
+                }
+                if (type != qtype) {
+                        syslog(LOG_NOTICE|LOG_AUTH,
+               "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
+                               qname, p_class(C_IN), p_type(qtype),
+                               p_type(type));
+                        cp += n;
+                        continue;               /* XXX - had_error++ ? */
+                }
+                switch (type) {
+                case T_PTR:
+                        if (strcasecmp(tname, bp) != 0) {
+                                syslog(LOG_NOTICE|LOG_AUTH,
+                                       AskedForGot, qname, bp);
+                                cp += n;
+                                continue;       /* XXX - had_error++ ? */
+                        }
+                        n = dn_expand(answer->buf, eom, cp, bp, buflen);
+                        if ((n < 0) || !res_hnok(bp)) {
+                                had_error++;
+                                break;
+                        }
+#if MULTI_PTRS_ARE_ALIASES
+                        cp += n;
+                        if (!haveanswer)
+                                host.h_name = bp;
+                        else if (ap < &host_aliases[MAXALIASES-1])
+                                *ap++ = bp;
+                        else
+                                n = -1;
+                        if (n != -1) {
+                                n = strlen(bp) + 1;     /* for the \0 */
+                                bp += n;
+                                buflen -= n;
+                        }
+                        break;
+#else
+                        host.h_name = bp;
+                        if (_res.options & RES_USE_INET6) {
+                                n = strlen(bp) + 1;     /* for the \0 */
+                                bp += n;
+                                buflen -= n;
+                                map_v4v6_hostent(&host, &bp, &buflen);
+                        }
+                        h_errno = NETDB_SUCCESS;
+                        return (&host);
+#endif
+                case T_A:
+                case T_AAAA:
+                        if (strcasecmp(host.h_name, bp) != 0) {
+                                syslog(LOG_NOTICE|LOG_AUTH,
+                                       AskedForGot, host.h_name, bp);
+                                cp += n;
+                                continue;       /* XXX - had_error++ ? */
+                        }
+                        if (n != host.h_length) {
+                                cp += n;
+                                continue;
+                        }
+                        if (!haveanswer) {
+                                register int nn;
+
+                                host.h_name = bp;
+                                nn = strlen(bp) + 1;    /* for the \0 */
+                                bp += nn;
+                                buflen -= nn;
+                        }
+
+                        bp += sizeof(align) - ((u_long)bp % sizeof(align));
+
+                        if (bp + n >= &hostbuf[sizeof hostbuf]) {
+#ifdef DEBUG
+                                if (_res.options & RES_DEBUG)
+                                        printf("size (%d) too big\n", n);
+#endif
+                                had_error++;
+                                continue;
+                        }
+                        if (hap >= &h_addr_ptrs[MAXADDRS-1]) {
+                                if (!toobig++)
+#ifdef DEBUG
+                                        if (_res.options & RES_DEBUG)
+                                                printf("Too many addresses (%d)\n", MAXADDRS);
+#endif
+                                cp += n;
+                                continue;
+                        }
+                        bcopy(cp, *hap++ = bp, n);
+                        bp += n;
+                        buflen -= n;
+                        cp += n;
+                        break;
+                }
+                if (!had_error)
+                        haveanswer++;
+        }
+        if (haveanswer) {
+                *ap = NULL;
+                *hap = NULL;
+# if defined(RESOLVSORT)
+                /*
+                 * Note: we sort even if host can take only one address
+                 * in its return structures - should give it the "best"
+                 * address in that case, not some random one
+                 */
+                if (_res.nsort && haveanswer > 1 && qtype == T_A)
+                        addrsort(h_addr_ptrs, haveanswer);
+# endif /*RESOLVSORT*/
+                if (!host.h_name) {
+                        n = strlen(qname) + 1;  /* for the \0 */
+                        if (n > buflen)
+                                goto try_again;
+                        strcpy(bp, qname);
+                        host.h_name = bp;
+                        bp += n;
+                        buflen -= n;
+                }
+                if (_res.options & RES_USE_INET6)
+                        map_v4v6_hostent(&host, &bp, &buflen);
+                h_errno = NETDB_SUCCESS;
+                return (&host);
+        }
+ try_again:
+        h_errno = TRY_AGAIN;
+        return (NULL);
+}
+
+#ifndef notyet
+/*
+ * XXX This is an extremely bogus implementations.
+ *
+ * FreeBSD has this interface:
+ *    int gethostbyaddr_r(const char *addr, int len, int type,
+ *             struct hostent *result, struct hostent_data *buffer)
+ */
+
+struct hostent *
+gethostbyname_r(name, hp, buf, buflen, errorp)
+        const char * name;
+        struct hostent * hp;
+        char * buf;
+        int buflen;
+        int * errorp;
+{
+        struct hostent *res;
+
+        res = gethostbyname(name);
+        *errorp = h_errno;
+        if (res == NULL)
+                return NULL;
+        memcpy(hp, res, sizeof *hp); /* XXX not sufficient */
+        return hp;
+}
+
+/*
+ * XXX This is an extremely bogus implementations.
+ */
+struct hostent *
+gethostbyaddr_r(addr, len, af, he, buf, buflen, errorp)
+        const char *addr;       /* XXX should have been def'd as u_char! */
+        int len, af;
+        struct hostent * he;
+        char * buf;
+        int buflen;
+        int * errorp;
+{
+        struct hostent * res;
+
+        res = gethostbyaddr(addr, len, af);
+        *errorp = h_errno;
+        if (res == NULL)
+                return NULL;
+        memcpy(he, res, sizeof *he); /* XXX not sufficient */
+        return he;
+}
+
+/* XXX RFC2133 expects a gethostbyname2_r() -- unimplemented */
+#endif
+
+_THREAD_PRIVATE_MUTEX(gethostnamadr)
+
+struct hostent *
+gethostbyname(name)
+        const char *name;
+{
+        struct hostent *hp;
+        extern struct hostent *_gethtbyname2();
+
+        _THREAD_PRIVATE_MUTEX_LOCK(gethostnamadr);
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+                hp = _gethtbyname2(name, AF_INET);
+
+        else if (_res.options & RES_USE_INET6) {
+                hp = gethostbyname2(name, AF_INET6);
+                if (hp == NULL)
+                        hp = gethostbyname2(name, AF_INET);
+        }
+        else
+                hp = gethostbyname2(name, AF_INET);
+        _THREAD_PRIVATE_MUTEX_UNLOCK(gethostnamadr);
+        return hp;
+}
+
+struct hostent *
+gethostbyname2(name, af)
+        const char *name;
+        int af;
+{
+        querybuf buf;
+        register const char *cp;
+        char *bp;
+        int n, size, type, len, i;
+        extern struct hostent *_gethtbyname2(), *_yp_gethtbyname();
+        register struct hostent *hp;
+        char lookups[MAXDNSLUS];
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+                return (_gethtbyname2(name, af));
+
+        switch (af) {
+        case AF_INET:
+                size = INADDRSZ;
+                type = T_A;
+                break;
+        case AF_INET6:
+                size = IN6ADDRSZ;
+                type = T_AAAA;
+                break;
+        default:
+                h_errno = NETDB_INTERNAL;
+                errno = EAFNOSUPPORT;
+                return (NULL);
+        }
+
+        host.h_addrtype = af;
+        host.h_length = size;
+
+        /*
+         * if there aren't any dots, it could be a user-level alias.
+         * this is also done in res_query() since we are not the only
+         * function that looks up host names.
+         */
+        if (!strchr(name, '.') && (cp = __hostalias(name)))
+                name = cp;
+
+        /*
+         * disallow names consisting only of digits/dots, unless
+         * they end in a dot.
+         */
+        if (isdigit(name[0]))
+                for (cp = name;; ++cp) {
+                        if (!*cp) {
+                                if (*--cp == '.')
+                                        break;
+                                /*
+                                 * All-numeric, no dot at the end.
+                                 * Fake up a hostent as if we'd actually
+                                 * done a lookup.
+                                 */
+                                if (inet_pton(af, name, host_addr) <= 0) {
+                                        h_errno = HOST_NOT_FOUND;
+                                        return (NULL);
+                                }
+                                strncpy(hostbuf, name, MAXHOSTNAMELEN-1);
+                                hostbuf[MAXHOSTNAMELEN-1] = '\0';
+                                bp = hostbuf + MAXHOSTNAMELEN;
+                                len = sizeof hostbuf - MAXHOSTNAMELEN;
+                                host.h_name = hostbuf;
+                                host.h_aliases = host_aliases;
+                                host_aliases[0] = NULL;
+                                h_addr_ptrs[0] = (char *)host_addr;
+                                h_addr_ptrs[1] = NULL;
+                                host.h_addr_list = h_addr_ptrs;
+                                if (_res.options & RES_USE_INET6)
+                                        map_v4v6_hostent(&host, &bp, &len);
+                                h_errno = NETDB_SUCCESS;
+                                return (&host);
+                        }
+                        if (!isdigit(*cp) && *cp != '.') 
+                                break;
+                }
+        if ((isxdigit(name[0]) && strchr(name, ':') != NULL) ||
+            name[0] == ':')
+                for (cp = name;; ++cp) {
+                        if (!*cp) {
+                                if (*--cp == '.')
+                                        break;
+                                /*
+                                 * All-IPv6-legal, no dot at the end.
+                                 * Fake up a hostent as if we'd actually
+                                 * done a lookup.
+                                 */
+                                if (inet_pton(af, name, host_addr) <= 0) {
+                                        h_errno = HOST_NOT_FOUND;
+                                        return (NULL);
+                                }
+                                strncpy(hostbuf, name, MAXHOSTNAMELEN-1);
+                                hostbuf[MAXHOSTNAMELEN-1] = '\0';
+                                bp = hostbuf + MAXHOSTNAMELEN;
+                                len = sizeof hostbuf - MAXHOSTNAMELEN;
+                                host.h_name = hostbuf;
+                                host.h_aliases = host_aliases;
+                                host_aliases[0] = NULL;
+                                h_addr_ptrs[0] = (char *)host_addr;
+                                h_addr_ptrs[1] = NULL;
+                                host.h_addr_list = h_addr_ptrs;
+                                h_errno = NETDB_SUCCESS;
+                                return (&host);
+                        }
+                        if (!isxdigit(*cp) && *cp != ':' && *cp != '.') 
+                                break;
+                }
+
+        bcopy(_res.lookups, lookups, sizeof lookups);
+        if (lookups[0] == '\0')
+                strncpy(lookups, "bf", sizeof lookups);
+
+        hp = (struct hostent *)NULL;
+        for (i = 0; i < MAXDNSLUS && hp == NULL && lookups[i]; i++) {
+                switch (lookups[i]) {
+#ifdef YP
+                case 'y':
+                        /* YP only supports AF_INET. */
+                        if (af == AF_INET)
+                                hp = _yp_gethtbyname(name);
+                        break;
+#endif
+                case 'b':
+                        if ((n = res_search(name, C_IN, type, buf.buf,
+                            sizeof(buf))) < 0) {
+#ifdef DEBUG
+                                if (_res.options & RES_DEBUG)
+                                        printf("res_search failed\n");
+#endif
+                                break;
+                        }
+                        hp = getanswer(&buf, n, name, type);
+                        break;
+                case 'f':
+                        hp = _gethtbyname2(name, af);
+                        break;
+                }
+        }
+        /* XXX h_errno not correct in all cases... */
+        return (hp);
+}
+
+struct hostent *
+gethostbyaddr(addr, len, af)
+        const char *addr;       /* XXX should have been def'd as u_char! */
+        int len, af;
+{
+        const u_char *uaddr = (const u_char *)addr;
+        static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
+        static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
+        int n, size, i;
+        querybuf buf;
+        register struct hostent *hp;
+        char qbuf[MAXDNAME+1], *qp;
+        extern struct hostent *_gethtbyaddr(), *_yp_gethtbyaddr();
+        char lookups[MAXDNSLUS];
+        struct hostent *res;
+        
+        _THREAD_PRIVATE_MUTEX_LOCK(gethostnamadr);
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                res = _gethtbyaddr(addr, len, af);
+                _THREAD_PRIVATE_MUTEX_UNLOCK(gethostnamadr);
+                return (res);
+        }
+
+        if (af == AF_INET6 && len == IN6ADDRSZ &&
+            (!bcmp(uaddr, mapped, sizeof mapped) ||
+             !bcmp(uaddr, tunnelled, sizeof tunnelled))) {
+                /* Unmap. */
+                addr += sizeof mapped;
+                uaddr += sizeof mapped;
+                af = AF_INET;
+                len = INADDRSZ;
+        }
+        switch (af) {
+        case AF_INET:
+                size = INADDRSZ;
+                break;
+        case AF_INET6:
+                size = IN6ADDRSZ;
+                break;
+        default:
+                errno = EAFNOSUPPORT;
+                h_errno = NETDB_INTERNAL;
+                _THREAD_PRIVATE_MUTEX_UNLOCK(gethostnamadr);
+                return (NULL);
+        }
+        if (size != len) {
+                errno = EINVAL;
+                h_errno = NETDB_INTERNAL;
+                _THREAD_PRIVATE_MUTEX_UNLOCK(gethostnamadr);
+                return (NULL);
+        }
+        switch (af) {
+        case AF_INET:
+                (void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
+                               (uaddr[3] & 0xff),
+                               (uaddr[2] & 0xff),
+                               (uaddr[1] & 0xff),
+                               (uaddr[0] & 0xff));
+                break;
+        case AF_INET6:
+                qp = qbuf;
+                for (n = IN6ADDRSZ - 1; n >= 0; n--) {
+                        qp += sprintf(qp, "%x.%x.",
+                                       uaddr[n] & 0xf,
+                                       (uaddr[n] >> 4) & 0xf);
+                }
+                strcpy(qp, "ip6.int");
+                break;
+        }
+
+        bcopy(_res.lookups, lookups, sizeof lookups);
+        if (lookups[0] == '\0')
+                strncpy(lookups, "bf", sizeof lookups);
+
+        hp = (struct hostent *)NULL;
+        for (i = 0; i < MAXDNSLUS && hp == NULL && lookups[i]; i++) {
+                switch (lookups[i]) {
+#ifdef YP
+                case 'y':
+                        /* YP only supports AF_INET. */
+                        if (af == AF_INET)
+                                hp = _yp_gethtbyaddr(addr);
+                        break;
+#endif
+                case 'b':
+                        n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf,
+                            sizeof buf.buf);
+                        if (n < 0) {
+#ifdef DEBUG
+                                if (_res.options & RES_DEBUG)
+                                        printf("res_query failed\n");
+#endif
+                                break;
+                        }
+                        if (!(hp = getanswer(&buf, n, qbuf, T_PTR)))
+                                break;
+                        hp->h_addrtype = af;
+                        hp->h_length = len;
+                        bcopy(addr, host_addr, len);
+                        h_addr_ptrs[0] = (char *)host_addr;
+                        h_addr_ptrs[1] = NULL;
+                        if (af == AF_INET && (_res.options & RES_USE_INET6)) {
+                                map_v4v6_address((char*)host_addr,
+                                    (char*)host_addr);
+                                hp->h_addrtype = AF_INET6;
+                                hp->h_length = IN6ADDRSZ;
+                        }
+                        h_errno = NETDB_SUCCESS;
+                        break;
+                case 'f':
+                        hp = _gethtbyaddr(addr, len, af);
+                        break;
+                }
+        }
+        _THREAD_PRIVATE_MUTEX_UNLOCK(gethostnamadr);
+        /* XXX h_errno not correct in all cases... */
+        return (hp);
+}
+
+void
+_sethtent(f)
+        int f;
+{
+        if (hostf == NULL)
+                hostf = fopen(_PATH_HOSTS, "r" );
+        else
+                rewind(hostf);
+        stayopen = f;
+}
+
+void
+_endhtent()
+{
+        if (hostf && !stayopen) {
+                (void) fclose(hostf);
+                hostf = NULL;
+        }
+}
+
+struct hostent *
+_gethtent()
+{
+        char *p;
+        register char *cp, **q;
+        int af;
+        size_t len;
+
+        if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
+                h_errno = NETDB_INTERNAL;
+                return (NULL);
+        }
+ again:
+        if ((p = fgetln(hostf, &len)) == NULL) {
+                h_errno = HOST_NOT_FOUND;
+                return (NULL);
+        }
+        if (p[len-1] == '\n')
+                len--;
+        if (len >= sizeof(hostbuf) || len == 0)
+                goto again;
+        p = memcpy(hostbuf, p, len);
+        hostbuf[len] = '\0';
+        if (*p == '#')
+                goto again;
+        if ((cp = strchr(p, '#')))
+                *cp = '\0';
+        if (!(cp = strpbrk(p, " \t")))
+                goto again;
+        *cp++ = '\0';
+        if ((_res.options & RES_USE_INET6) &&
+            inet_pton(AF_INET6, p, host_addr) > 0) {
+                af = AF_INET6;
+                len = IN6ADDRSZ;
+        } else if (inet_pton(AF_INET, p, host_addr) > 0) {
+                if (_res.options & RES_USE_INET6) {
+                        map_v4v6_address((char*)host_addr, (char*)host_addr);
+                        af = AF_INET6;
+                        len = IN6ADDRSZ;
+                } else {
+                        af = AF_INET;
+                        len = INADDRSZ;
+                }
+        } else {
+                goto again;
+        }
+        h_addr_ptrs[0] = (char *)host_addr;
+        h_addr_ptrs[1] = NULL;
+        host.h_addr_list = h_addr_ptrs;
+        host.h_length = len;
+        host.h_addrtype = af;
+        while (*cp == ' ' || *cp == '\t')
+                cp++;
+        host.h_name = cp;
+        q = host.h_aliases = host_aliases;
+        if ((cp = strpbrk(cp, " \t")))
+                *cp++ = '\0';
+        while (cp && *cp) {
+                if (*cp == ' ' || *cp == '\t') {
+                        cp++;
+                        continue;
+                }
+                if (q < &host_aliases[MAXALIASES - 1])
+                        *q++ = cp;
+                if ((cp = strpbrk(cp, " \t")))
+                        *cp++ = '\0';
+        }
+        *q = NULL;
+        if (_res.options & RES_USE_INET6) {
+                char *bp = hostbuf;
+                int buflen = sizeof hostbuf;
+
+                map_v4v6_hostent(&host, &bp, &buflen);
+        }
+        h_errno = NETDB_SUCCESS;
+        return (&host);
+}
+
+struct hostent *
+_gethtbyname(name)
+        const char *name;
+{
+        extern struct hostent *_gethtbyname2();
+        struct hostent *hp;
+
+        if (_res.options & RES_USE_INET6) {
+                hp = _gethtbyname2(name, AF_INET6);
+                if (hp)
+                        return (hp);
+        }
+        return (_gethtbyname2(name, AF_INET));
+}
+
+struct hostent *
+_gethtbyname2(name, af)
+        const char *name;
+        int af;
+{
+        register struct hostent *p;
+        register char **cp;
+        
+        _sethtent(0);
+        while ((p = _gethtent())) {
+                if (p->h_addrtype != af)
+                        continue;
+                if (strcasecmp(p->h_name, name) == 0)
+                        break;
+                for (cp = p->h_aliases; *cp != 0; cp++)
+                        if (strcasecmp(*cp, name) == 0)
+                                goto found;
+        }
+ found:
+        _endhtent();
+        return (p);
+}
+
+struct hostent *
+_gethtbyaddr(addr, len, af)
+        const char *addr;
+        int len, af;
+{
+        register struct hostent *p;
+
+        _sethtent(0);
+        while ((p = _gethtent()))
+                if (p->h_addrtype == af && !bcmp(p->h_addr, addr, len))
+                        break;
+        _endhtent();
+        return (p);
+}
+
+#ifdef YP
+struct hostent *
+_yphostent(line)
+        char *line;
+{
+        static struct in_addr host_addrs[MAXADDRS];
+        char *p = line;
+        char *cp, **q;
+        char **hap;
+        struct in_addr *buf;
+        int more;
+
+        host.h_name = NULL;
+        host.h_addr_list = h_addr_ptrs;
+        host.h_length = INADDRSZ;
+        host.h_addrtype = AF_INET;
+        hap = h_addr_ptrs;
+        buf = host_addrs;
+        q = host.h_aliases = host_aliases;
+
+nextline:
+        more = 0;
+        cp = strpbrk(p, " \t");
+        if (cp == NULL) {
+                if (host.h_name == NULL)
+                        return (NULL);
+                else
+                        goto done;
+        }
+        *cp++ = '\0';
+
+        *hap++ = (char *)buf;
+        (void) inet_aton(p, buf++);
+
+        while (*cp == ' ' || *cp == '\t')
+                cp++;
+        p = cp;
+        cp = strpbrk(p, " \t\n");
+        if (cp != NULL) {
+                if (*cp == '\n')
+                        more = 1;
+                *cp++ = '\0';
+        }
+        if (!host.h_name)
+                host.h_name = p;
+        else if (strcmp(host.h_name, p)==0)
+                ;
+        else if (q < &host_aliases[MAXALIASES - 1])
+                *q++ = p;
+        p = cp;
+        if (more)
+                goto nextline;
+
+        while (cp && *cp) {
+                if (*cp == ' ' || *cp == '\t') {
+                        cp++;
+                        continue;
+                }
+                if (*cp == '\n') {
+                        cp++;
+                        goto nextline;
+                }
+                if (q < &host_aliases[MAXALIASES - 1])
+                        *q++ = cp;
+                cp = strpbrk(cp, " \t");
+                if (cp != NULL)
+                        *cp++ = '\0';
+        }
+done:
+        *q = NULL;
+        *hap = NULL;
+        return (&host);
+}
+
+struct hostent *
+_yp_gethtbyaddr(addr)
+        const char *addr;
+{
+        struct hostent *hp = (struct hostent *)NULL;
+        static char *__ypcurrent;
+        int __ypcurrentlen, r;
+        char name[sizeof("xxx.xxx.xxx.xxx") + 1];
+        
+        if (!__ypdomain) {
+                if (_yp_check(&__ypdomain) == 0)
+                        return (hp);
+        }
+        sprintf(name, "%u.%u.%u.%u",
+                ((unsigned)addr[0] & 0xff),
+                ((unsigned)addr[1] & 0xff),
+                ((unsigned)addr[2] & 0xff),
+                ((unsigned)addr[3] & 0xff));
+        if (__ypcurrent)
+                free(__ypcurrent);
+        __ypcurrent = NULL;
+        r = yp_match(__ypdomain, "hosts.byaddr", name,
+                strlen(name), &__ypcurrent, &__ypcurrentlen);
+        if (r==0)
+                hp = _yphostent(__ypcurrent);
+        if (hp==NULL)
+                h_errno = HOST_NOT_FOUND;
+        return (hp);
+}
+
+struct hostent *
+_yp_gethtbyname(name)
+        const char *name;
+{
+        struct hostent *hp = (struct hostent *)NULL;
+        static char *__ypcurrent;
+        int __ypcurrentlen, r;
+
+        if (strlen(name) >= MAXHOSTNAMELEN)
+                return (NULL);
+        if (!__ypdomain) {
+                if (_yp_check(&__ypdomain) == 0)
+                        return (hp);
+        }
+        if (__ypcurrent)
+                free(__ypcurrent);
+        __ypcurrent = NULL;
+        r = yp_match(__ypdomain, "hosts.byname", name,
+                strlen(name), &__ypcurrent, &__ypcurrentlen);
+        if (r == 0)
+                hp = _yphostent(__ypcurrent);
+        if (hp == NULL)
+                h_errno = HOST_NOT_FOUND;
+        return (hp);
+}
+#endif
+
+static void
+map_v4v6_address(src, dst)
+        const char *src;
+        char *dst;
+{
+        u_char *p = (u_char *)dst;
+        char tmp[INADDRSZ];
+        int i;
+
+        /* Stash a temporary copy so our caller can update in place. */
+        bcopy(src, tmp, INADDRSZ);
+        /* Mark this ipv6 addr as a mapped ipv4. */
+        for (i = 0; i < 10; i++)
+                *p++ = 0x00;
+        *p++ = 0xff;
+        *p++ = 0xff;
+        /* Retrieve the saved copy and we're done. */
+        bcopy(tmp, (void*)p, INADDRSZ);
+}
+
+static void
+map_v4v6_hostent(hp, bpp, lenp)
+        struct hostent *hp;
+        char **bpp;
+        int *lenp;
+{
+        char **ap;
+
+        if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
+                return;
+        hp->h_addrtype = AF_INET6;
+        hp->h_length = IN6ADDRSZ;
+        for (ap = hp->h_addr_list; *ap; ap++) {
+                int i = sizeof(align) - ((u_long)*bpp % sizeof(align));
+
+                if (*lenp < (i + IN6ADDRSZ)) {
+                        /* Out of memory.  Truncate address list here.  XXX */
+                        *ap = NULL;
+                        return;
+                }
+                *bpp += i;
+                *lenp -= i;
+                map_v4v6_address(*ap, *bpp);
+                *ap = *bpp;
+                *bpp += IN6ADDRSZ;
+                *lenp -= IN6ADDRSZ;
+        }
+}
+
+struct hostent *
+gethostent()
+{
+        return (_gethtent());
+}
+
+#ifdef RESOLVSORT
+static void
+addrsort(ap, num)
+        char **ap;
+        int num;
+{
+        int i, j;
+        char **p;
+        short aval[MAXADDRS];
+        int needsort = 0;
+
+        p = ap;
+        for (i = 0; i < num; i++, p++) {
+            for (j = 0 ; (unsigned)j < _res.nsort; j++)
+                if (_res.sort_list[j].addr.s_addr == 
+                    (((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
+                        break;
+            aval[i] = j;
+            if (needsort == 0 && i > 0 && j < aval[i-1])
+                needsort = i;
+        }
+        if (!needsort)
+            return;
+
+        while (needsort < num) {
+            for (j = needsort - 1; j >= 0; j--) {
+                if (aval[j] > aval[j+1]) {
+                    char *hp;
+
+                    i = aval[j];
+                    aval[j] = aval[j+1];
+                    aval[j+1] = i;
+
+                    hp = ap[j];
+                    ap[j] = ap[j+1];
+                    ap[j+1] = hp;
+
+                } else
+                    break;
+            }
+            needsort++;
+        }
+}
+#endif
diff --git a/src/lib/libc/net/getnetbyaddr.c b/src/lib/libc/net/getnetbyaddr.c
new file mode 100644
index 0000000000..925d1d5895
--- /dev/null
+++ b/src/lib/libc/net/getnetbyaddr.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getnetbyaddr.c,v 1.5 1997/07/09 01:08:28 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <netdb.h>
+
+extern int _net_stayopen;
+
+struct netent *
+_getnetbyaddr(net, type)
+        register in_addr_t net;
+        register int type;
+{
+        register struct netent *p;
+
+        setnetent(_net_stayopen);
+        while ((p = getnetent()))
+                if (p->n_addrtype == type && p->n_net == net)
+                        break;
+        if (!_net_stayopen)
+                endnetent();
+        return (p);
+}
diff --git a/src/lib/libc/net/getnetbyname.c b/src/lib/libc/net/getnetbyname.c
new file mode 100644
index 0000000000..4e39cf6860
--- /dev/null
+++ b/src/lib/libc/net/getnetbyname.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getnetbyname.c,v 1.5 1997/07/09 01:08:29 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <netdb.h>
+#include <string.h>
+
+extern int _net_stayopen;
+
+struct netent *
+_getnetbyname(name)
+        register const char *name;
+{
+        register struct netent *p;
+        register char **cp;
+
+        setnetent(_net_stayopen);
+        while ((p = getnetent())) {
+                if (strcasecmp(p->n_name, name) == 0)
+                        break;
+                for (cp = p->n_aliases; *cp != 0; cp++)
+                        if (strcasecmp(*cp, name) == 0)
+                                goto found;
+        }
+found:
+        if (!_net_stayopen)
+                endnetent();
+        return (p);
+}
diff --git a/src/lib/libc/net/getnetent.3 b/src/lib/libc/net/getnetent.3
new file mode 100644
index 0000000000..5864b75839
--- /dev/null
+++ b/src/lib/libc/net/getnetent.3
@@ -0,0 +1,148 @@
+.\"     $OpenBSD: getnetent.3,v 1.5 1998/03/16 05:06:56 millert Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd March 13, 1997
+.Dt GETNETENT 3
+.Os
+.Sh NAME
+.Nm getnetent ,
+.Nm getnetbyaddr ,
+.Nm getnetbyname ,
+.Nm setnetent ,
+.Nm endnetent
+.Nd get network entry
+.Sh SYNOPSIS
+.Fd #include <netdb.h>
+.Ft struct netent *
+.Fn getnetent 
+.Ft struct netent *
+.Fn getnetbyname "char *name"
+.Ft struct netent *
+.Fn getnetbyaddr "in_addr_t net" "int type"
+.Fn setnetent "int stayopen"
+.Fn endnetent 
+.Sh DESCRIPTION
+The
+.Fn getnetent ,
+.Fn getnetbyname ,
+and
+.Fn getnetbyaddr
+functions
+each return a pointer to an object with the
+following structure
+containing the broken-out
+fields of a line in the network data base,
+.Pa /etc/networks .
+.Bd -literal -offset indent
+struct  netent {
+        char            *n_name;        /* official name of net */
+        char            **n_aliases;    /* alias list */
+        int             n_addrtype;     /* net number type */
+        in_addr_t       n_net;          /* net number */
+};
+.Ed
+.Pp
+The members of this structure are:
+.Bl -tag -width n_addrtype
+.It Fa n_name
+The official name of the network.
+.It Fa n_aliases
+A zero terminated list of alternate names for the network.
+.It Fa n_addrtype
+The type of the network number returned; currently only AF_INET.
+.It Fa n_net
+The network number.  Network numbers are returned in machine byte
+order.
+.El
+.Pp
+The
+.Fn getnetent
+function
+reads the next line of the file, opening the file if necessary.
+.Pp
+The
+.Fn setnetent
+function
+opens and rewinds the file.  If the
+.Fa stayopen
+flag is non-zero,
+the net data base will not be closed after each call to 
+.Fn getnetbyname
+or
+.Fn getnetbyaddr .
+.Pp
+The
+.Fn endnetent
+function
+closes the file.
+.Pp
+The
+.Fn getnetbyname
+function
+and
+.Fn getnetbyaddr
+search the domain name server if the system is configured to use one.
+If the search fails, or no name server is configured, they sequentially
+search from the beginning of the file until a matching net name or
+net address and type is found, or until
+.Dv EOF
+is encountered.
+Network numbers are supplied in host order.
+.Sh FILES
+.Bl -tag -width /etc/networks -compact
+.It Pa /etc/networks
+.El
+.Sh DIAGNOSTICS
+Null pointer
+(0) returned on
+.Dv EOF
+or error.
+.Sh SEE ALSO
+.Xr networks 5 ,
+.Xr resolver 3
+.Sh HISTORY
+The
+.Fn getnetent ,
+.Fn getnetbyaddr ,
+.Fn getnetbyname ,
+.Fn setnetent ,
+and
+.Fn endnetent
+functions appeared in 
+.Bx 4.2 .
+.Sh BUGS
+The data space used by these functions is static; if future use
+requires the data, it should be copied before any subsequent calls
+to these functions overwrite it.  Only Internet network numbers
+are currently understood.  Expecting network numbers to fit in no
+more than 32 bits is naive.
diff --git a/src/lib/libc/net/getnetent.c b/src/lib/libc/net/getnetent.c
new file mode 100644
index 0000000000..8f618a1d5e
--- /dev/null
+++ b/src/lib/libc/net/getnetent.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getnetent.c,v 1.8 1998/03/16 05:06:57 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+
+#define MAXALIASES      35
+
+static FILE *netf;
+static char line[BUFSIZ+1];
+static struct netent net;
+static char *net_aliases[MAXALIASES];
+int _net_stayopen;
+
+void
+setnetent(f)
+        int f;
+{
+        if (netf == NULL)
+                netf = fopen(_PATH_NETWORKS, "r" );
+        else
+                rewind(netf);
+        _net_stayopen |= f;
+}
+
+void
+endnetent()
+{
+        if (netf) {
+                fclose(netf);
+                netf = NULL;
+        }
+        _net_stayopen = 0;
+}
+
+struct netent *
+getnetent()
+{
+        char *p, *cp, **q;
+        size_t len;
+
+        if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
+                return (NULL);
+again:
+        if ((p = fgetln(netf, &len)) == NULL)
+                return (NULL);
+        if (p[len-1] == '\n')
+                len--;
+        if (len >= sizeof(line) || len == 0)
+                goto again;
+        p = memcpy(line, p, len);
+        line[len] = '\0';
+        if (*p == '#')
+                goto again;
+        if ((cp = strchr(p, '#')) != NULL)
+                *cp = '\0';
+        net.n_name = p;
+        if (strlen(net.n_name) >= MAXHOSTNAMELEN-1)
+                net.n_name[MAXHOSTNAMELEN-1] = '\0';
+        cp = strpbrk(p, " \t");
+        if (cp == NULL)
+                goto again;
+        *cp++ = '\0';
+        while (*cp == ' ' || *cp == '\t')
+                cp++;
+        p = strpbrk(cp, " \t");
+        if (p != NULL)
+                *p++ = '\0';
+        net.n_net = inet_network(cp);
+        net.n_addrtype = AF_INET;
+        q = net.n_aliases = net_aliases;
+        if (p != NULL) 
+                cp = p;
+        while (cp && *cp) {
+                if (*cp == ' ' || *cp == '\t') {
+                        cp++;
+                        continue;
+                }
+                if (q < &net_aliases[MAXALIASES - 1]) {
+                        *q++ = cp;
+                        if (strlen(cp) >= MAXHOSTNAMELEN-1)
+                                cp[MAXHOSTNAMELEN-1] = '\0';
+                }
+                cp = strpbrk(cp, " \t");
+                if (cp != NULL)
+                        *cp++ = '\0';
+        }
+        *q = NULL;
+        return (&net);
+}
diff --git a/src/lib/libc/net/getnetnamadr.c b/src/lib/libc/net/getnetnamadr.c
new file mode 100644
index 0000000000..de208bbac9
--- /dev/null
+++ b/src/lib/libc/net/getnetnamadr.c
@@ -0,0 +1,382 @@
+/*      $OpenBSD: getnetnamadr.c,v 1.10 1997/12/02 01:34:05 deraadt Exp $       */
+
+/*
+ * Copyright (c) 1997, Jason Downs.  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 Jason Downs for the
+ *      OpenBSD system.
+ * 4. Neither the name(s) of the author(s) nor the name OpenBSD
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
+ *      Dep. Matematica Universidade de Coimbra, Portugal, Europe
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)getnetbyaddr.c      8.1 (Berkeley) 6/4/93";
+static char sccsid_[] = "from getnetnamadr.c    1.4 (Coimbra) 93/06/03";
+static char rcsid[] = "$From: getnetnamadr.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.10 1997/12/02 01:34:05 deraadt Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <netdb.h>
+#include <resolv.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+extern int h_errno;
+
+struct netent *_getnetbyaddr __P((in_addr_t net, int type));
+struct netent *_getnetbyname __P((const char *name));
+
+int _hokchar __P((const char *));
+
+#define BYADDR 0
+#define BYNAME 1
+#define MAXALIASES      35
+
+#if PACKETSZ > 1024
+#define MAXPACKET       PACKETSZ
+#else
+#define MAXPACKET       1024
+#endif
+
+typedef union {
+        HEADER  hdr;
+        u_char  buf[MAXPACKET];
+} querybuf;
+
+typedef union {
+        long    al;
+        char    ac;
+} align;
+
+static struct netent *
+getnetanswer(answer, anslen, net_i)
+        querybuf *answer;
+        int anslen;
+        int net_i;
+{
+
+        register HEADER *hp;
+        register u_char *cp;
+        register int n;
+        u_char *eom;
+        int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
+        char aux1[MAXHOSTNAMELEN], aux2[MAXHOSTNAMELEN], ans[MAXHOSTNAMELEN];
+        char *in, *st, *pauxt, *bp, **ap;
+        char *paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
+        static  struct netent net_entry;
+        static  char *net_aliases[MAXALIASES], netbuf[BUFSIZ+1];
+
+        /*
+         * find first satisfactory answer
+         *
+         *      answer --> +------------+  ( MESSAGE )
+         *                 |   Header   |
+         *                 +------------+
+         *                 |  Question  | the question for the name server
+         *                 +------------+
+         *                 |   Answer   | RRs answering the question
+         *                 +------------+
+         *                 | Authority  | RRs pointing toward an authority
+         *                 | Additional | RRs holding additional information
+         *                 +------------+
+         */
+        eom = answer->buf + anslen;
+        hp = &answer->hdr;
+        ancount = ntohs(hp->ancount); /* #/records in the answer section */
+        qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
+        bp = netbuf;
+        buflen = sizeof(netbuf);
+        cp = answer->buf + HFIXEDSZ;
+        if (!qdcount) {
+                if (hp->aa)
+                        h_errno = HOST_NOT_FOUND;
+                else
+                        h_errno = TRY_AGAIN;
+                return (NULL);
+        }
+        while (qdcount-- > 0)
+                cp += __dn_skipname(cp, eom) + QFIXEDSZ;
+        ap = net_aliases;
+        *ap = NULL;
+        net_entry.n_aliases = net_aliases;
+        haveanswer = 0;
+        while (--ancount >= 0 && cp < eom) {
+                n = dn_expand(answer->buf, eom, cp, bp, buflen);
+#ifdef USE_RESOLV_NAME_OK
+                if ((n < 0) || !res_dnok(bp))
+#else
+                if ((n < 0) || !_hokchar(bp))
+#endif
+                        break;
+                cp += n;
+                ans[0] = '\0';
+                (void)strncpy(&ans[0], bp, sizeof ans-1);
+                ans[sizeof ans-1] = '\0';
+                GETSHORT(type, cp);
+                GETSHORT(class, cp);
+                cp += INT32SZ;          /* TTL */
+                GETSHORT(n, cp);
+                if (class == C_IN && type == T_PTR) {
+                        n = dn_expand(answer->buf, eom, cp, bp, buflen);
+                        if ((n < 0) || !res_hnok(bp)) {
+                                cp += n;
+                                return (NULL);
+                        }
+                        cp += n; 
+                        *ap++ = bp;
+                        bp += strlen(bp) + 1;
+                        net_entry.n_addrtype =
+                                (class == C_IN) ? AF_INET : AF_UNSPEC;
+                        haveanswer++;
+                }
+        }
+        if (haveanswer) {
+                *ap = NULL;
+                switch (net_i) {
+                case BYADDR:
+                        net_entry.n_name = *net_entry.n_aliases;
+                        net_entry.n_net = 0L;
+                        break;
+                case BYNAME:
+                        in = *net_entry.n_aliases;
+                        net_entry.n_name = &ans[0];
+                        aux2[0] = '\0';
+                        for (i = 0; i < 4; i++) {
+                                for (st = in, nchar = 0;
+                                     *st != '.';
+                                     st++, nchar++)
+                                        ;
+                                if (nchar != 1 || *in != '0' || flag) {
+                                        flag = 1;
+                                        (void)strncpy(paux1,
+                                                      (i==0) ? in : in-1,
+                                                      (i==0) ?nchar : nchar+1);
+                                        paux1[(i==0) ? nchar : nchar+1] = '\0';
+                                        pauxt = paux2;
+                                        paux2 = strcat(paux1, paux2);
+                                        paux1 = pauxt;
+                                }
+                                in = ++st;
+                        }                 
+                        net_entry.n_net = inet_network(paux2);
+                        break;
+                }
+                net_entry.n_aliases++;
+                return (&net_entry);
+        }
+        h_errno = TRY_AGAIN;
+        return (NULL);
+}
+
+struct netent *
+getnetbyaddr(net, net_type)
+        register in_addr_t net;
+        register int net_type;
+{
+        unsigned int netbr[4];
+        int nn, anslen;
+        querybuf buf;
+        char qbuf[MAXDNAME];
+        in_addr_t net2;
+        struct netent *net_entry = NULL;
+        char lookups[MAXDNSLUS];
+        int i;
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+                return(_getnetbyaddr(net, net_type));
+
+        bcopy(_res.lookups, lookups, sizeof lookups);
+        if (lookups[0] == '\0')
+                strncpy(lookups, "bf", sizeof lookups);
+
+        for (i = 0; i < MAXDNSLUS && lookups[i]; i++) {
+                switch (lookups[i]) {
+#ifdef YP
+                case 'y':
+                        /* There is no YP support. */
+                        break;
+#endif  /* YP */
+                case 'b':
+                        if (net_type != AF_INET)
+                                break;  /* DNS only supports AF_INET? */
+
+                        for (nn = 4, net2 = net; net2; net2 >>= 8)
+                                netbr[--nn] = net2 & 0xff;
+                        switch (nn) {
+                        case 3:         /* Class A */
+                                snprintf(qbuf, sizeof(qbuf),
+                                    "0.0.0.%u.in-addr.arpa", netbr[3]);
+                                break;
+                        case 2:         /* Class B */
+                                snprintf(qbuf, sizeof(qbuf),
+                                    "0.0.%u.%u.in-addr.arpa",
+                                    netbr[3], netbr[2]);
+                                break;
+                        case 1:         /* Class C */
+                                snprintf(qbuf, sizeof(qbuf),
+                                    "0.%u.%u.%u.in-addr.arpa",
+                                    netbr[3], netbr[2], netbr[1]);
+                                break;
+                        case 0:         /* Class D - E */
+                                snprintf(qbuf, sizeof(qbuf),
+                                    "%u.%u.%u.%u.in-addr.arpa",
+                                    netbr[3], netbr[2], netbr[1], netbr[0]);
+                                break;
+                        }
+                        anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf,
+                            sizeof(buf));
+                        if (anslen < 0) {
+#ifdef DEBUG
+                                if (_res.options & RES_DEBUG)
+                                        printf("res_query failed\n");
+#endif
+                                break;
+                        }
+                        net_entry = getnetanswer(&buf, anslen, BYADDR);
+                        if (net_entry != NULL) {
+                                unsigned u_net = net;   /* maybe net should be unsigned ? */
+
+                                /* Strip trailing zeros */
+                                while ((u_net & 0xff) == 0 && u_net != 0)
+                                        u_net >>= 8;
+                                net_entry->n_net = u_net;
+                                return (net_entry);
+                        }
+                        break;
+                case 'f':
+                        net_entry = _getnetbyaddr(net, net_type);
+                        if (net_entry != NULL)
+                                return (net_entry);
+                }
+        }
+
+        /* Nothing matched. */
+        return (NULL);
+}
+
+struct netent *
+getnetbyname(net)
+        register const char *net;
+{
+        int anslen;
+        querybuf buf;
+        char qbuf[MAXDNAME];
+        struct netent *net_entry = NULL;
+        char lookups[MAXDNSLUS];
+        int i;
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+                return (_getnetbyname(net));
+
+        bcopy(_res.lookups, lookups, sizeof lookups);
+        if (lookups[0] == '\0')
+                strncpy(lookups, "bf", sizeof lookups);
+
+        for (i = 0; i < MAXDNSLUS && lookups[i]; i++) {
+                switch (lookups[i]) {
+#ifdef YP
+                case 'y':
+                        /* There is no YP support. */
+                        break;
+#endif  /* YP */
+                case 'b':
+                        strncpy(qbuf, net, sizeof qbuf-1);
+                        qbuf[sizeof qbuf-1] = '\0';
+                        anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf,
+                            sizeof(buf));
+                        if (anslen < 0) {
+#ifdef DEBUG
+                                if (_res.options & RES_DEBUG)
+                                        printf("res_query failed\n");
+#endif
+                                break;
+                        }
+                        net_entry = getnetanswer(&buf, anslen, BYNAME);
+                        if (net_entry != NULL)
+                                return (net_entry);
+                        break;
+                case 'f':
+                        net_entry = _getnetbyname(net);
+                        if (net_entry != NULL)
+                                return (net_entry);
+                        break;
+                }
+        }
+
+        /* Nothing matched. */
+        return (NULL);
+}
diff --git a/src/lib/libc/net/getproto.c b/src/lib/libc/net/getproto.c
new file mode 100644
index 0000000000..474d8d9427
--- /dev/null
+++ b/src/lib/libc/net/getproto.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getproto.c,v 1.3 1997/07/09 01:08:31 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <netdb.h>
+
+extern int _proto_stayopen;
+
+struct protoent *
+getprotobynumber(proto)
+        register int proto;
+{
+        register struct protoent *p;
+
+        setprotoent(_proto_stayopen);
+        while ((p = getprotoent()))
+                if (p->p_proto == proto)
+                        break;
+        if (!_proto_stayopen)
+                endprotoent();
+        return (p);
+}
diff --git a/src/lib/libc/net/getprotoent.3 b/src/lib/libc/net/getprotoent.3
new file mode 100644
index 0000000000..f67987954f
--- /dev/null
+++ b/src/lib/libc/net/getprotoent.3
@@ -0,0 +1,144 @@
+.\"     $OpenBSD: getprotoent.3,v 1.2 1996/08/19 08:28:50 tholo Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt GETPROTOENT 3
+.Os BSD 4.2
+.Sh NAME
+.Nm getprotoent ,
+.Nm getprotobynumber ,
+.Nm getprotobyname ,
+.Nm setprotoent ,
+.Nm endprotoent
+.Nd get protocol entry
+.Sh SYNOPSIS
+.Fd #include <netdb.h>
+.Ft struct protoent *
+.Fn getprotoent 
+.Ft struct protoent *
+.Fn getprotobyname "char *name"
+.Ft struct protoent *
+.Fn getprotobynumber "int proto"
+.Fn setprotoent "int stayopen"
+.Fn endprotoent 
+.Sh DESCRIPTION
+The
+.Fn getprotoent ,
+.Fn getprotobyname ,
+and
+.Fn getprotobynumber
+functions
+each return a pointer to an object with the
+following structure
+containing the broken-out
+fields of a line in the network protocol data base,
+.Pa /etc/protocols .
+.Bd -literal -offset indent
+.Pp
+struct  protoent {
+        char    *p_name;        /* official name of protocol */
+        char    **p_aliases;    /* alias list */
+        int     p_proto;        /* protocol number */
+};
+.Ed
+.Pp
+The members of this structure are:
+.Bl -tag -width p_aliases
+.It Fa p_name
+The official name of the protocol.
+.It Fa p_aliases
+A zero terminated list of alternate names for the protocol.
+.It Fa p_proto
+The protocol number.
+.El
+.Pp
+The
+.Fn getprotoent
+function
+reads the next line of the file, opening the file if necessary.
+.Pp
+The
+.Fn setprotoent
+function
+opens and rewinds the file.  If the
+.Fa stayopen
+flag is non-zero,
+the net data base will not be closed after each call to 
+.Fn getprotobyname
+or
+.Fn getprotobynumber .
+.Pp
+The
+.Fn endprotoent
+function
+closes the file.
+.Pp
+The
+.Fn getprotobyname
+function
+and
+.Fn getprotobynumber
+sequentially search from the beginning
+of the file until a matching
+protocol name or
+protocol number is found,
+or until
+.Dv EOF
+is encountered.
+.Sh RETURN VALUES
+Null pointer
+(0) returned on
+.Dv EOF
+or error.
+.Sh FILES
+.Bl -tag -width /etc/protocols -compact
+.It Pa /etc/protocols
+.El
+.Sh SEE ALSO
+.Xr protocols 5
+.Sh HISTORY
+The
+.Fn getprotoent ,
+.Fn getprotobynumber ,
+.Fn getprotobyname ,
+.Fn setprotoent ,
+and
+.Fn endprotoent
+functions appeared in 
+.Bx 4.2 .
+.Sh BUGS
+These functions use a static data space;
+if the data is needed for future use, it should be
+copied before any subsequent calls overwrite it.
+Only the Internet
+protocols are currently understood.
diff --git a/src/lib/libc/net/getprotoent.c b/src/lib/libc/net/getprotoent.c
new file mode 100644
index 0000000000..2bef526e7a
--- /dev/null
+++ b/src/lib/libc/net/getprotoent.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getprotoent.c,v 1.3 1998/03/16 05:06:59 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MAXALIASES      35
+
+static FILE *protof = NULL;
+static char line[BUFSIZ+1];
+static struct protoent proto;
+static char *proto_aliases[MAXALIASES];
+int _proto_stayopen;
+
+void
+setprotoent(f)
+        int f;
+{
+        if (protof == NULL)
+                protof = fopen(_PATH_PROTOCOLS, "r" );
+        else
+                rewind(protof);
+        _proto_stayopen |= f;
+}
+
+void
+endprotoent()
+{
+        if (protof) {
+                fclose(protof);
+                protof = NULL;
+        }
+        _proto_stayopen = 0;
+}
+
+struct protoent *
+getprotoent()
+{
+        char *p, *cp, **q;
+        size_t len;
+
+        if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
+                return (NULL);
+again:
+        if ((p = fgetln(protof, &len)) == NULL)
+                return (NULL);
+        if (p[len-1] == '\n')
+                len--;
+        if (len >= sizeof(line) || len == 0)
+                goto again;
+        p = memcpy(line, p, len);
+        line[len] = '\0';
+        if (*p == '#')
+                goto again;
+        if ((cp = strchr(p, '#')) != NULL)
+                *cp = '\0';
+        proto.p_name = p;
+        cp = strpbrk(p, " \t");
+        if (cp == NULL)
+                goto again;
+        *cp++ = '\0';
+        while (*cp == ' ' || *cp == '\t')
+                cp++;
+        p = strpbrk(cp, " \t");
+        if (p != NULL)
+                *p++ = '\0';
+        proto.p_proto = atoi(cp);
+        q = proto.p_aliases = proto_aliases;
+        if (p != NULL) {
+                cp = p;
+                while (cp && *cp) {
+                        if (*cp == ' ' || *cp == '\t') {
+                                cp++;
+                                continue;
+                        }
+                        if (q < &proto_aliases[MAXALIASES - 1])
+                                *q++ = cp;
+                        cp = strpbrk(cp, " \t");
+                        if (cp != NULL)
+                                *cp++ = '\0';
+                }
+        }
+        *q = NULL;
+        return (&proto);
+}
diff --git a/src/lib/libc/net/getprotoname.c b/src/lib/libc/net/getprotoname.c
new file mode 100644
index 0000000000..7a4e5fede5
--- /dev/null
+++ b/src/lib/libc/net/getprotoname.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getprotoname.c,v 1.3 1997/07/09 01:08:32 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <netdb.h>
+#include <string.h>
+
+extern int _proto_stayopen;
+
+struct protoent *
+getprotobyname(name)
+        register const char *name;
+{
+        register struct protoent *p;
+        register char **cp;
+
+        setprotoent(_proto_stayopen);
+        while ((p = getprotoent())) {
+                if (strcmp(p->p_name, name) == 0)
+                        break;
+                for (cp = p->p_aliases; *cp != 0; cp++)
+                        if (strcmp(*cp, name) == 0)
+                                goto found;
+        }
+found:
+        if (!_proto_stayopen)
+                endprotoent();
+        return (p);
+}
diff --git a/src/lib/libc/net/getservbyname.c b/src/lib/libc/net/getservbyname.c
new file mode 100644
index 0000000000..7375c89404
--- /dev/null
+++ b/src/lib/libc/net/getservbyname.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.4 1998/11/20 11:18:44 d Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <netdb.h>
+#include <string.h>
+#include "thread_private.h"
+
+extern int _serv_stayopen;
+
+_THREAD_PRIVATE_MUTEX(getservbyname_r)
+
+struct servent *
+getservbyname_r(name, proto, se, buf, buflen)
+        const char *name, *proto;
+        struct servent *se;
+        char *buf;
+        int buflen;
+{
+        register struct servent *p;
+        register char **cp;
+
+        _THREAD_PRIVATE_MUTEX_LOCK(getservbyname_r);
+        setservent(_serv_stayopen);
+        while ((p = getservent())) {
+                if (strcmp(name, p->s_name) == 0)
+                        goto gotname;
+                for (cp = p->s_aliases; *cp; cp++)
+                        if (strcmp(name, *cp) == 0)
+                                goto gotname;
+                continue;
+gotname:
+                if (proto == 0 || strcmp(p->s_proto, proto) == 0)
+                        break;
+        }
+        if (!_serv_stayopen)
+                endservent();
+        _THREAD_PRIVATE_MUTEX_UNLOCK(getservbyname_r);
+        return (p);
+}
+
+struct servent *getservbyname(name, proto)
+        const char *name, *proto;
+{
+        _THREAD_PRIVATE_KEY(getservbyname)
+        static char buf[4096];
+        char *bufp = (char*)_THREAD_PRIVATE(getservbyname, buf, NULL);
+
+        if (bufp == NULL)
+                return (NULL);
+        return getservbyname_r(name, proto, (struct servent*) bufp, 
+                bufp + sizeof(struct servent), 
+                sizeof buf - sizeof(struct servent) );
+}
diff --git a/src/lib/libc/net/getservbyport.c b/src/lib/libc/net/getservbyport.c
new file mode 100644
index 0000000000..4b063760d2
--- /dev/null
+++ b/src/lib/libc/net/getservbyport.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getservbyport.c,v 1.3 1997/07/09 01:08:35 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <netdb.h>
+#include <string.h>
+
+extern int _serv_stayopen;
+
+struct servent *
+getservbyport(port, proto)
+        int port;
+        const char *proto;
+{
+        register struct servent *p;
+
+        setservent(_serv_stayopen);
+        while ((p = getservent())) {
+                if (p->s_port != port)
+                        continue;
+                if (proto == 0 || strcmp(p->s_proto, proto) == 0)
+                        break;
+        }
+        if (!_serv_stayopen)
+                endservent();
+        return (p);
+}
diff --git a/src/lib/libc/net/getservent.3 b/src/lib/libc/net/getservent.3
new file mode 100644
index 0000000000..3bbcc38a6b
--- /dev/null
+++ b/src/lib/libc/net/getservent.3
@@ -0,0 +1,155 @@
+.\"     $OpenBSD: getservent.3,v 1.4 1999/03/02 03:47:46 deraadt Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd January 12, 1994
+.Dt GETSERVENT 3
+.Os BSD 4.2
+.Sh NAME
+.Nm getservent ,
+.Nm getservbyport ,
+.Nm getservbyname ,
+.Nm setservent ,
+.Nm endservent
+.Nd get service entry
+.Sh SYNOPSIS
+.Fd #include <netdb.h>
+.Ft struct servent *
+.Fn getservent 
+.Ft struct servent *
+.Fn getservbyname "char *name" "char *proto"
+.Ft struct servent *
+.Fn getservbyport "int port" "char *proto"
+.Ft void
+.Fn setservent "int stayopen"
+.Ft void
+.Fn endservent void
+.Sh DESCRIPTION
+The
+.Fn getservent ,
+.Fn getservbyname ,
+and
+.Fn getservbyport
+functions
+each return a pointer to an object with the
+following structure
+containing the broken-out
+fields of a line in the network services data base,
+.Pa /etc/services .
+.Bd -literal -offset indent
+struct  servent {
+        char    *s_name;        /* official name of service */
+        char    **s_aliases;    /* alias list */
+        int     s_port;         /* port service resides at */
+        char    *s_proto;       /* protocol to use */
+};
+.Ed
+.Pp
+The members of this structure are:
+.Bl -tag -width s_aliases
+.It Fa s_name
+The official name of the service.
+.It Fa s_aliases
+A zero terminated list of alternate names for the service.
+.It Fa s_port
+The port number at which the service resides.
+Port numbers are returned in network byte order.
+.It Fa s_proto
+The name of the protocol to use when contacting the
+service.
+.El
+.Pp
+The
+.Fn getservent
+function
+reads the next line of the file, opening the file if necessary.
+.Pp
+The
+.Fn setservent
+function
+opens and rewinds the file.  If the
+.Fa stayopen
+flag is non-zero,
+the net data base will not be closed after each call to 
+.Fn getservbyname
+or
+.Fn getservbyport .
+.Pp
+The
+.Fn endservent
+function
+closes the file.
+.Pp
+The
+.Fn getservbyname
+and
+.Fn getservbyport
+functions
+sequentially search from the beginning
+of the file until a matching
+protocol name or
+port number (specified in network byte order) is found,
+or until
+.Dv EOF
+is encountered.
+If a protocol name is also supplied (non-
+.Dv NULL ) , 
+searches must also match the protocol.
+.ne 1i
+.Sh FILES
+.Bl -tag -width /etc/services -compact
+.It Pa /etc/services
+.El
+.Sh DIAGNOSTICS
+Null pointer
+(0) returned on
+.Dv EOF
+or error.
+.Sh SEE ALSO
+.Xr getprotoent 3 ,
+.Xr services 5
+.Sh HISTORY
+The
+.Fn getservent ,
+.Fn getservbyport ,
+.Fn getservbyname ,
+.Fn setservent ,
+and
+.Fn endservent
+functions appeared in 
+.Bx 4.2 .
+.Sh BUGS
+These functions use static data storage;
+if the data is needed for future use, it should be
+copied before any subsequent calls overwrite it.
+Expecting port numbers to fit in a 32 bit
+quantity is probably naive.
diff --git a/src/lib/libc/net/getservent.c b/src/lib/libc/net/getservent.c
new file mode 100644
index 0000000000..7d8cb6d8ca
--- /dev/null
+++ b/src/lib/libc/net/getservent.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: getservent.c,v 1.4 1998/03/16 05:07:00 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define MAXALIASES      35
+
+static FILE *servf = NULL;
+static char line[BUFSIZ+1];
+static struct servent serv;
+static char *serv_aliases[MAXALIASES];
+int _serv_stayopen;
+
+void
+setservent(f)
+        int f;
+{
+        if (servf == NULL)
+                servf = fopen(_PATH_SERVICES, "r" );
+        else
+                rewind(servf);
+        _serv_stayopen |= f;
+}
+
+void
+endservent()
+{
+        if (servf) {
+                fclose(servf);
+                servf = NULL;
+        }
+        _serv_stayopen = 0;
+}
+
+struct servent *
+getservent()
+{
+        char *p, *cp, **q;
+        size_t len;
+
+        if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
+                return (NULL);
+again:
+        if ((p = fgetln(servf, &len)) == NULL)
+                return (NULL);
+        if (p[len-1] == '\n')
+                len--;
+        if (len >= sizeof(line) || len == 0)
+                goto again;
+        p = memcpy(line, p, len);
+        line[len] = '\0';
+        if (*p == '#')
+                goto again;
+        if ((cp = strchr(p, '#')) != NULL)
+                *cp = '\0';
+        serv.s_name = p;
+        p = strpbrk(p, " \t");
+        if (p == NULL)
+                goto again;
+        *p++ = '\0';
+        while (*p == ' ' || *p == '\t')
+                p++;
+        cp = strpbrk(p, ",/");
+        if (cp == NULL)
+                goto again;
+        *cp++ = '\0';
+        serv.s_port = htons((in_port_t)atoi(p));
+        serv.s_proto = cp;
+        q = serv.s_aliases = serv_aliases;
+        cp = strpbrk(cp, " \t");
+        if (cp != NULL)
+                *cp++ = '\0';
+        while (cp && *cp) {
+                if (*cp == ' ' || *cp == '\t') {
+                        cp++;
+                        continue;
+                }
+                if (q < &serv_aliases[MAXALIASES - 1])
+                        *q++ = cp;
+                cp = strpbrk(cp, " \t");
+                if (cp != NULL)
+                        *cp++ = '\0';
+        }
+        *q = NULL;
+        return (&serv);
+}
diff --git a/src/lib/libc/net/herror.c b/src/lib/libc/net/herror.c
new file mode 100644
index 0000000000..737bb115a7
--- /dev/null
+++ b/src/lib/libc/net/herror.c
@@ -0,0 +1,121 @@
+/*      $OpenBSD: herror.c,v 1.4 1997/03/13 19:07:28 downsj Exp $       */
+
+/*
+ * ++Copyright++ 1987, 1993
+ * -
+ * Copyright (c) 1987, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)herror.c    8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$From: herror.c,v 8.3 1996/08/05 08:31:35 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: herror.c,v 1.4 1997/03/13 19:07:28 downsj Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/uio.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <string.h>
+
+const char *h_errlist[] = {
+        "Resolver Error 0 (no error)",
+        "Unknown host",                         /* 1 HOST_NOT_FOUND */
+        "Host name lookup failure",             /* 2 TRY_AGAIN */
+        "Unknown server error",                 /* 3 NO_RECOVERY */
+        "No address associated with name",      /* 4 NO_ADDRESS */
+};
+int     h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
+
+extern int      h_errno;
+
+/*
+ * herror --
+ *      print the error indicated by the h_errno value.
+ */
+void
+herror(s)
+        const char *s;
+{
+        struct iovec iov[4];
+        register struct iovec *v = iov;
+
+        if (s && *s) {
+                v->iov_base = (char *)s;
+                v->iov_len = strlen(s);
+                v++;
+                v->iov_base = ": ";
+                v->iov_len = 2;
+                v++;
+        }
+        v->iov_base = (char *)hstrerror(h_errno);
+        v->iov_len = strlen(v->iov_base);
+        v++;
+        v->iov_base = "\n";
+        v->iov_len = 1;
+        writev(STDERR_FILENO, iov, (v - iov) + 1);
+}
+
+const char *
+hstrerror(err)
+        int err;
+{
+        if (err < 0)
+                return ("Resolver internal error");
+        else if (err < h_nerr)
+                return (h_errlist[err]);
+        return ("Unknown resolver error");
+}
diff --git a/src/lib/libc/net/htonl.c b/src/lib/libc/net/htonl.c
new file mode 100644
index 0000000000..73b7432731
--- /dev/null
+++ b/src/lib/libc/net/htonl.c
@@ -0,0 +1,25 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: htonl.c,v 1.4 1996/12/12 03:19:55 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <machine/endian.h>
+
+#undef htonl
+
+u_int32_t
+htonl(x)
+        u_int32_t x;
+{
+#if BYTE_ORDER == LITTLE_ENDIAN
+        u_char *s = (u_char *)&x;
+        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
+#else
+        return x;
+#endif
+}
diff --git a/src/lib/libc/net/htons.c b/src/lib/libc/net/htons.c
new file mode 100644
index 0000000000..47cf25952d
--- /dev/null
+++ b/src/lib/libc/net/htons.c
@@ -0,0 +1,29 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: htons.c,v 1.6 1997/07/25 20:30:07 mickey Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <machine/endian.h>
+
+#undef htons
+
+u_int16_t
+#ifdef __STDC__
+htons(u_int16_t x)
+#else
+htons(x)
+        u_int16_t x;
+#endif
+{
+#if BYTE_ORDER == LITTLE_ENDIAN
+        u_char *s = (u_char *) &x;
+        return (u_int16_t)(s[0] << 8 | s[1]);
+#else
+        return x;
+#endif
+}
diff --git a/src/lib/libc/net/inet.3 b/src/lib/libc/net/inet.3
new file mode 100644
index 0000000000..2fb86cd927
--- /dev/null
+++ b/src/lib/libc/net/inet.3
@@ -0,0 +1,319 @@
+.\"     $OpenBSD: inet.3,v 1.4 1997/06/23 04:01:11 millert Exp $
+.\"     $NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $
+.\"
+.\" Copyright (c) 1983, 1990, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)inet.3      8.1 (Berkeley) 6/4/93
+.\"
+.Dd June 18, 1997
+.Dt INET 3
+.Os BSD 4.2
+.Sh NAME
+.Nm inet_addr ,
+.Nm inet_aton ,
+.Nm inet_lnaof ,
+.Nm inet_makeaddr ,
+.Nm inet_netof ,
+.Nm inet_network ,
+.Nm inet_ntoa ,
+.Nm inet_ntop ,
+.Nm inet_pton
+.Nd Internet address manipulation routines
+.Sh SYNOPSIS
+.Fd #include <sys/socket.h>
+.Fd #include <netinet/in.h>
+.Fd #include <arpa/inet.h>
+.Ft in_addr_t
+.Fn inet_addr "const char *cp"
+.Ft int
+.Fn inet_aton "const char *cp" "struct in_addr *addr"
+.Ft in_addr_t
+.Fn inet_lnaof "struct in_addr in"
+.Ft struct in_addr
+.Fn inet_makeaddr "unsigned long net" "unsigned long lna"
+.Ft in_addr_t
+.Fn inet_netof "struct in_addr in"
+.Ft in_addr_t
+.Fn inet_network "const char *cp"
+.Ft char *
+.Fn inet_ntoa "struct in_addr in"
+.Ft const char *
+.Fn inet_ntop "int af" "const void *src" "char *dst" "size_t size"
+.Ft int
+.Fn inet_pton "int af" "const char *src" "void *dst"
+.Sh DESCRIPTION
+The routines
+.Fn inet_aton ,
+.Fn inet_addr
+and
+.Fn inet_network
+interpret character strings representing
+numbers expressed in the Internet standard
+.Ql \&.
+notation.
+The
+.Fn inet_pton
+function converts a presentation format address (that is, printable form
+as held in a character string) to network format (usually a
+.Ft struct in_addr
+or some other internal binary representation, in network byte order).  It
+returns 1 if the address was valid for the specified address family, or
+0 if the address wasn't parseable in the specified address family, or -1
+if some system error occurred (in which case
+.Va errno
+will have been set).  This function is presently valid for AF_INET and
+AF_INET6.  The
+.Fn inet_aton
+routine interprets the specified character string as an Internet address,
+placing the address into the structure provided.
+It returns 1 if the string was successfully interpreted,
+or 0 if the string is invalid.
+The
+.Fn inet_addr
+and
+.Fn inet_network
+functions return numbers suitable for use
+as Internet addresses and Internet network
+numbers, respectively.
+.Pp
+The function
+.Fn inet_ntop
+converts an address from network format (usually a
+.Ft struct in_addr
+or some other binary form, in network byte order) to presentation format
+(suitable for external display purposes).  It returns NULL if a system
+error occurs (in which case,
+.Va errno
+will have been set), or it returns a pointer to the destination string.
+The routine
+.Fn inet_ntoa
+takes an Internet address and returns an
+.Tn ASCII
+string representing the address in
+.Ql \&.
+notation.  The routine
+.Fn inet_makeaddr
+takes an Internet network number and a local
+network address and constructs an Internet address
+from it.  The routines
+.Fn inet_netof
+and
+.Fn inet_lnaof
+break apart Internet host addresses, returning
+the network number and local network address part,
+respectively.
+.Pp
+All Internet addresses are returned in network
+order (bytes ordered from left to right).
+All network numbers and local address parts are
+returned as machine format integer values.
+.Sh INTERNET ADDRESSES (IP VERSION 4)
+Values specified using the
+.Ql \&.
+notation take one
+of the following forms:
+.Bd -literal -offset indent
+a.b.c.d
+a.b.c
+a.b
+a
+.Ed
+.Pp
+When four parts are specified, each is interpreted
+as a byte of data and assigned, from left to right,
+to the four bytes of an Internet address.  Note
+that when an Internet address is viewed as a 32-bit
+integer quantity on a system that uses little-endian
+byte order (such as the 
+.Tn Intel 386, 486
+and
+.Tn Pentium
+processors) the bytes referred to above appear as
+.Dq Li d.c.b.a .
+That is, little-endian bytes are ordered from right to left.
+.Pp
+When a three part address is specified, the last
+part is interpreted as a 16-bit quantity and placed
+in the right-most two bytes of the network address.
+This makes the three part address format convenient
+for specifying Class B network addresses as
+.Dq Li 128.net.host .
+.Pp
+When a two part address is supplied, the last part
+is interpreted as a 24-bit quantity and placed in
+the right most three bytes of the network address.
+This makes the two part address format convenient
+for specifying Class A network addresses as
+.Dq Li net.host .
+.Pp
+When only one part is given, the value is stored
+directly in the network address without any byte
+rearrangement.
+.Pp
+All numbers supplied as
+.Dq parts
+in a
+.Ql  \&.
+notation
+may be decimal, octal, or hexadecimal, as specified
+in the C language (i.e., a leading 0x or 0X implies
+hexadecimal; otherwise, a leading 0 implies octal;
+otherwise, the number is interpreted as decimal).
+.Sh INTERNET ADDRESSES (IP VERSION 6)
+The presentation format of an IPv6 address is given in [RFC1884 2.2]:
+.Pp
+There are three conventional forms for representing IPv6 addresses as
+text strings:
+.Bl -enum
+.It
+The preferred form is x:x:x:x:x:x:x:x, where the 'x's are the
+hexadecimal values of the eight 16-bit pieces of the address.
+Examples:
+.Bd -literal -offset indent
+FEDC:BA98:7654:3210:FEDC:BA98:7654:3210
+1080:0:0:0:8:800:200C:417A
+.Ed
+.Pp
+Note that it is not necessary to write the leading zeros in an
+individual field, but there must be at least one numeral in
+every field (except for the case described in 2.).
+.It
+Due to the method of allocating certain styles of IPv6
+addresses, it will be common for addresses to contain long
+strings of zero bits.  In order to make writing addresses
+.Pp
+containing zero bits easier a special syntax is available to
+compress the zeros.  The use of ``::'' indicates multiple groups
+of 16-bits of zeros.  The ``::'' can only appear once in an
+address.  The ``::'' can also be used to compress the leading
+and/or trailing zeros in an address.
+.Pp
+For example the following addresses:
+.Bd -literal -offset indent
+1080:0:0:0:8:800:200C:417A  a unicast address
+FF01:0:0:0:0:0:0:43         a multicast address
+0:0:0:0:0:0:0:1             the loopback address
+0:0:0:0:0:0:0:0             the unspecified addresses
+.Ed
+.Pp
+may be represented as:
+.Bd -literal -offset indent
+1080::8:800:200C:417A       a unicast address
+FF01::43                    a multicast address
+::1                         the loopback address
+::                          the unspecified addresses
+.Ed
+.It
+An alternative form that is sometimes more convenient when
+dealing with a mixed environment of IPv4 and IPv6 nodes is
+x:x:x:x:x:x:d.d.d.d, where the 'x's are the hexadecimal values
+of the six high-order 16-bit pieces of the address, and the 'd's
+are the decimal values of the four low-order 8-bit pieces of the
+address (standard IPv4 representation).  Examples:
+.Bd -literal -offset indent
+0:0:0:0:0:0:13.1.68.3
+0:0:0:0:0:FFFF:129.144.52.38
+.Ed
+.Pp
+or in compressed form:
+.Bd -literal -offset indent
+::13.1.68.3
+::FFFF:129.144.52.38
+.Ed
+.El
+.Sh DIAGNOSTICS
+The constant
+.Dv INADDR_NONE
+is returned by
+.Fn inet_addr
+and
+.Fn inet_network
+for malformed requests.
+.Sh SEE ALSO
+.Xr byteorder 3 ,
+.Xr gethostbyname 3 ,
+.Xr getnetent 3 ,
+.Xr inet_net 3 ,
+.Xr hosts 5 ,
+.Xr networks 5
+.Sh STANDARDS
+The
+.Nm inet_ntop
+and
+.Nm inet_pton
+functions conforms to the IETF IPng BSD API and address formatting
+specifications.  Note that
+.Nm inet_pton
+does not accept 1-, 2-, or 3-part  dotted addresses; all four parts
+must be specified.  This is a narrower input set than that accepted by
+.Nm inet_aton .
+.Sh HISTORY
+The 
+.Nm inet_addr ,
+.Nm inet_network ,
+.Nm inet_makeaddr ,
+.Nm inet_lnaof
+and
+.Nm inet_netof
+functions appeared in
+.Bx 4.2 .
+The
+.Nm inet_aton
+and
+.Nm inet_ntoa
+functions appeared in
+.Bx 4.3 .
+The
+.Nm inet_pton
+and
+.Nm inet_ntop
+functions appeared in BIND 4.9.4.
+.Sh BUGS
+The value
+.Dv INADDR_NONE
+(0xffffffff) is a valid broadcast address, but
+.Fn inet_addr
+cannot return that value without indicating failure.
+The newer
+.Fn inet_aton
+function does not share this problem.
+.Pp
+The problem of host byte ordering versus network byte ordering is
+confusing.
+.Pp
+The string returned by
+.Fn inet_ntoa
+resides in a static memory area.
+.Pp
+.Fn inet_addr
+should return a
+.Fa "struct in_addr" .
diff --git a/src/lib/libc/net/inet_addr.c b/src/lib/libc/net/inet_addr.c
new file mode 100644
index 0000000000..5e4dcdafb2
--- /dev/null
+++ b/src/lib/libc/net/inet_addr.c
@@ -0,0 +1,187 @@
+/*      $OpenBSD: inet_addr.c,v 1.5 1997/04/05 21:13:10 millert Exp $   */
+
+/*
+ * ++Copyright++ 1983, 1990, 1993
+ * -
+ * Copyright (c) 1983, 1990, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
+static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.5 1997/04/05 21:13:10 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+
+/*
+ * Ascii internet address interpretation routine.
+ * The value returned is in network order.
+ */
+in_addr_t
+inet_addr(cp)
+        register const char *cp;
+{
+        struct in_addr val;
+
+        if (inet_aton(cp, &val))
+                return (val.s_addr);
+        return (INADDR_NONE);
+}
+
+/* 
+ * Check whether "cp" is a valid ascii representation
+ * of an Internet address and convert to a binary address.
+ * Returns 1 if the address is valid, 0 if not.
+ * This replaces inet_addr, the return value from which
+ * cannot distinguish between failure and a local broadcast address.
+ */
+int
+inet_aton(cp, addr)
+        register const char *cp;
+        struct in_addr *addr;
+{
+        register in_addr_t val;
+        register int base, n;
+        register char c;
+        u_int parts[4];
+        register u_int *pp = parts;
+
+        c = *cp;
+        for (;;) {
+                /*
+                 * Collect number up to ``.''.
+                 * Values are specified as for C:
+                 * 0x=hex, 0=octal, isdigit=decimal.
+                 */
+                if (!isdigit(c))
+                        return (0);
+                val = 0; base = 10;
+                if (c == '0') {
+                        c = *++cp;
+                        if (c == 'x' || c == 'X')
+                                base = 16, c = *++cp;
+                        else
+                                base = 8;
+                }
+                for (;;) {
+                        if (isascii(c) && isdigit(c)) {
+                                val = (val * base) + (c - '0');
+                                c = *++cp;
+                        } else if (base == 16 && isascii(c) && isxdigit(c)) {
+                                val = (val << 4) |
+                                        (c + 10 - (islower(c) ? 'a' : 'A'));
+                                c = *++cp;
+                        } else
+                                break;
+                }
+                if (c == '.') {
+                        /*
+                         * Internet format:
+                         *      a.b.c.d
+                         *      a.b.c   (with c treated as 16 bits)
+                         *      a.b     (with b treated as 24 bits)
+                         */
+                        if (pp >= parts + 3)
+                                return (0);
+                        *pp++ = val;
+                        c = *++cp;
+                } else
+                        break;
+        }
+        /*
+         * Check for trailing characters.
+         */
+        if (c != '\0' && (!isascii(c) || !isspace(c)))
+                return (0);
+        /*
+         * Concoct the address according to
+         * the number of parts specified.
+         */
+        n = pp - parts + 1;
+        switch (n) {
+
+        case 0:
+                return (0);             /* initial nondigit */
+
+        case 1:                         /* a -- 32 bits */
+                break;
+
+        case 2:                         /* a.b -- 8.24 bits */
+                if (val > 0xffffff)
+                        return (0);
+                val |= parts[0] << 24;
+                break;
+
+        case 3:                         /* a.b.c -- 8.8.16 bits */
+                if (val > 0xffff)
+                        return (0);
+                val |= (parts[0] << 24) | (parts[1] << 16);
+                break;
+
+        case 4:                         /* a.b.c.d -- 8.8.8.8 bits */
+                if (val > 0xff)
+                        return (0);
+                val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+                break;
+        }
+        if (addr)
+                addr->s_addr = htonl(val);
+        return (1);
+}
diff --git a/src/lib/libc/net/inet_lnaof.c b/src/lib/libc/net/inet_lnaof.c
new file mode 100644
index 0000000000..6aed18699b
--- /dev/null
+++ b/src/lib/libc/net/inet_lnaof.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: inet_lnaof.c,v 1.3 1997/04/05 21:13:11 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+/*
+ * Return the local network address portion of an
+ * internet address; handles class a/b/c network
+ * number formats.
+ */
+in_addr_t
+inet_lnaof(in)
+        struct in_addr in;
+{
+        register in_addr_t i = ntohl(in.s_addr);
+
+        if (IN_CLASSA(i))
+                return ((i)&IN_CLASSA_HOST);
+        else if (IN_CLASSB(i))
+                return ((i)&IN_CLASSB_HOST);
+        else
+                return ((i)&IN_CLASSC_HOST);
+}
diff --git a/src/lib/libc/net/inet_makeaddr.c b/src/lib/libc/net/inet_makeaddr.c
new file mode 100644
index 0000000000..196a589e4c
--- /dev/null
+++ b/src/lib/libc/net/inet_makeaddr.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: inet_makeaddr.c,v 1.3 1997/04/05 21:13:12 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+/*
+ * Formulate an Internet address from network + host.  Used in
+ * building addresses stored in the ifnet structure.
+ */
+struct in_addr
+inet_makeaddr(net, host)
+        in_addr_t net, host;
+{
+        in_addr_t addr;
+
+        if (net < 128)
+                addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
+        else if (net < 65536)
+                addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
+        else if (net < 16777216L)
+                addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
+        else
+                addr = net | host;
+        addr = htonl(addr);
+        return (*(struct in_addr *)&addr);
+}
diff --git a/src/lib/libc/net/inet_net.3 b/src/lib/libc/net/inet_net.3
new file mode 100644
index 0000000000..1a42aff6ea
--- /dev/null
+++ b/src/lib/libc/net/inet_net.3
@@ -0,0 +1,149 @@
+.\"     $OpenBSD: inet_net.3,v 1.1 1997/06/23 03:37:26 millert Exp $
+.\"     $NetBSD: inet_net.3,v 1.1 1997/06/18 02:25:27 lukem Exp $
+.\"
+.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Luke Mewburn.
+.\"
+.\" Redistribution and use in source 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 the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
+.\"
+.Dd June 18, 1997
+.Dt INET_NET 3
+.Os
+.Sh NAME
+.Nm inet_net_ntop ,
+.Nm inet_net_pton
+.Nd Internet network number manipulation routines
+.Sh SYNOPSIS
+.Fd #include <sys/socket.h>
+.Fd #include <netinet/in.h>
+.Fd #include <arpa/inet.h>
+.Ft char *
+.Fn inet_net_ntop "int af" "const void *src" "int bits" "char *dst" "size_t size"
+.Ft int
+.Fn inet_net_pton "int af" "const char *src" "void *dst" "size_t size"
+.Sh DESCRIPTION
+The
+.Fn inet_net_ntop
+function converts an Internet network number from network format (usually a
+.Ft struct in_addr
+or some other binary form, in network byte order) to CIDR presentation format
+(suitable for external display purposes).
+.Fa bits
+is the number of bits in
+.Fa src
+that are the network number.
+It returns NULL if a system error occurs (in which case,
+.Va errno
+will have been set), or it returns a pointer to the destination string.
+.Pp
+The
+.Fn inet_net_pton
+function converts a presentation format Internet network number (that is,
+printable form as held in a character string) to network format (usually a
+.Ft struct in_addr
+or some other internal binary representation, in network byte order).
+It returns the number of bits (either computed based on the class, or
+specified with /CIDR), or -1 if a failure occurred
+(in which case
+.Va errno
+will have been set.
+It will be set to
+.Er ENOENT
+if the Internet network number was not valid).
+.Pp
+The currently supported value for
+.Fa af
+is: AF_INET.
+.Fa size
+is the size of the result buffer
+.Fa dst .
+.Pp
+.Sh NETWORK NUMBERS (IP VERSION 4)
+Internet network numbers may be specified in one of the following forms:
+.Bd -literal -offset indent
+a.b.c.d/bits
+a.b.c.d
+a.b.c
+a.b
+a
+.Ed
+.Pp
+When four parts are specified, each is interpreted
+as a byte of data and assigned, from left to right,
+to the four bytes of an Internet network number.  Note
+that when an Internet network number is viewed as a 32-bit
+integer quantity on a system that uses little-endian
+byte order (such as the 
+.Tn Intel 386, 486
+and
+.Tn Pentium
+processors) the bytes referred to above appear as
+.Dq Li d.c.b.a .
+That is, little-endian bytes are ordered from right to left.
+.Pp
+When a three part number is specified, the last
+part is interpreted as a 16-bit quantity and placed
+in the right-most two bytes of the Internet network number.
+This makes the three part number format convenient
+for specifying Class B network numbers as
+.Dq Li 128.net.host .
+.Pp
+When a two part number is supplied, the last part
+is interpreted as a 24-bit quantity and placed in
+the right most three bytes of the Internet network number.
+This makes the two part number format convenient
+for specifying Class A network numbers as
+.Dq Li net.host .
+.Pp
+When only one part is given, the value is stored
+directly in the Internet network number without any byte
+rearrangement.
+.Pp
+All numbers supplied as
+.Dq parts
+in a
+.Ql  \&.
+notation
+may be decimal, octal, or hexadecimal, as specified
+in the C language (i.e., a leading 0x or 0X implies
+hexadecimal; otherwise, a leading 0 implies octal;
+otherwise, the number is interpreted as decimal).
+.Sh SEE ALSO
+.Xr byteorder 3 ,
+.Xr inet 3 ,
+.Xr networks 5
+.Sh HISTORY
+The
+.Nm inet_net_ntop
+and
+.Nm inet_net_pton
+functions first appeared in BIND 4.9.4.
diff --git a/src/lib/libc/net/inet_net_ntop.c b/src/lib/libc/net/inet_net_ntop.c
new file mode 100644
index 0000000000..943ec44550
--- /dev/null
+++ b/src/lib/libc/net/inet_net_ntop.c
@@ -0,0 +1,139 @@
+/*      $OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $        */
+
+/*
+ * Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static const char rcsid[] = "$From: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp $";
+#else
+static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $";
+#endif
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+static char *   inet_net_ntop_ipv4 __P((const u_char *src, int bits,
+                                        char *dst, size_t size));
+
+/*
+ * char *
+ * inet_net_ntop(af, src, bits, dst, size)
+ *      convert network number from network to presentation format.
+ *      generates CIDR style result always.
+ * return:
+ *      pointer to dst, or NULL if an error occurred (check errno).
+ * author:
+ *      Paul Vixie (ISC), July 1996
+ */
+char *
+inet_net_ntop(af, src, bits, dst, size)
+        int af;
+        const void *src;
+        int bits;
+        char *dst;
+        size_t size;
+{
+        switch (af) {
+        case AF_INET:
+                return (inet_net_ntop_ipv4(src, bits, dst, size));
+        default:
+                errno = EAFNOSUPPORT;
+                return (NULL);
+        }
+}
+
+/*
+ * static char *
+ * inet_net_ntop_ipv4(src, bits, dst, size)
+ *      convert IPv4 network number from network to presentation format.
+ *      generates CIDR style result always.
+ * return:
+ *      pointer to dst, or NULL if an error occurred (check errno).
+ * note:
+ *      network byte order assumed.  this means 192.5.5.240/28 has
+ *      0x11110000 in its fourth octet.
+ * author:
+ *      Paul Vixie (ISC), July 1996
+ */
+static char *
+inet_net_ntop_ipv4(src, bits, dst, size)
+        const u_char *src;
+        int bits;
+        char *dst;
+        size_t size;
+{
+        char *odst = dst;
+        char *t;
+        u_int m;
+        int b;
+
+        if (bits < 0 || bits > 32) {
+                errno = EINVAL;
+                return (NULL);
+        }
+        if (bits == 0) {
+                if (size < sizeof "0")
+                        goto emsgsize;
+                *dst++ = '0';
+                *dst = '\0';
+        }
+
+        /* Format whole octets. */
+        for (b = bits / 8; b > 0; b--) {
+                if (size < sizeof "255.")
+                        goto emsgsize;
+                t = dst;
+                dst += sprintf(dst, "%u", *src++);
+                if (b > 1) {
+                        *dst++ = '.';
+                        *dst = '\0';
+                }
+                size -= (size_t)(dst - t);
+        }
+
+        /* Format partial octet. */
+        b = bits % 8;
+        if (b > 0) {
+                if (size < sizeof ".255")
+                        goto emsgsize;
+                t = dst;
+                if (dst != odst)
+                        *dst++ = '.';
+                m = ((1 << b) - 1) << (8 - b);
+                dst += sprintf(dst, "%u", *src & m);
+                size -= (size_t)(dst - t);
+        }
+
+        /* Format CIDR /width. */
+        if (size < sizeof "/32")
+                goto emsgsize;
+        dst += sprintf(dst, "/%u", bits);
+        return (odst);
+
+ emsgsize:
+        errno = EMSGSIZE;
+        return (NULL);
+}
diff --git a/src/lib/libc/net/inet_net_pton.c b/src/lib/libc/net/inet_net_pton.c
new file mode 100644
index 0000000000..b529e83664
--- /dev/null
+++ b/src/lib/libc/net/inet_net_pton.c
@@ -0,0 +1,207 @@
+/*      $OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $        */
+
+/*
+ * Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static const char rcsid[] = "$From: inet_net_pton.c,v 8.3 1996/11/11 06:36:52 vixie Exp $";
+#else
+static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $";
+#endif
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+static int      inet_net_pton_ipv4 __P((const char *src, u_char *dst,
+                                        size_t size));
+
+/*
+ * static int
+ * inet_net_pton(af, src, dst, size)
+ *      convert network number from presentation to network format.
+ *      accepts hex octets, hex strings, decimal octets, and /CIDR.
+ *      "size" is in bytes and describes "dst".
+ * return:
+ *      number of bits, either imputed classfully or specified with /CIDR,
+ *      or -1 if some failure occurred (check errno).  ENOENT means it was
+ *      not a valid network specification.
+ * author:
+ *      Paul Vixie (ISC), June 1996
+ */
+int
+inet_net_pton(af, src, dst, size)
+        int af;
+        const char *src;
+        void *dst;
+        size_t size;
+{
+        switch (af) {
+        case AF_INET:
+                return (inet_net_pton_ipv4(src, dst, size));
+        default:
+                errno = EAFNOSUPPORT;
+                return (-1);
+        }
+}
+
+/*
+ * static int
+ * inet_net_pton_ipv4(src, dst, size)
+ *      convert IPv4 network number from presentation to network format.
+ *      accepts hex octets, hex strings, decimal octets, and /CIDR.
+ *      "size" is in bytes and describes "dst".
+ * return:
+ *      number of bits, either imputed classfully or specified with /CIDR,
+ *      or -1 if some failure occurred (check errno).  ENOENT means it was
+ *      not an IPv4 network specification.
+ * note:
+ *      network byte order assumed.  this means 192.5.5.240/28 has
+ *      0x11110000 in its fourth octet.
+ * author:
+ *      Paul Vixie (ISC), June 1996
+ */
+static int
+inet_net_pton_ipv4(src, dst, size)
+        const char *src;
+        u_char *dst;
+        size_t size;
+{
+        static const char
+                xdigits[] = "0123456789abcdef",
+                digits[] = "0123456789";
+        int n, ch, tmp, dirty, bits;
+        const u_char *odst = dst;
+
+        ch = *src++;
+        if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
+            && isascii(src[1]) && isxdigit(src[1])) {
+                /* Hexadecimal: Eat nybble string. */
+                if (size <= 0)
+                        goto emsgsize;
+                *dst = 0, dirty = 0;
+                src++;  /* skip x or X. */
+                while ((ch = *src++) != '\0' &&
+                       isascii(ch) && isxdigit(ch)) {
+                        if (isupper(ch))
+                                ch = tolower(ch);
+                        n = strchr(xdigits, ch) - xdigits;
+                        assert(n >= 0 && n <= 15);
+                        *dst |= n;
+                        if (!dirty++)
+                                *dst <<= 4;
+                        else if (size-- > 0)
+                                *++dst = 0, dirty = 0;
+                        else
+                                goto emsgsize;
+                }
+                if (dirty)
+                        size--;
+        } else if (isascii(ch) && isdigit(ch)) {
+                /* Decimal: eat dotted digit string. */
+                for (;;) {
+                        tmp = 0;
+                        do {
+                                n = strchr(digits, ch) - digits;
+                                assert(n >= 0 && n <= 9);
+                                tmp *= 10;
+                                tmp += n;
+                                if (tmp > 255)
+                                        goto enoent;
+                        } while ((ch = *src++) != '\0' &&
+                                 isascii(ch) && isdigit(ch));
+                        if (size-- <= 0)
+                                goto emsgsize;
+                        *dst++ = (u_char) tmp;
+                        if (ch == '\0' || ch == '/')
+                                break;
+                        if (ch != '.')
+                                goto enoent;
+                        ch = *src++;
+                        if (!isascii(ch) || !isdigit(ch))
+                                goto enoent;
+                }
+        } else
+                goto enoent;
+
+        bits = -1;
+        if (ch == '/' && isascii(src[0]) && isdigit(src[0]) && dst > odst) {
+                /* CIDR width specifier.  Nothing can follow it. */
+                ch = *src++;    /* Skip over the /. */
+                bits = 0;
+                do {
+                        n = strchr(digits, ch) - digits;
+                        assert(n >= 0 && n <= 9);
+                        bits *= 10;
+                        bits += n;
+                } while ((ch = *src++) != '\0' &&
+                         isascii(ch) && isdigit(ch));
+                if (ch != '\0')
+                        goto enoent;
+                if (bits > 32)
+                        goto emsgsize;
+        }
+
+        /* Firey death and destruction unless we prefetched EOS. */
+        if (ch != '\0')
+                goto enoent;
+
+        /* If nothing was written to the destination, we found no address. */
+        if (dst == odst)
+                goto enoent;
+        /* If no CIDR spec was given, infer width from net class. */
+        if (bits == -1) {
+                if (*odst >= 240)       /* Class E */
+                        bits = 32;
+                else if (*odst >= 224)  /* Class D */
+                        bits = 4;
+                else if (*odst >= 192)  /* Class C */
+                        bits = 24;
+                else if (*odst >= 128)  /* Class B */
+                        bits = 16;
+                else                    /* Class A */
+                        bits = 8;
+                /* If imputed mask is narrower than specified octets, widen. */
+                if (bits >= 8 && bits < ((dst - odst) * 8))
+                        bits = (dst - odst) * 8;
+        }
+        /* Extend network to cover the actual mask. */
+        while (bits > ((dst - odst) * 8)) {
+                if (size-- <= 0)
+                        goto emsgsize;
+                *dst++ = '\0';
+        }
+        return (bits);
+
+ enoent:
+        errno = ENOENT;
+        return (-1);
+
+ emsgsize:
+        errno = EMSGSIZE;
+        return (-1);
+}
diff --git a/src/lib/libc/net/inet_neta.c b/src/lib/libc/net/inet_neta.c
new file mode 100644
index 0000000000..ffcddd8d91
--- /dev/null
+++ b/src/lib/libc/net/inet_neta.c
@@ -0,0 +1,83 @@
+/*      $OpenBSD: inet_neta.c,v 1.2 1997/04/05 21:13:12 millert Exp $   */
+
+/*
+ * Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static const char rcsid[] = "$Id: inet_neta.c,v 1.2 1997/04/05 21:13:12 millert Exp $";
+#else
+static const char rcsid[] = "$OpenBSD: inet_neta.c,v 1.2 1997/04/05 21:13:12 millert Exp $";
+#endif
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+ * char *
+ * inet_neta(src, dst, size)
+ *      format an in_addr_t network number into presentation format.
+ * return:
+ *      pointer to dst, or NULL if an error occurred (check errno).
+ * note:
+ *      format of ``src'' is as for inet_network().
+ * author:
+ *      Paul Vixie (ISC), July 1996
+ */
+char *
+inet_neta(src, dst, size)
+        in_addr_t src;
+        char *dst;
+        size_t size;
+{
+        char *odst = dst;
+        char *tp;
+
+        while (src & 0xffffffff) {
+                u_char b = (src & 0xff000000) >> 24;
+
+                src <<= 8;
+                if (b) {
+                        if (size < sizeof "255.")
+                                goto emsgsize;
+                        tp = dst;
+                        dst += sprintf(dst, "%u", b);
+                        if (src != 0L) {
+                                *dst++ = '.';
+                                *dst = '\0';
+                        }
+                        size -= (size_t)(dst - tp);
+                }
+        }
+        if (dst == odst) {
+                if (size < sizeof "0.0.0.0")
+                        goto emsgsize;
+                strcpy(dst, "0.0.0.0");
+        }
+        return (odst);
+
+ emsgsize:
+        errno = EMSGSIZE;
+        return (NULL);
+}
diff --git a/src/lib/libc/net/inet_netof.c b/src/lib/libc/net/inet_netof.c
new file mode 100644
index 0000000000..f3b9c01697
--- /dev/null
+++ b/src/lib/libc/net/inet_netof.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: inet_netof.c,v 1.3 1997/04/05 21:13:13 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+/*
+ * Return the network number from an internet
+ * address; handles class a/b/c network #'s.
+ */
+in_addr_t
+inet_netof(in)
+        struct in_addr in;
+{
+        register in_addr_t i = ntohl(in.s_addr);
+
+        if (IN_CLASSA(i))
+                return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
+        else if (IN_CLASSB(i))
+                return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
+        else
+                return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
+}
diff --git a/src/lib/libc/net/inet_network.c b/src/lib/libc/net/inet_network.c
new file mode 100644
index 0000000000..8a9a555d62
--- /dev/null
+++ b/src/lib/libc/net/inet_network.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: inet_network.c,v 1.7 1997/07/09 01:08:37 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+
+/*
+ * Internet network address interpretation routine.
+ * The library routines call this routine to interpret
+ * network numbers.
+ */
+in_addr_t
+inet_network(cp)
+        register const char *cp;
+{
+        register in_addr_t val, base, n;
+        register char c;
+        in_addr_t parts[4], *pp = parts;
+        register int i;
+
+again:
+        val = 0; base = 10;
+        if (*cp == '0')
+                base = 8, cp++;
+        if (*cp == 'x' || *cp == 'X')
+                base = 16, cp++;
+        while ((c = *cp)) {
+                if (isdigit(c)) {
+                        val = (val * base) + (c - '0');
+                        cp++;
+                        continue;
+                }
+                if (base == 16 && isxdigit(c)) {
+                        val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
+                        cp++;
+                        continue;
+                }
+                break;
+        }
+        if (*cp == '.') {
+                if (pp >= parts + 3)
+                        return (INADDR_NONE);
+                *pp++ = val, cp++;
+                goto again;
+        }
+        if (*cp && !isspace(*cp))
+                return (INADDR_NONE);
+        *pp++ = val;
+        n = pp - parts;
+        for (val = 0, i = 0; i < 4; i++) {
+                val <<= 8;
+                if (i < n)
+                        val |= parts[i] & 0xff;
+        }
+        return (val);
+}
diff --git a/src/lib/libc/net/inet_ntoa.c b/src/lib/libc/net/inet_ntoa.c
new file mode 100644
index 0000000000..148732ba5a
--- /dev/null
+++ b/src/lib/libc/net/inet_ntoa.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.2 1996/08/19 08:29:16 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Convert network-format internet address
+ * to base 256 d.d.d.d representation.
+ */
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+
+char *
+inet_ntoa(in)
+        struct in_addr in;
+{
+        static char b[18];
+        register char *p;
+
+        p = (char *)&in;
+#define UC(b)   (((int)b)&0xff)
+        (void)snprintf(b, sizeof(b),
+            "%d.%d.%d.%d", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
+        return (b);
+}
diff --git a/src/lib/libc/net/inet_ntop.c b/src/lib/libc/net/inet_ntop.c
new file mode 100644
index 0000000000..64d0d13768
--- /dev/null
+++ b/src/lib/libc/net/inet_ntop.c
@@ -0,0 +1,194 @@
+/*      $OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $    */
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+/*
+ * WARNING: Don't even consider trying to compile this on a system where
+ * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+ */
+
+static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
+static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
+
+/* char *
+ * inet_ntop(af, src, dst, size)
+ *      convert a network format address to presentation format.
+ * return:
+ *      pointer to presentation format address (`dst'), or NULL (see errno).
+ * author:
+ *      Paul Vixie, 1996.
+ */
+const char *
+inet_ntop(af, src, dst, size)
+        int af;
+        const void *src;
+        char *dst;
+        size_t size;
+{
+        switch (af) {
+        case AF_INET:
+                return (inet_ntop4(src, dst, size));
+        case AF_INET6:
+                return (inet_ntop6(src, dst, size));
+        default:
+                errno = EAFNOSUPPORT;
+                return (NULL);
+        }
+        /* NOTREACHED */
+}
+
+/* const char *
+ * inet_ntop4(src, dst, size)
+ *      format an IPv4 address, more or less like inet_ntoa()
+ * return:
+ *      `dst' (as a const)
+ * notes:
+ *      (1) uses no statics
+ *      (2) takes a u_char* not an in_addr as input
+ * author:
+ *      Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop4(src, dst, size)
+        const u_char *src;
+        char *dst;
+        size_t size;
+{
+        static const char fmt[] = "%u.%u.%u.%u";
+        char tmp[sizeof "255.255.255.255"];
+
+        if (sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) > size) {
+                errno = ENOSPC;
+                return (NULL);
+        }
+        strcpy(dst, tmp);
+        return (dst);
+}
+
+/* const char *
+ * inet_ntop6(src, dst, size)
+ *      convert IPv6 binary address into presentation (printable) format
+ * author:
+ *      Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop6(src, dst, size)
+        const u_char *src;
+        char *dst;
+        size_t size;
+{
+        /*
+         * Note that int32_t and int16_t need only be "at least" large enough
+         * to contain a value of the specified size.  On some systems, like
+         * Crays, there is no such thing as an integer variable with 16 bits.
+         * Keep this in mind if you think this function should have been coded
+         * to use pointer overlays.  All the world's not a VAX.
+         */
+        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+        struct { int base, len; } best, cur;
+        u_int words[IN6ADDRSZ / INT16SZ];
+        int i;
+
+        /*
+         * Preprocess:
+         *      Copy the input (bytewise) array into a wordwise array.
+         *      Find the longest run of 0x00's in src[] for :: shorthanding.
+         */
+        memset(words, '\0', sizeof words);
+        for (i = 0; i < IN6ADDRSZ; i++)
+                words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+        best.base = -1;
+        cur.base = -1;
+        for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
+                if (words[i] == 0) {
+                        if (cur.base == -1)
+                                cur.base = i, cur.len = 1;
+                        else
+                                cur.len++;
+                } else {
+                        if (cur.base != -1) {
+                                if (best.base == -1 || cur.len > best.len)
+                                        best = cur;
+                                cur.base = -1;
+                        }
+                }
+        }
+        if (cur.base != -1) {
+                if (best.base == -1 || cur.len > best.len)
+                        best = cur;
+        }
+        if (best.base != -1 && best.len < 2)
+                best.base = -1;
+
+        /*
+         * Format the result.
+         */
+        tp = tmp;
+        for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
+                /* Are we inside the best run of 0x00's? */
+                if (best.base != -1 && i >= best.base &&
+                    i < (best.base + best.len)) {
+                        if (i == best.base)
+                                *tp++ = ':';
+                        continue;
+                }
+                /* Are we following an initial run of 0x00s or any real hex? */
+                if (i != 0)
+                        *tp++ = ':';
+                /* Is this address an encapsulated IPv4? */
+                if (i == 6 && best.base == 0 &&
+                    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
+                        if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+                                return (NULL);
+                        tp += strlen(tp);
+                        break;
+                }
+                tp += sprintf(tp, "%x", words[i]);
+        }
+        /* Was it a trailing run of 0x00's? */
+        if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))
+                *tp++ = ':';
+        *tp++ = '\0';
+
+        /*
+         * Check for overflow, copy, and we're done.
+         */
+        if ((size_t)(tp - tmp) > size) {
+                errno = ENOSPC;
+                return (NULL);
+        }
+        strcpy(dst, tmp);
+        return (dst);
+}
diff --git a/src/lib/libc/net/inet_pton.c b/src/lib/libc/net/inet_pton.c
new file mode 100644
index 0000000000..46b4b24819
--- /dev/null
+++ b/src/lib/libc/net/inet_pton.c
@@ -0,0 +1,220 @@
+/*      $OpenBSD: inet_pton.c,v 1.2 1997/04/13 05:08:24 deraadt Exp $   */
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char rcsid[] = "$From: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.2 1997/04/13 05:08:24 deraadt Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <string.h>
+#include <errno.h>
+
+/*
+ * WARNING: Don't even consider trying to compile this on a system where
+ * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+ */
+
+static int      inet_pton4 __P((const char *src, u_char *dst));
+static int      inet_pton6 __P((const char *src, u_char *dst));
+
+/* int
+ * inet_pton(af, src, dst)
+ *      convert from presentation format (which usually means ASCII printable)
+ *      to network format (which is usually some kind of binary format).
+ * return:
+ *      1 if the address was valid for the specified address family
+ *      0 if the address wasn't valid (`dst' is untouched in this case)
+ *      -1 if some other error occurred (`dst' is untouched in this case, too)
+ * author:
+ *      Paul Vixie, 1996.
+ */
+int
+inet_pton(af, src, dst)
+        int af;
+        const char *src;
+        void *dst;
+{
+        switch (af) {
+        case AF_INET:
+                return (inet_pton4(src, dst));
+        case AF_INET6:
+                return (inet_pton6(src, dst));
+        default:
+                errno = EAFNOSUPPORT;
+                return (-1);
+        }
+        /* NOTREACHED */
+}
+
+/* int
+ * inet_pton4(src, dst)
+ *      like inet_aton() but without all the hexadecimal and shorthand.
+ * return:
+ *      1 if `src' is a valid dotted quad, else 0.
+ * notice:
+ *      does not touch `dst' unless it's returning 1.
+ * author:
+ *      Paul Vixie, 1996.
+ */
+static int
+inet_pton4(src, dst)
+        const char *src;
+        u_char *dst;
+{
+        static const char digits[] = "0123456789";
+        int saw_digit, octets, ch;
+        u_char tmp[INADDRSZ], *tp;
+
+        saw_digit = 0;
+        octets = 0;
+        *(tp = tmp) = 0;
+        while ((ch = *src++) != '\0') {
+                const char *pch;
+
+                if ((pch = strchr(digits, ch)) != NULL) {
+                        u_int new = *tp * 10 + (pch - digits);
+
+                        if (new > 255)
+                                return (0);
+                        if (! saw_digit) {
+                                if (++octets > 4)
+                                        return (0);
+                                saw_digit = 1;
+                        }
+                        *tp = new;
+                } else if (ch == '.' && saw_digit) {
+                        if (octets == 4)
+                                return (0);
+                        *++tp = 0;
+                        saw_digit = 0;
+                } else
+                        return (0);
+        }
+        if (octets < 4)
+                return (0);
+
+        memcpy(dst, tmp, INADDRSZ);
+        return (1);
+}
+
+/* int
+ * inet_pton6(src, dst)
+ *      convert presentation level address to network order binary form.
+ * return:
+ *      1 if `src' is a valid [RFC1884 2.2] address, else 0.
+ * notice:
+ *      (1) does not touch `dst' unless it's returning 1.
+ *      (2) :: in a full address is silently ignored.
+ * credit:
+ *      inspired by Mark Andrews.
+ * author:
+ *      Paul Vixie, 1996.
+ */
+static int
+inet_pton6(src, dst)
+        const char *src;
+        u_char *dst;
+{
+        static const char xdigits_l[] = "0123456789abcdef",
+                          xdigits_u[] = "0123456789ABCDEF";
+        u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
+        const char *xdigits, *curtok;
+        int ch, saw_xdigit;
+        u_int val;
+
+        memset((tp = tmp), '\0', IN6ADDRSZ);
+        endp = tp + IN6ADDRSZ;
+        colonp = NULL;
+        /* Leading :: requires some special handling. */
+        if (*src == ':')
+                if (*++src != ':')
+                        return (0);
+        curtok = src;
+        saw_xdigit = 0;
+        val = 0;
+        while ((ch = *src++) != '\0') {
+                const char *pch;
+
+                if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
+                        pch = strchr((xdigits = xdigits_u), ch);
+                if (pch != NULL) {
+                        val <<= 4;
+                        val |= (pch - xdigits);
+                        if (val > 0xffff)
+                                return (0);
+                        saw_xdigit = 1;
+                        continue;
+                }
+                if (ch == ':') {
+                        curtok = src;
+                        if (!saw_xdigit) {
+                                if (colonp)
+                                        return (0);
+                                colonp = tp;
+                                continue;
+                        }
+                        if (tp + INT16SZ > endp)
+                                return (0);
+                        *tp++ = (u_char) (val >> 8) & 0xff;
+                        *tp++ = (u_char) val & 0xff;
+                        saw_xdigit = 0;
+                        val = 0;
+                        continue;
+                }
+                if (ch == '.' && ((tp + INADDRSZ) <= endp) &&
+                    inet_pton4(curtok, tp) > 0) {
+                        tp += INADDRSZ;
+                        saw_xdigit = 0;
+                        break;  /* '\0' was seen by inet_pton4(). */
+                }
+                return (0);
+        }
+        if (saw_xdigit) {
+                if (tp + INT16SZ > endp)
+                        return (0);
+                *tp++ = (u_char) (val >> 8) & 0xff;
+                *tp++ = (u_char) val & 0xff;
+        }
+        if (colonp != NULL) {
+                /*
+                 * Since some memmove()'s erroneously fail to handle
+                 * overlapping regions, we'll do the shift by hand.
+                 */
+                const int n = tp - colonp;
+                int i;
+
+                for (i = 1; i <= n; i++) {
+                        endp[- i] = colonp[n - i];
+                        colonp[n - i] = 0;
+                }
+                tp = endp;
+        }
+        if (tp != endp)
+                return (0);
+        memcpy(dst, tmp, IN6ADDRSZ);
+        return (1);
+}
diff --git a/src/lib/libc/net/ipx.3 b/src/lib/libc/net/ipx.3
new file mode 100644
index 0000000000..073be74807
--- /dev/null
+++ b/src/lib/libc/net/ipx.3
@@ -0,0 +1,126 @@
+.\"     $OpenBSD: ipx.3,v 1.3 1997/09/09 11:45:17 kstailey Exp $
+.\"
+.\" Copyright (c) 1986, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt IPX 3
+.Os OpenBSD 1.2
+.Sh NAME
+.Nm ipx_addr ,
+.Nm ipx_ntoa
+.Nd IPX address conversion routines
+.Sh SYNOPSIS
+.Fd #include <sys/types.h>
+.Fd #include <netipx/ipx.h>
+.Ft struct ipx_addr 
+.Fn ipx_addr "char *cp"
+.Ft char *
+.Fn ipx_ntoa "struct ipx_addr ipx"
+.Sh DESCRIPTION
+The routine
+.Fn ipx_addr
+interprets character strings representing
+.Tn IPX
+addresses, returning binary information suitable
+for use in system calls.
+The routine
+.Fn ipx_ntoa
+takes
+.Tn IPX
+addresses and returns
+.Tn ASCII
+strings representing the address in a
+notation in common use:
+.Bd -filled -offset indent
+<network number>.<host number>.<port number>
+.Ed
+.Pp
+Trailing zero fields are suppressed, and each number is printed in hexadecimal,
+in a format suitable for input to 
+.Fn ipx_addr .
+Any fields lacking super-decimal digits will have a
+trailing
+.Ql H
+appended.
+.Pp
+An effort has been made to insure that
+.Fn ipx_addr
+be compatible with most formats in common use.
+It will first separate an address into 1 to 3 fields using a single delimiter
+chosen from
+period
+.Ql \&. ,
+colon
+.Ql \&:
+or pound-sign
+.Ql \&# .
+Each field is then examined for byte separators (colon or period).
+If there are byte separators, each subfield separated is taken to be
+a small hexadecimal number, and the entirety is taken as a network-byte-ordered
+quantity to be zero extended in the high-network-order bytes.
+Next, the field is inspected for hyphens, in which case
+the field is assumed to be a number in decimal notation
+with hyphens separating the millenia.
+Next, the field is assumed to be a number:
+It is interpreted
+as hexadecimal if there is a leading
+.Ql 0x
+(as in C),
+a trailing
+.Ql H
+(as in Mesa), or there are any super-decimal digits present.
+It is interpreted as octal is there is a leading
+.Ql 0
+and there are no super-octal digits.
+Otherwise, it is converted as a decimal number.
+.Sh RETURN VALUES
+None. (See
+.Sx BUGS . )
+.Sh SEE ALSO
+.Xr ns 4 ,
+.Xr hosts 5 ,
+.Xr networks 5
+.Sh HISTORY
+The precursor
+.Fn ns_addr
+and
+.Fn ns_ntoa
+functions appeared in 
+.Bx 4.3 .
+.Sh BUGS
+The string returned by
+.Fn ipx_ntoa
+resides in a static memory area.
+The function
+.Fn ipx_addr
+should diagnose improperly formed input, and there should be an unambiguous
+way to recognize this.
diff --git a/src/lib/libc/net/ipx_addr.c b/src/lib/libc/net/ipx_addr.c
new file mode 100644
index 0000000000..a76e03e913
--- /dev/null
+++ b/src/lib/libc/net/ipx_addr.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 1986, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * J.Q. Johnson.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from @(#)ipx_addr.c
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: ipx_addr.c,v 1.3 1997/07/09 01:08:39 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netipx/ipx.h>
+#include <stdio.h>
+#include <string.h>
+
+static struct ipx_addr addr, zero_addr;
+
+static void Field(), cvtbase();
+
+struct ipx_addr 
+ipx_addr(name)
+        const char *name;
+{
+        char separator;
+        char *hostname, *socketname, *cp;
+        char buf[50];
+
+        (void)strncpy(buf, name, sizeof(buf) - 1);
+        buf[sizeof(buf) - 1] = '\0';
+
+        /*
+         * First, figure out what he intends as a field separtor.
+         * Despite the way this routine is written, the prefered
+         * form  2-272.AA001234H.01777, i.e. XDE standard.
+         * Great efforts are made to insure backward compatability.
+         */
+        if ((hostname = strchr(buf, '#')))
+                separator = '#';
+        else {
+                hostname = strchr(buf, '.');
+                if ((cp = strchr(buf, ':')) &&
+                    ((hostname && cp < hostname) || (hostname == 0))) {
+                        hostname = cp;
+                        separator = ':';
+                } else
+                        separator = '.';
+        }
+        if (hostname)
+                *hostname++ = 0;
+
+        addr = zero_addr;
+        Field(buf, addr.ipx_net.c_net, 4);
+        if (hostname == 0)
+                return (addr);  /* No separator means net only */
+
+        socketname = strchr(hostname, separator);
+        if (socketname) {
+                *socketname++ = 0;
+                Field(socketname, (u_char *)&addr.ipx_port, 2);
+        }
+
+        Field(hostname, addr.ipx_host.c_host, 6);
+
+        return (addr);
+}
+
+static void
+Field(buf, out, len)
+        char *buf;
+        u_char *out;
+        int len;
+{
+        register char *bp = buf;
+        int i, ibase, base16 = 0, base10 = 0, clen = 0;
+        int hb[6], *hp;
+        char *fmt;
+
+        /*
+         * first try 2-273#2-852-151-014#socket
+         */
+        if ((*buf != '-') &&
+            (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
+                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
+                cvtbase(1000L, 256, hb, i, out, len);
+                return;
+        }
+        /*
+         * try form 8E1#0.0.AA.0.5E.E6#socket
+         */
+        if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
+                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
+                cvtbase(256L, 256, hb, i, out, len);
+                return;
+        }
+        /*
+         * try form 8E1#0:0:AA:0:5E:E6#socket
+         */
+        if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
+                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
+                cvtbase(256L, 256, hb, i, out, len);
+                return;
+        }
+        /*
+         * This is REALLY stretching it but there was a
+         * comma notation separting shorts -- definitely non standard
+         */
+        if (1 < (i = sscanf(buf,"%x,%x,%x",
+                        &hb[0], &hb[1], &hb[2]))) {
+                hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
+                hb[2] = htons(hb[2]);
+                cvtbase(65536L, 256, hb, i, out, len);
+                return;
+        }
+
+        /* Need to decide if base 10, 16 or 8 */
+        while (*bp) switch (*bp++) {
+
+        case '0': case '1': case '2': case '3': case '4': case '5':
+        case '6': case '7': case '-':
+                break;
+
+        case '8': case '9':
+                base10 = 1;
+                break;
+
+        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+                base16 = 1;
+                break;
+        
+        case 'x': case 'X':
+                *--bp = '0';
+                base16 = 1;
+                break;
+
+        case 'h': case 'H':
+                base16 = 1;
+                /* fall into */
+
+        default:
+                *--bp = 0; /* Ends Loop */
+        }
+        if (base16) {
+                fmt = "%3x";
+                ibase = 4096;
+        } else if (base10 == 0 && *buf == '0') {
+                fmt = "%3o";
+                ibase = 512;
+        } else {
+                fmt = "%3d";
+                ibase = 1000;
+        }
+
+        for (bp = buf; *bp++; ) clen++;
+        if (clen == 0) clen++;
+        if (clen > 18) clen = 18;
+        i = ((clen - 1) / 3) + 1;
+        bp = clen + buf - 3;
+        hp = hb + i - 1;
+
+        while (hp > hb) {
+                (void)sscanf(bp, fmt, hp);
+                bp[0] = 0;
+                hp--;
+                bp -= 3;
+        }
+        (void)sscanf(buf, fmt, hp);
+        cvtbase((long)ibase, 256, hb, i, out, len);
+}
+
+static void
+cvtbase(oldbase,newbase,input,inlen,result,reslen)
+        long oldbase;
+        int newbase;
+        int input[];
+        int inlen;
+        unsigned char result[];
+        int reslen;
+{
+        int d, e;
+        long sum;
+
+        e = 1;
+        while (e > 0 && reslen > 0) {
+                d = 0; e = 0; sum = 0;
+                /* long division: input=input/newbase */
+                while (d < inlen) {
+                        sum = sum*oldbase + (long) input[d];
+                        e += (sum > 0);
+                        input[d++] = sum / newbase;
+                        sum %= newbase;
+                }
+                result[--reslen] = sum; /* accumulate remainder */
+        }
+        for (d=0; d < reslen; d++)
+                result[d] = 0;
+}
diff --git a/src/lib/libc/net/ipx_ntoa.c b/src/lib/libc/net/ipx_ntoa.c
new file mode 100644
index 0000000000..1dcfe7181b
--- /dev/null
+++ b/src/lib/libc/net/ipx_ntoa.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1986, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: ipx_ntoa.c,v 1.2 1996/08/19 08:29:20 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netipx/ipx.h>
+#include <stdio.h>
+
+char *
+ipx_ntoa(addr)
+        struct ipx_addr addr;
+{
+        static char obuf[] = "xxxx.xx:xx:xx:xx:xx:xx.uuuuu";
+
+        sprintf(obuf, "%8xH.%02x:%02x:%02x:%02x:%02x:%02x.%u",
+                ntohl(addr.ipx_net.l_net),
+                addr.ipx_host.c_host[0],
+                addr.ipx_host.c_host[1],
+                addr.ipx_host.c_host[2],
+                addr.ipx_host.c_host[3],
+                addr.ipx_host.c_host[4],
+                addr.ipx_host.c_host[5],
+                ntohs(addr.ipx_port));
+        return (obuf);
+}
diff --git a/src/lib/libc/net/iso_addr.3 b/src/lib/libc/net/iso_addr.3
new file mode 100644
index 0000000000..d9bf9086be
--- /dev/null
+++ b/src/lib/libc/net/iso_addr.3
@@ -0,0 +1,110 @@
+.\"     $OpenBSD: iso_addr.3,v 1.2 1996/08/19 08:29:22 tholo Exp $
+.\"
+.\" Copyright (c) 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt ISO_ADDR 3
+.Os
+.Sh NAME
+.Nm iso_addr ,
+.Nm iso_ntoa
+.Nd "elementary network address conversion routines for Open System Interconnection
+.Sh SYNOPSIS
+.Fd #include <sys/types.h>
+.Fd #include <netiso/iso.h>
+.Ft struct iso_addr *
+.Fn iso_addr "char *cp"
+.Ft char *
+.Fn iso_ntoa "struct iso_addr *isoa"
+.Sh DESCRIPTION
+The routine
+.Fn iso_addr
+interprets character strings representing
+.Tn OSI
+addresses, returning binary information suitable
+for use in system calls.
+The routine
+.Fn iso_ntoa
+takes
+.Tn OSI
+addresses and returns
+.Tn ASCII
+strings representing NSAPs (network service
+access points) in a
+notation inverse to that accepted by 
+.Fn iso_addr .
+.Pp
+Unfortunately, no universal standard exists for representing
+.Tn OSI
+network addresses.
+.Pp
+The format employed by
+.Fn iso_addr
+is a sequence of hexadecimal
+.Dq digits
+(optionally separated by periods),
+of the form:
+.Bd -filled -offset indent
+<hex digits>.<hex digits>.<hex digits>
+.Ed
+.Pp
+Each pair of hexadecimal digits represents a byte
+with the leading digit indicating the higher-ordered bits.
+A period following an even number of bytes has no
+effect (but may be used to increase legibility).
+A period following an odd number of bytes has the
+effect of causing the byte of address being translated
+to have its higher order bits filled with zeros.
+.Sh RETURN VALUES
+.Fn iso_ntoa
+always returns a null terminated string.
+.Fn iso_addr
+always returns a pointer to a struct iso_addr.
+(See
+.Sx BUGS . )
+.Sh SEE ALSO
+.Xr iso 4
+.Sh HISTORY
+The
+.Fn iso_addr
+and
+.Fn iso_ntoa
+functions appeared in 
+.Bx 4.3 Reno .
+.Sh BUGS
+The returned values
+reside in a static memory area.
+.Pp
+The function
+.Fn iso_addr
+should diagnose improperly formed input, and there should be an unambiguous
+way to recognize this.
diff --git a/src/lib/libc/net/iso_addr.c b/src/lib/libc/net/iso_addr.c
new file mode 100644
index 0000000000..01561e395b
--- /dev/null
+++ b/src/lib/libc/net/iso_addr.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 1989, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: iso_addr.c,v 1.2 1996/08/19 08:29:23 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <netiso/iso.h>
+#include <string.h>
+
+/* States*/
+#define VIRGIN  0
+#define GOTONE  1
+#define GOTTWO  2
+/* Inputs */
+#define DIGIT   (4*0)
+#define END     (4*1)
+#define DELIM   (4*2)
+
+struct iso_addr *
+iso_addr(addr)
+        register const char *addr;
+{
+        static struct iso_addr out_addr;
+        register char *cp = out_addr.isoa_genaddr;
+        char *cplim = cp + sizeof(out_addr.isoa_genaddr);
+        register int byte = 0, state = VIRGIN, new;
+
+        bzero((char *)&out_addr, sizeof(out_addr));
+        do {
+                if ((*addr >= '0') && (*addr <= '9')) {
+                        new = *addr - '0';
+                } else if ((*addr >= 'a') && (*addr <= 'f')) {
+                        new = *addr - 'a' + 10;
+                } else if ((*addr >= 'A') && (*addr <= 'F')) {
+                        new = *addr - 'A' + 10;
+                } else if (*addr == 0) 
+                        state |= END;
+                else
+                        state |= DELIM;
+                addr++;
+                switch (state /* | INPUT */) {
+                case GOTTWO | DIGIT:
+                        *cp++ = byte; /*FALLTHROUGH*/
+                case VIRGIN | DIGIT:
+                        state = GOTONE; byte = new; continue;
+                case GOTONE | DIGIT:
+                        state = GOTTWO; byte = new + (byte << 4); continue;
+                default: /* | DELIM */
+                        state = VIRGIN; *cp++ = byte; byte = 0; continue;
+                case GOTONE | END:
+                case GOTTWO | END:
+                        *cp++ = byte; /* FALLTHROUGH */
+                case VIRGIN | END:
+                        break;
+                }
+                break;
+        } while (cp < cplim); 
+        out_addr.isoa_len = cp - out_addr.isoa_genaddr;
+        return (&out_addr);
+}
+static char hexlist[] = "0123456789abcdef";
+
+char *
+iso_ntoa(isoa)
+        const struct iso_addr *isoa;
+{
+        static char obuf[64];
+        register char *out = obuf; 
+        register int i;
+        register u_char *in = (u_char *)isoa->isoa_genaddr;
+        u_char *inlim = in + isoa->isoa_len;
+
+        out[1] = 0;
+        while (in < inlim) {
+                i = *in++;
+                *out++ = '.';
+                if (i > 0xf) {
+                        out[1] = hexlist[i & 0xf];
+                        i >>= 4;
+                        out[0] = hexlist[i];
+                        out += 2;
+                } else
+                        *out++ = hexlist[i];
+        }
+        *out = 0;
+        return(obuf + 1);
+}
diff --git a/src/lib/libc/net/link_addr.3 b/src/lib/libc/net/link_addr.3
new file mode 100644
index 0000000000..eb6c952177
--- /dev/null
+++ b/src/lib/libc/net/link_addr.3
@@ -0,0 +1,131 @@
+.\"     $OpenBSD: link_addr.3,v 1.2 1996/08/19 08:29:25 tholo Exp $
+.\"
+.\" Copyright (c) 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Donn Seeley at BSDI.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd July 28, 1993
+.Dt LINK_ADDR 3
+.Os BSD 4.4
+.Sh NAME
+.Nm link_addr ,
+.Nm link_ntoa
+.Nd elementary address specification routines for link level access
+.Sh SYNOPSIS
+.Fd #include <sys/types.h>
+.Fd #include <sys/socket.h>
+.Fd #include <net/if_dl.h>
+.Ft void
+.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
+.Ft char *
+.Fn link_ntoa "const struct sockaddr_dl *sdl"
+.Sh DESCRIPTION
+The routine
+.Fn link_addr
+interprets character strings representing
+link-level addresses, returning binary information suitable
+for use in system calls.
+The routine
+.Fn link_ntoa
+takes
+a link-level
+address and returns an
+.Tn ASCII
+string representing some of the information present,
+including the link level address itself, and the interface name
+or number, if present.
+This facility is experimental and is
+still subject to change.
+.Pp
+For
+.Fn link_addr ,
+the string
+.Fa addr
+may contain
+an optional network interface identifier of the form
+.Dq "name unit-number" ,
+suitable for the first argument to
+.Xr ifconfig 4 ,
+followed in all cases by a colon and
+an interface address in the form of
+groups of hexadecimal digits
+separated by periods.
+Each group represents a byte of address;
+address bytes are filled left to right from
+low order bytes through high order bytes.
+.Pp
+.\" A regular expression may make this format clearer:
+.\" .Bd -literal -offset indent
+.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
+.\" .Ed
+.\" .Pp
+Thus
+.Li le0:8.0.9.13.d.30
+represents an ethernet address
+to be transmitted on the first Lance ethernet interface.
+.Sh RETURN VALUES
+.Fn link_ntoa
+always returns a null terminated string.
+.Fn link_addr
+has no return value.
+(See
+.Sx BUGS . )
+.Sh SEE ALSO
+.Xr iso 4 ,
+.Sh HISTORY
+The
+.Fn link_addr
+and
+.Fn link_ntoa
+functions appeared in 
+.Bx 4.3 Reno  .
+.Sh BUGS
+The returned values for link_ntoa
+reside in a static memory area.
+.Pp
+The function
+.Fn link_addr
+should diagnose improperly formed input, and there should be an unambiguous
+way to recognize this.
+.Pp
+If the
+.Va sdl_len
+field of the link socket address
+.Fa sdl
+is 0,
+.Fn link_ntoa
+will not insert a colon before the interface address bytes.
+If this translated address is given to
+.Fn link_addr
+without inserting an initial colon,
+the latter will not interpret it correctly.
diff --git a/src/lib/libc/net/linkaddr.c b/src/lib/libc/net/linkaddr.c
new file mode 100644
index 0000000000..fb522f3233
--- /dev/null
+++ b/src/lib/libc/net/linkaddr.c
@@ -0,0 +1,158 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: linkaddr.c,v 1.2 1996/08/19 08:29:27 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if_dl.h>
+#include <string.h>
+
+/* States*/
+#define NAMING  0
+#define GOTONE  1
+#define GOTTWO  2
+#define RESET   3
+/* Inputs */
+#define DIGIT   (4*0)
+#define END     (4*1)
+#define DELIM   (4*2)
+#define LETTER  (4*3)
+
+void
+link_addr(addr, sdl)
+        register const char *addr;
+        register struct sockaddr_dl *sdl;
+{
+        register char *cp = sdl->sdl_data;
+        char *cplim = sdl->sdl_len + (char *)sdl;
+        register int byte = 0, state = NAMING, new;
+
+        bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
+        sdl->sdl_family = AF_LINK;
+        do {
+                state &= ~LETTER;
+                if ((*addr >= '0') && (*addr <= '9')) {
+                        new = *addr - '0';
+                } else if ((*addr >= 'a') && (*addr <= 'f')) {
+                        new = *addr - 'a' + 10;
+                } else if ((*addr >= 'A') && (*addr <= 'F')) {
+                        new = *addr - 'A' + 10;
+                } else if (*addr == 0) {
+                        state |= END;
+                } else if (state == NAMING &&
+                           (((*addr >= 'A') && (*addr <= 'Z')) ||
+                           ((*addr >= 'a') && (*addr <= 'z'))))
+                        state |= LETTER;
+                else
+                        state |= DELIM;
+                addr++;
+                switch (state /* | INPUT */) {
+                case NAMING | DIGIT:
+                case NAMING | LETTER:
+                        *cp++ = addr[-1];
+                        continue;
+                case NAMING | DELIM:
+                        state = RESET;
+                        sdl->sdl_nlen = cp - sdl->sdl_data;
+                        continue;
+                case GOTTWO | DIGIT:
+                        *cp++ = byte;
+                        /* FALLTHROUGH */
+                case RESET | DIGIT:
+                        state = GOTONE;
+                        byte = new;
+                        continue;
+                case GOTONE | DIGIT:
+                        state = GOTTWO;
+                        byte = new + (byte << 4);
+                        continue;
+                default: /* | DELIM */
+                        state = RESET;
+                        *cp++ = byte;
+                        byte = 0;
+                        continue;
+                case GOTONE | END:
+                case GOTTWO | END:
+                        *cp++ = byte;
+                        /* FALLTHROUGH */
+                case RESET | END:
+                        break;
+                }
+                break;
+        } while (cp < cplim); 
+        sdl->sdl_alen = cp - LLADDR(sdl);
+        new = cp - (char *)sdl;
+        if (new > sizeof(*sdl))
+                sdl->sdl_len = new;
+        return;
+}
+
+static char hexlist[] = "0123456789abcdef";
+
+char *
+link_ntoa(sdl)
+        register const struct sockaddr_dl *sdl;
+{
+        static char obuf[64];
+        register char *out = obuf; 
+        register int i;
+        register u_char *in = (u_char *)LLADDR(sdl);
+        u_char *inlim = in + sdl->sdl_alen;
+        int firsttime = 1;
+
+        if (sdl->sdl_nlen) {
+                bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
+                out += sdl->sdl_nlen;
+                if (sdl->sdl_alen)
+                        *out++ = ':';
+        }
+        while (in < inlim) {
+                if (firsttime)
+                        firsttime = 0;
+                else
+                        *out++ = '.';
+                i = *in++;
+                if (i > 0xf) {
+                        out[1] = hexlist[i & 0xf];
+                        i >>= 4;
+                        out[0] = hexlist[i];
+                        out += 2;
+                } else
+                        *out++ = hexlist[i];
+        }
+        *out = 0;
+        return (obuf);
+}
diff --git a/src/lib/libc/net/ns.3 b/src/lib/libc/net/ns.3
new file mode 100644
index 0000000000..6e096d9f4b
--- /dev/null
+++ b/src/lib/libc/net/ns.3
@@ -0,0 +1,130 @@
+.\"     $OpenBSD: ns.3,v 1.2 1996/08/19 08:29:29 tholo Exp $
+.\"
+.\" Copyright (c) 1986, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt NS 3
+.Os BSD 4.3
+.Sh NAME
+.Nm ns_addr ,
+.Nm ns_ntoa
+.Nd Xerox
+.Tn NS Ns (tm)
+address conversion routines
+.Sh SYNOPSIS
+.Fd #include <sys/types.h>
+.Fd #include <netns/ns.h>
+.Ft struct ns_addr 
+.Fn ns_addr "char *cp"
+.Ft char *
+.Fn ns_ntoa "struct ns_addr ns"
+.Sh DESCRIPTION
+The routine
+.Fn ns_addr
+interprets character strings representing
+.Tn XNS
+addresses, returning binary information suitable
+for use in system calls.
+The routine
+.Fn ns_ntoa
+takes
+.Tn XNS
+addresses and returns
+.Tn ASCII
+strings representing the address in a
+notation in common use in the Xerox Development Environment:
+.Bd -filled -offset indent
+<network number>.<host number>.<port number>
+.Ed
+.Pp
+Trailing zero fields are suppressed, and each number is printed in hexadecimal,
+in a format suitable for input to 
+.Fn ns_addr .
+Any fields lacking super-decimal digits will have a
+trailing
+.Ql H
+appended.
+.Pp
+Unfortunately, no universal standard exists for representing
+.Tn XNS
+addresses.
+An effort has been made to insure that
+.Fn ns_addr
+be compatible with most formats in common use.
+It will first separate an address into 1 to 3 fields using a single delimiter
+chosen from
+period
+.Ql \&. ,
+colon
+.Ql \&:
+or pound-sign
+.Ql \&# .
+Each field is then examined for byte separators (colon or period).
+If there are byte separators, each subfield separated is taken to be
+a small hexadecimal number, and the entirety is taken as a network-byte-ordered
+quantity to be zero extended in the high-network-order bytes.
+Next, the field is inspected for hyphens, in which case
+the field is assumed to be a number in decimal notation
+with hyphens separating the millenia.
+Next, the field is assumed to be a number:
+It is interpreted
+as hexadecimal if there is a leading
+.Ql 0x
+(as in C),
+a trailing
+.Ql H
+(as in Mesa), or there are any super-decimal digits present.
+It is interpreted as octal is there is a leading
+.Ql 0
+and there are no super-octal digits.
+Otherwise, it is converted as a decimal number.
+.Sh RETURN VALUES
+None. (See
+.Sx BUGS . )
+.Sh SEE ALSO
+.Xr hosts 5 ,
+.Xr networks 5 ,
+.Sh HISTORY
+The
+.Fn ns_addr
+and
+.Fn ns_toa
+functions appeared in 
+.Bx 4.3 .
+.Sh BUGS
+The string returned by
+.Fn ns_ntoa
+resides in a static memory area.
+The function
+.Fn ns_addr
+should diagnose improperly formed input, and there should be an unambiguous
+way to recognize this.
diff --git a/src/lib/libc/net/ns_addr.c b/src/lib/libc/net/ns_addr.c
new file mode 100644
index 0000000000..8f2e4bc513
--- /dev/null
+++ b/src/lib/libc/net/ns_addr.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 1986, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * J.Q. Johnson.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.4 1997/07/21 20:31:05 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netns/ns.h>
+#include <stdio.h>
+#include <string.h>
+
+static struct ns_addr addr, zero_addr;
+
+static void Field __P((char *, u_int8_t *, int));
+static void cvtbase __P((long, int, int[], int, u_int8_t[], int));
+
+struct ns_addr 
+ns_addr(name)
+        const char *name;
+{
+        char separator;
+        char *hostname, *socketname, *cp;
+        char buf[50];
+
+        (void)strncpy(buf, name, sizeof(buf) - 1);
+        buf[sizeof(buf) - 1] = '\0';
+
+        /*
+         * First, figure out what he intends as a field separtor.
+         * Despite the way this routine is written, the prefered
+         * form  2-272.AA001234H.01777, i.e. XDE standard.
+         * Great efforts are made to insure backward compatability.
+         */
+        if ((hostname = strchr(buf, '#')))
+                separator = '#';
+        else {
+                hostname = strchr(buf, '.');
+                if ((cp = strchr(buf, ':')) &&
+                    ((hostname && cp < hostname) || (hostname == 0))) {
+                        hostname = cp;
+                        separator = ':';
+                } else
+                        separator = '.';
+        }
+        if (hostname)
+                *hostname++ = 0;
+
+        addr = zero_addr;
+        Field(buf, addr.x_net.c_net, 4);
+        if (hostname == 0)
+                return (addr);  /* No separator means net only */
+
+        socketname = strchr(hostname, separator);
+        if (socketname) {
+                *socketname++ = 0;
+                Field(socketname, (u_char *)&addr.x_port, 2);
+        }
+
+        Field(hostname, (u_char *)addr.x_host.c_host, 6);
+
+        return (addr);
+}
+
+static void
+Field(buf, out, len)
+        char *buf;
+        u_char *out;
+        int len;
+{
+        register char *bp = buf;
+        int i, ibase, base16 = 0, base10 = 0, clen = 0;
+        int hb[6], *hp;
+        char *fmt;
+
+        /*
+         * first try 2-273#2-852-151-014#socket
+         */
+        if ((*buf != '-') &&
+            (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
+                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
+                cvtbase(1000L, 256, hb, i, out, len);
+                return;
+        }
+        /*
+         * try form 8E1#0.0.AA.0.5E.E6#socket
+         */
+        if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
+                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
+                cvtbase(256L, 256, hb, i, out, len);
+                return;
+        }
+        /*
+         * try form 8E1#0:0:AA:0:5E:E6#socket
+         */
+        if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
+                        &hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
+                cvtbase(256L, 256, hb, i, out, len);
+                return;
+        }
+        /*
+         * This is REALLY stretching it but there was a
+         * comma notation separting shorts -- definitely non standard
+         */
+        if (1 < (i = sscanf(buf,"%x,%x,%x",
+                        &hb[0], &hb[1], &hb[2]))) {
+                hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
+                hb[2] = htons(hb[2]);
+                cvtbase(65536L, 256, hb, i, out, len);
+                return;
+        }
+
+        /* Need to decide if base 10, 16 or 8 */
+        while (*bp) switch (*bp++) {
+
+        case '0': case '1': case '2': case '3': case '4': case '5':
+        case '6': case '7': case '-':
+                break;
+
+        case '8': case '9':
+                base10 = 1;
+                break;
+
+        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+                base16 = 1;
+                break;
+        
+        case 'x': case 'X':
+                *--bp = '0';
+                base16 = 1;
+                break;
+
+        case 'h': case 'H':
+                base16 = 1;
+                /* fall into */
+
+        default:
+                *--bp = 0; /* Ends Loop */
+        }
+        if (base16) {
+                fmt = "%3x";
+                ibase = 4096;
+        } else if (base10 == 0 && *buf == '0') {
+                fmt = "%3o";
+                ibase = 512;
+        } else {
+                fmt = "%3d";
+                ibase = 1000;
+        }
+
+        for (bp = buf; *bp++; ) clen++;
+        if (clen == 0) clen++;
+        if (clen > 18) clen = 18;
+        i = ((clen - 1) / 3) + 1;
+        bp = clen + buf - 3;
+        hp = hb + i - 1;
+
+        while (hp > hb) {
+                (void)sscanf(bp, fmt, hp);
+                bp[0] = 0;
+                hp--;
+                bp -= 3;
+        }
+        (void)sscanf(buf, fmt, hp);
+        cvtbase((long)ibase, 256, hb, i, out, len);
+}
+
+static void
+cvtbase(oldbase,newbase,input,inlen,result,reslen)
+        long oldbase;
+        int newbase;
+        int input[];
+        int inlen;
+        unsigned char result[];
+        int reslen;
+{
+        int d, e;
+        long sum;
+
+        e = 1;
+        while (e > 0 && reslen > 0) {
+                d = 0; e = 0; sum = 0;
+                /* long division: input=input/newbase */
+                while (d < inlen) {
+                        sum = sum*oldbase + (long) input[d];
+                        e += (sum > 0);
+                        input[d++] = sum / newbase;
+                        sum %= newbase;
+                }
+                result[--reslen] = sum; /* accumulate remainder */
+        }
+        for (d=0; d < reslen; d++)
+                result[d] = 0;
+}
diff --git a/src/lib/libc/net/ns_ntoa.c b/src/lib/libc/net/ns_ntoa.c
new file mode 100644
index 0000000000..c33f710966
--- /dev/null
+++ b/src/lib/libc/net/ns_ntoa.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 1986, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.7 1997/08/24 21:25:48 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netns/ns.h>
+#include <stdio.h>
+
+static char *spectHex __P((char *));
+
+char *
+ns_ntoa(addr)
+        struct ns_addr addr;
+{
+        static char obuf[40];
+        union { union ns_net net_e; u_int32_t long_e; } net;
+        in_port_t port = htons(addr.x_port);
+        register char *cp;
+        char *cp2;
+        register u_char *up = addr.x_host.c_host;
+        u_char *uplim = up + 6;
+
+        net.net_e = addr.x_net;
+        sprintf(obuf, "%x", ntohl(net.long_e));
+        cp = spectHex(obuf);
+        cp2 = cp + 1;
+        while (*up==0 && up < uplim) up++;
+        if (up == uplim) {
+                if (port) {
+                        sprintf(cp, ".0");
+                        cp += 2;
+                }
+        } else {
+                sprintf(cp, ".%x", *up++);
+                while (up < uplim) {
+                        while (*cp) cp++;
+                        sprintf(cp, "%02x", *up++);
+                }
+                cp = spectHex(cp2);
+        }
+        if (port) {
+                sprintf(cp, ".%x", port);
+                spectHex(cp + 1);
+        }
+        return (obuf);
+}
+
+static char *
+spectHex(p0)
+        char *p0;
+{
+        int ok = 0;
+        int nonzero = 0;
+        register char *p = p0;
+        for (; *p; p++) switch (*p) {
+
+        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+                *p += ('A' - 'a');
+                /* fall into . . . */
+        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+                ok = 1;
+        case '1': case '2': case '3': case '4': case '5':
+        case '6': case '7': case '8': case '9':
+                nonzero = 1;
+        }
+        if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
+        return (p);
+}
diff --git a/src/lib/libc/net/nsap_addr.c b/src/lib/libc/net/nsap_addr.c
new file mode 100644
index 0000000000..22a5f8d66e
--- /dev/null
+++ b/src/lib/libc/net/nsap_addr.c
@@ -0,0 +1,109 @@
+/*      $OpenBSD: nsap_addr.c,v 1.4 1997/07/09 01:08:45 millert Exp $   */
+
+/*
+ * Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char rcsid[] = "$From: nsap_addr.c,v 8.3 1996/08/05 08:31:35 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: nsap_addr.c,v 1.4 1997/07/09 01:08:45 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <ctype.h>
+#include <resolv.h>
+
+static char
+xtob(c)
+        register int c;
+{
+        return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
+}
+
+u_int
+inet_nsap_addr(ascii, binary, maxlen)
+        const char *ascii;
+        u_char *binary;
+        int maxlen;
+{
+        register u_char c, nib;
+        u_int len = 0;
+
+        while ((c = *ascii++) != '\0' && len < maxlen) {
+                if (c == '.' || c == '+' || c == '/')
+                        continue;
+                if (!isascii(c))
+                        return (0);
+                if (islower(c))
+                        c = toupper(c);
+                if (isxdigit(c)) {
+                        nib = xtob(c);
+                        if ((c = *ascii++)) {
+                                c = toupper(c);
+                                if (isxdigit(c)) {
+                                        *binary++ = (nib << 4) | xtob(c);
+                                        len++;
+                                } else
+                                        return (0);
+                        }
+                        else
+                                return (0);
+                }
+                else
+                        return (0);
+        }
+        return (len);
+}
+
+char *
+inet_nsap_ntoa(binlen, binary, ascii)
+        int binlen;
+        register const u_char *binary;
+        register char *ascii;
+{
+        register int nib;
+        int i;
+        static char tmpbuf[255*3];
+        char *start;
+
+        if (ascii)
+                start = ascii;
+        else {
+                ascii = tmpbuf;
+                start = tmpbuf;
+        }
+
+        if (binlen > 255)
+                binlen = 255;
+
+        for (i = 0; i < binlen; i++) {
+                nib = *binary >> 4;
+                *ascii++ = nib + (nib < 10 ? '0' : '7');
+                nib = *binary++ & 0x0f;
+                *ascii++ = nib + (nib < 10 ? '0' : '7');
+                if (((i % 2) == 0 && (i + 1) < binlen))
+                        *ascii++ = '.';
+        }
+        *ascii = '\0';
+        return (start);
+}
diff --git a/src/lib/libc/net/ntohl.c b/src/lib/libc/net/ntohl.c
new file mode 100644
index 0000000000..7d3e227e60
--- /dev/null
+++ b/src/lib/libc/net/ntohl.c
@@ -0,0 +1,25 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: ntohl.c,v 1.4 1996/12/12 03:19:56 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <machine/endian.h>
+
+#undef ntohl
+
+u_int32_t
+ntohl(x)
+        u_int32_t x;
+{
+#if BYTE_ORDER == LITTLE_ENDIAN
+        u_char *s = (u_char *)&x;
+        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
+#else
+        return x;
+#endif
+}
diff --git a/src/lib/libc/net/ntohs.c b/src/lib/libc/net/ntohs.c
new file mode 100644
index 0000000000..cf6414d4a6
--- /dev/null
+++ b/src/lib/libc/net/ntohs.c
@@ -0,0 +1,29 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: ntohs.c,v 1.6 1997/07/25 20:30:07 mickey Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <machine/endian.h>
+
+#undef ntohs
+
+u_int16_t
+#ifdef __STDC__
+ntohs(u_int16_t x)
+#else
+ntohs(x)
+        u_int16_t x;
+#endif
+{
+#if BYTE_ORDER == LITTLE_ENDIAN
+        u_char *s = (u_char *) &x;
+        return (u_int16_t)(s[0] << 8 | s[1]);
+#else
+        return x;
+#endif
+}
diff --git a/src/lib/libc/net/rcmd.3 b/src/lib/libc/net/rcmd.3
new file mode 100644
index 0000000000..e69e822834
--- /dev/null
+++ b/src/lib/libc/net/rcmd.3
@@ -0,0 +1,227 @@
+.\"     $OpenBSD: rcmd.3,v 1.10 1997/09/29 18:25:47 deraadt Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt RCMD 3
+.Os BSD 4.2
+.Sh NAME
+.Nm rcmd ,
+.Nm rresvport ,
+.Nm iruserok ,
+.Nm ruserok
+.Nd routines for returning a stream to a remote command
+.Sh SYNOPSIS
+.Fd #include <unistd.h>
+.Ft int
+.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
+.Ft int
+.Fn rresvport "int *port"
+.Ft int
+.Fn iruserok "u_int32_t raddr" "int superuser" "const char *ruser" "const char *luser"
+.Ft int
+.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
+.Sh DESCRIPTION
+The
+.Fn rcmd
+function
+is used by the super-user to execute a command on a remote
+machine using an authentication scheme based on reserved
+port numbers.  If the calling process is not setuid and the
+.Li RSH
+environment variable is set and
+.Fa inport
+is
+.Li shell/tcp ,
+.Xr rcmdsh 3
+is called instead with the value of
+.Li RSH .
+Alternately, if the user is not the super-user,
+.Fn rcmd
+will invoke
+.Xr rcmdsh 3
+to run the command via
+.Xr rsh 1 .
+The
+.Fn rresvport
+function
+returns a descriptor to a socket
+with an address in the privileged port space.
+The
+.Fn iruserok
+and
+.Fn ruserok
+functions are used by servers
+to authenticate clients requesting service with
+.Fn rcmd .
+All four functions are present in the same file and are used
+by the
+.Xr rshd 8
+server (among others).
+.Pp
+The
+.Fn rcmd
+function
+looks up the host
+.Fa *ahost
+using
+.Xr gethostbyname 3 ,
+returning \-1 if the host does not exist.
+Otherwise
+.Fa *ahost
+is set to the standard name of the host
+and a connection is established to a server
+residing at the well-known Internet port
+.Fa inport .
+If the user is not the super-user, the only valid port is
+.Li shell/tcp ,
+(usually port 514).
+.Pp
+If the connection succeeds,
+a socket in the Internet domain of type
+.Dv SOCK_STREAM
+is returned to the caller, and given to the remote
+command as 
+.Em stdin
+and
+.Em stdout .
+If
+.Fa fd2p
+is non-zero, then an auxiliary channel to a control
+process will be set up, and a descriptor for it will be placed
+in
+.Fa *fd2p .
+The control process will return diagnostic
+output from the command (unit 2) on this channel, and will also
+accept bytes on this channel as being
+.Tn UNIX
+signal numbers, to be
+forwarded to the process group of the command.
+If
+.Fa fd2p
+is 0, then the 
+.Em stderr
+(unit 2 of the remote
+command) will be made the same as the 
+.Em stdout
+and no
+provision is made for sending arbitrary signals to the remote process,
+although you may be able to get its attention by using out-of-band data.
+Note that if the user is not the super-user,
+.Fa fd2p
+must be 0.
+.Pp
+The protocol is described in detail in
+.Xr rshd 8 .
+.Pp
+The
+.Fn rresvport
+function is used to obtain a socket with a privileged
+address bound to it.  This socket is suitable for use
+by 
+.Fn rcmd
+and several other functions.  Privileged Internet ports are those
+in the range 0 to 1023.  Only the super-user
+is allowed to bind an address of this sort to a socket.
+.Fn rresvport
+needs to be seeded with a port number; if that port
+is not available it will find another.
+.Pp
+The
+.Fn iruserok
+and
+.Fn ruserok
+functions take a remote host's IP address or name, respectively,
+two user names and a flag indicating whether the local user's
+name is that of the super-user.
+Then, if the user is
+.Em NOT
+the super-user, it checks the
+.Pa /etc/hosts.equiv
+file.
+If that lookup is not done, or is unsuccessful, the
+.Pa .rhosts
+in the local user's home directory is checked to see if the request for
+service is allowed.
+.Pp
+If this file does not exist, is not a regular file, is owned by anyone
+other than the user or the super-user, or is writeable by anyone other
+than the owner, the check automatically fails.
+Zero is returned if the machine name is listed in the
+.Dq Pa hosts.equiv
+file, or the host and remote user name are found in the
+.Dq Pa .rhosts
+file; otherwise
+.Fn iruserok
+and
+.Fn ruserok
+return \-1.
+If the local domain (as obtained from
+.Xr gethostname 3 )
+is the same as the remote domain, only the machine name need be specified.
+.Pp
+If the IP address of the remote host is known,
+.Fn iruserok
+should be used in preference to
+.Fn ruserok ,
+as it does not require trusting the DNS server for the remote host's domain.
+.Sh DIAGNOSTICS
+The
+.Fn rcmd
+function
+returns a valid socket descriptor on success.
+It returns \-1 on error and prints a diagnostic message on the standard error.
+.Pp
+The
+.Fn rresvport
+function
+returns a valid, bound socket descriptor on success.
+It returns \-1 on error with the global value
+.Va errno
+set according to the reason for failure.
+The error code
+.Dv EAGAIN
+is overloaded to mean ``All network ports in use.''
+.Sh SEE ALSO
+.Xr rlogin 1 ,
+.Xr rsh 1 ,
+.Xr intro 2 ,
+.Xr rexec 3 ,
+.Xr rcmdsh 3 ,
+.Xr rexecd 8 ,
+.Xr rlogind 8 ,
+.Xr bindresvport 3 ,
+.Xr rshd 8
+.Sh HISTORY
+These
+functions appeared in 
+.Bx 4.2 .
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
new file mode 100644
index 0000000000..c933f5b447
--- /dev/null
+++ b/src/lib/libc/net/rcmd.c
@@ -0,0 +1,607 @@
+/*
+ * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
+ * Copyright (c) 1983, 1993, 1994
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ *      This product includes software developed by Theo de Raadt.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.31 1998/03/19 00:30:05 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <signal.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <syslog.h>
+#include <stdlib.h>
+#include <netgroup.h>
+
+int     __ivaliduser __P((FILE *, in_addr_t, const char *, const char *));
+static int __icheckhost __P((u_int32_t, const char *));
+static char *__gethostloop __P((u_int32_t));
+
+int
+rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
+        char **ahost;
+        in_port_t rport;
+        const char *locuser, *remuser, *cmd;
+        int *fd2p;
+{
+        struct hostent *hp;
+        struct sockaddr_in sin, from;
+        fd_set *readsp = NULL;
+        int oldmask;
+        pid_t pid;
+        int s, lport, timo;
+        char c, *p;
+
+        /* call rcmdsh() with specified remote shell if appropriate. */
+        if (!issetugid() && (p = getenv("RSH"))) {
+                struct servent *sp = getservbyname("shell", "tcp");
+
+                if (sp && sp->s_port == rport)
+                        return (rcmdsh(ahost, rport, locuser, remuser,
+                            cmd, p));
+        }
+
+        /* use rsh(1) if non-root and remote port is shell. */
+        if (geteuid()) {
+                struct servent *sp = getservbyname("shell", "tcp");
+
+                if (sp && sp->s_port == rport)
+                        return (rcmdsh(ahost, rport, locuser, remuser,
+                            cmd, NULL));
+        }
+
+        pid = getpid();
+        hp = gethostbyname(*ahost);
+        if (hp == NULL) {
+                herror(*ahost);
+                return (-1);
+        }
+        *ahost = hp->h_name;
+
+        oldmask = sigblock(sigmask(SIGURG));
+        for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
+                s = rresvport(&lport);
+                if (s < 0) {
+                        if (errno == EAGAIN)
+                                (void)fprintf(stderr,
+                                    "rcmd: socket: All ports in use\n");
+                        else
+                                (void)fprintf(stderr, "rcmd: socket: %s\n",
+                                    strerror(errno));
+                        sigsetmask(oldmask);
+                        return (-1);
+                }
+                fcntl(s, F_SETOWN, pid);
+                bzero(&sin, sizeof sin);
+                sin.sin_len = sizeof(struct sockaddr_in);
+                sin.sin_family = hp->h_addrtype;
+                sin.sin_port = rport;
+                bcopy(hp->h_addr_list[0], &sin.sin_addr, hp->h_length);
+                if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
+                        break;
+                (void)close(s);
+                if (errno == EADDRINUSE) {
+                        lport--;
+                        continue;
+                }
+                if (errno == ECONNREFUSED && timo <= 16) {
+                        (void)sleep(timo);
+                        timo *= 2;
+                        continue;
+                }
+                if (hp->h_addr_list[1] != NULL) {
+                        int oerrno = errno;
+
+                        (void)fprintf(stderr, "connect to address %s: ",
+                            inet_ntoa(sin.sin_addr));
+                        errno = oerrno;
+                        perror(0);
+                        hp->h_addr_list++;
+                        bcopy(hp->h_addr_list[0], &sin.sin_addr, hp->h_length);
+                        (void)fprintf(stderr, "Trying %s...\n",
+                            inet_ntoa(sin.sin_addr));
+                        continue;
+                }
+                (void)fprintf(stderr, "%s: %s\n", hp->h_name, strerror(errno));
+                sigsetmask(oldmask);
+                return (-1);
+        }
+#if 0
+        /*
+         * try to rresvport() to the same port. This will make rresvport()
+         * fail it's first bind, resulting in it choosing a random port.
+         */
+        lport--;
+#endif
+        if (fd2p == 0) {
+                write(s, "", 1);
+                lport = 0;
+        } else {
+                char num[8];
+                int s2 = rresvport(&lport), s3;
+                int len = sizeof(from);
+                int fdssize = howmany(MAX(s, s2)+1, NFDBITS) * sizeof(fd_mask);
+
+                if (s2 < 0)
+                        goto bad;
+                readsp = (fd_set *)malloc(fdssize);
+                if (readsp == NULL)
+                        goto bad;
+                listen(s2, 1);
+                (void)snprintf(num, sizeof(num), "%d", lport);
+                if (write(s, num, strlen(num)+1) != strlen(num)+1) {
+                        (void)fprintf(stderr,
+                            "rcmd: write (setting up stderr): %s\n",
+                            strerror(errno));
+                        (void)close(s2);
+                        goto bad;
+                }
+again:
+                bzero(readsp, fdssize);
+                FD_SET(s, readsp);
+                FD_SET(s2, readsp);
+                errno = 0;
+                if (select(MAX(s, s2) + 1, readsp, 0, 0, 0) < 1 ||
+                    !FD_ISSET(s2, readsp)) {
+                        if (errno != 0)
+                                (void)fprintf(stderr,
+                                    "rcmd: select (setting up stderr): %s\n",
+                                    strerror(errno));
+                        else
+                                (void)fprintf(stderr,
+                                "select: protocol failure in circuit setup\n");
+                        (void)close(s2);
+                        goto bad;
+                }
+                s3 = accept(s2, (struct sockaddr *)&from, &len);
+                /*
+                 * XXX careful for ftp bounce attacks. If discovered, shut them
+                 * down and check for the real auxiliary channel to connect.
+                 */
+                if (from.sin_family == AF_INET && from.sin_port == htons(20)) {
+                        close(s3);
+                        goto again;
+                }
+                (void)close(s2);
+                if (s3 < 0) {
+                        (void)fprintf(stderr,
+                            "rcmd: accept: %s\n", strerror(errno));
+                        lport = 0;
+                        goto bad;
+                }
+                *fd2p = s3;
+                from.sin_port = ntohs(from.sin_port);
+                if (from.sin_family != AF_INET ||
+                    from.sin_port >= IPPORT_RESERVED ||
+                    from.sin_port < IPPORT_RESERVED / 2) {
+                        (void)fprintf(stderr,
+                            "socket: protocol failure in circuit setup.\n");
+                        goto bad2;
+                }
+        }
+        (void)write(s, locuser, strlen(locuser)+1);
+        (void)write(s, remuser, strlen(remuser)+1);
+        (void)write(s, cmd, strlen(cmd)+1);
+        if (read(s, &c, 1) != 1) {
+                (void)fprintf(stderr,
+                    "rcmd: %s: %s\n", *ahost, strerror(errno));
+                goto bad2;
+        }
+        if (c != 0) {
+                while (read(s, &c, 1) == 1) {
+                        (void)write(STDERR_FILENO, &c, 1);
+                        if (c == '\n')
+                                break;
+                }
+                goto bad2;
+        }
+        sigsetmask(oldmask);
+        free(readsp);
+        return (s);
+bad2:
+        if (lport)
+                (void)close(*fd2p);
+bad:
+        if (readsp)
+                free(readsp);
+        (void)close(s);
+        sigsetmask(oldmask);
+        return (-1);
+}
+
+int
+rresvport(alport)
+        int *alport;
+{
+        struct sockaddr_in sin;
+        int s;
+
+        bzero(&sin, sizeof sin);
+        sin.sin_len = sizeof(struct sockaddr_in);
+        sin.sin_family = AF_INET;
+        sin.sin_addr.s_addr = INADDR_ANY;
+        s = socket(AF_INET, SOCK_STREAM, 0);
+        if (s < 0)
+                return (-1);
+        sin.sin_port = htons((in_port_t)*alport);
+        if (*alport < IPPORT_RESERVED - 1) {
+                if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
+                        return (s);
+                if (errno != EADDRINUSE) {
+                        (void)close(s);
+                        return (-1);
+                }
+        }
+        sin.sin_port = 0;
+        if (bindresvport(s, &sin) == -1) {
+                (void)close(s);
+                return (-1);
+        }
+        *alport = (int)ntohs(sin.sin_port);
+        return (s);
+}
+
+int     __check_rhosts_file = 1;
+char    *__rcmd_errstr;
+
+int
+ruserok(rhost, superuser, ruser, luser)
+        const char *rhost, *ruser, *luser;
+        int superuser;
+{
+        struct hostent *hp;
+        char **ap;
+        int i;
+#define MAXADDRS        35
+        u_int32_t addrs[MAXADDRS + 1];
+
+        if ((hp = gethostbyname(rhost)) == NULL)
+                return (-1);
+        for (i = 0, ap = hp->h_addr_list; *ap && i < MAXADDRS; ++ap, ++i)
+                bcopy(*ap, &addrs[i], sizeof(addrs[i]));
+        addrs[i] = 0;
+
+        for (i = 0; i < MAXADDRS && addrs[i]; i++)
+                if (iruserok((in_addr_t)addrs[i], superuser, ruser, luser) == 0)
+                        return (0);
+        return (-1);
+}
+
+/*
+ * New .rhosts strategy: We are passed an ip address. We spin through
+ * hosts.equiv and .rhosts looking for a match. When the .rhosts only
+ * has ip addresses, we don't have to trust a nameserver.  When it
+ * contains hostnames, we spin through the list of addresses the nameserver
+ * gives us and look for a match.
+ *
+ * Returns 0 if ok, -1 if not ok.
+ */
+int
+iruserok(raddr, superuser, ruser, luser)
+        u_int32_t raddr;
+        int superuser;
+        const char *ruser, *luser;
+{
+        register char *cp;
+        struct stat sbuf;
+        struct passwd *pwd;
+        FILE *hostf;
+        uid_t uid;
+        int first;
+        char pbuf[MAXPATHLEN];
+
+        first = 1;
+        hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
+again:
+        if (hostf) {
+                if (__ivaliduser(hostf, raddr, luser, ruser) == 0) {
+                        (void)fclose(hostf);
+                        return (0);
+                }
+                (void)fclose(hostf);
+        }
+        if (first == 1 && (__check_rhosts_file || superuser)) {
+                first = 0;
+                if ((pwd = getpwnam(luser)) == NULL)
+                        return (-1);
+                (void)strcpy(pbuf, pwd->pw_dir);
+                (void)strcat(pbuf, "/.rhosts");
+
+                /*
+                 * Change effective uid while opening .rhosts.  If root and
+                 * reading an NFS mounted file system, can't read files that
+                 * are protected read/write owner only.
+                 */
+                uid = geteuid();
+                (void)seteuid(pwd->pw_uid);
+                hostf = fopen(pbuf, "r");
+                (void)seteuid(uid);
+
+                if (hostf == NULL)
+                        return (-1);
+                /*
+                 * If not a regular file, or is owned by someone other than
+                 * user or root or if writeable by anyone but the owner, quit.
+                 */
+                cp = NULL;
+                if (lstat(pbuf, &sbuf) < 0)
+                        cp = ".rhosts lstat failed";
+                else if (!S_ISREG(sbuf.st_mode))
+                        cp = ".rhosts not regular file";
+                else if (fstat(fileno(hostf), &sbuf) < 0)
+                        cp = ".rhosts fstat failed";
+                else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
+                        cp = "bad .rhosts owner";
+                else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
+                        cp = ".rhosts writeable by other than owner";
+                /* If there were any problems, quit. */
+                if (cp) {
+                        __rcmd_errstr = cp;
+                        (void)fclose(hostf);
+                        return (-1);
+                }
+                goto again;
+        }
+        return (-1);
+}
+
+/*
+ * XXX
+ * Don't make static, used by lpd(8).
+ *
+ * Returns 0 if ok, -1 if not ok.
+ */
+int
+__ivaliduser(hostf, raddrl, luser, ruser)
+        FILE *hostf;
+        in_addr_t raddrl;
+        const char *luser, *ruser;
+{
+        register char *user, *p;
+        char *buf;
+        const char *auser, *ahost;
+        int hostok, userok;
+        char *rhost = (char *)-1;
+        char domain[MAXHOSTNAMELEN];
+        u_int32_t raddr = (u_int32_t)raddrl;
+        size_t buflen;
+
+        getdomainname(domain, sizeof(domain));
+
+        while ((buf = fgetln(hostf, &buflen))) {
+                p = buf;
+                if (*p == '#')
+                        continue;
+                while (*p != '\n' && *p != ' ' && *p != '\t' && p < buf + buflen) {
+                        if (!isprint(*p))
+                                goto bail;
+                        *p = isupper(*p) ? tolower(*p) : *p;
+                        p++;
+                }
+                if (p >= buf + buflen)
+                        continue;
+                if (*p == ' ' || *p == '\t') {
+                        *p++ = '\0';
+                        while ((*p == ' ' || *p == '\t') && p < buf + buflen)
+                                p++;
+                        if (p >= buf + buflen)
+                                continue;
+                        user = p;
+                        while (*p != '\n' && *p != ' ' &&
+                            *p != '\t' && p < buf + buflen) {
+                                if (!isprint(*p))
+                                        goto bail;
+                                p++;
+                        }
+                } else
+                        user = p;
+                *p = '\0';
+
+                if (p == buf)
+                        continue;
+
+                auser = *user ? user : luser;
+                ahost = buf;
+
+                if (strlen(ahost) >= MAXHOSTNAMELEN)
+                        continue;
+
+                /*
+                 * innetgr() must lookup a hostname (we do not attempt
+                 * to change the semantics so that netgroups may have
+                 * #.#.#.# addresses in the list.)
+                 */
+                if (ahost[0] == '+')
+                        switch (ahost[1]) {
+                        case '\0':
+                                hostok = 1;
+                                break;
+                        case '@':
+                                if (rhost == (char *)-1)
+                                        rhost = __gethostloop(raddr);
+                                hostok = 0;
+                                if (rhost)
+                                        hostok = innetgr(&ahost[2], rhost,
+                                            NULL, domain);
+                                break;
+                        default:
+                                hostok = __icheckhost(raddr, &ahost[1]);
+                                break;
+                        }
+                else if (ahost[0] == '-')
+                        switch (ahost[1]) {
+                        case '\0':
+                                hostok = -1;
+                                break;
+                        case '@':
+                                if (rhost == (char *)-1)
+                                        rhost = __gethostloop(raddr);
+                                hostok = 0;
+                                if (rhost)
+                                        hostok = -innetgr(&ahost[2], rhost,
+                                            NULL, domain);
+                                break;
+                        default:
+                                hostok = -__icheckhost(raddr, &ahost[1]);
+                                break;
+                        }
+                else
+                        hostok = __icheckhost(raddr, ahost);
+
+
+                if (auser[0] == '+')
+                        switch (auser[1]) {
+                        case '\0':
+                                userok = 1;
+                                break;
+                        case '@':
+                                userok = innetgr(&auser[2], NULL, ruser,
+                                    domain);
+                                break;
+                        default:
+                                userok = strcmp(ruser, &auser[1]) ? 0 : 1;
+                                break;
+                        }
+                else if (auser[0] == '-')
+                        switch (auser[1]) {
+                        case '\0':
+                                userok = -1;
+                                break;
+                        case '@':
+                                userok = -innetgr(&auser[2], NULL, ruser,
+                                    domain);
+                                break;
+                        default:
+                                userok = strcmp(ruser, &auser[1]) ? 0 : -1;
+                                break;
+                        }
+                else
+                        userok = strcmp(ruser, auser) ? 0 : 1;
+
+                /* Check if one component did not match */
+                if (hostok == 0 || userok == 0)
+                        continue;
+
+                /* Check if we got a forbidden pair */
+                if (userok <= -1 || hostok <= -1)
+                        return (-1);
+
+                /* Check if we got a valid pair */
+                if (hostok >= 1 && userok >= 1)
+                        return (0);
+        }
+bail:
+        return (-1);
+}
+
+/*
+ * Returns "true" if match, 0 if no match.  If we do not find any
+ * semblance of an A->PTR->A loop, allow a simple #.#.#.# match to work.
+ */
+static int
+__icheckhost(raddr, lhost)
+        u_int32_t raddr;
+        const char *lhost;
+{
+        register struct hostent *hp;
+        register char **pp;
+        struct in_addr in;
+
+        hp = gethostbyname(lhost);
+        if (hp != NULL) {
+                /* Spin through ip addresses. */
+                for (pp = hp->h_addr_list; *pp; ++pp)
+                        if (!bcmp(&raddr, *pp, sizeof(raddr)))
+                                return (1);
+        }
+
+        in.s_addr = raddr;
+        if (strcmp(lhost, inet_ntoa(in)) == 0)
+                return (1);
+        return (0);
+}
+
+/*
+ * Return the hostname associated with the supplied address.
+ * Do a reverse lookup as well for security. If a loop cannot
+ * be found, pack the result of inet_ntoa() into the string.
+ */
+static char *
+__gethostloop(raddr)
+        u_int32_t raddr;
+{
+        static char remotehost[MAXHOSTNAMELEN];
+        struct hostent *hp;
+        struct in_addr in;
+
+        hp = gethostbyaddr((char *) &raddr, sizeof(raddr), AF_INET);
+        if (hp == NULL)
+                return (NULL);
+
+        /*
+         * Look up the name and check that the supplied
+         * address is in the list
+         */
+        strncpy(remotehost, hp->h_name, sizeof(remotehost) - 1);
+        remotehost[sizeof(remotehost) - 1] = '\0';
+        hp = gethostbyname(remotehost);
+        if (hp == NULL)
+                return (NULL);
+
+        for (; hp->h_addr_list[0] != NULL; hp->h_addr_list++)
+                if (!bcmp(hp->h_addr_list[0], (caddr_t)&raddr, sizeof(raddr)))
+                        return (remotehost);
+
+        /*
+         * either the DNS adminstrator has made a configuration
+         * mistake, or someone has attempted to spoof us
+         */
+        in.s_addr = raddr;
+        syslog(LOG_NOTICE, "rcmd: address %s not listed for host %s",
+            inet_ntoa(in), hp->h_name);
+        return (NULL);
+}
diff --git a/src/lib/libc/net/rcmdsh.3 b/src/lib/libc/net/rcmdsh.3
new file mode 100644
index 0000000000..fd89acee8f
--- /dev/null
+++ b/src/lib/libc/net/rcmdsh.3
@@ -0,0 +1,108 @@
+.\"     $OpenBSD: rcmdsh.3,v 1.3 1998/06/26 17:54:09 millert Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd Sep 1, 1996
+.Dt RCMDSH 3
+.Os OpenBSD
+.Sh NAME
+.Nm rcmdsh
+.Nd return a stream to a remote command without superuser
+.Sh SYNOPSIS
+.Fd #include <unistd.h>
+.Ft int
+.Fn rcmdsh "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "char *rshprog"
+.Sh DESCRIPTION
+The
+.Fn rcmdsh
+function
+is used by normal users to execute a command on
+a remote machine using an authentication scheme based
+on reserved port numbers using
+.Xr rshd 8
+or the value of
+.Fa rshprog
+(if non-NULL).
+.Pp
+The
+.Fn rcmdsh
+function
+looks up the host
+.Fa *ahost
+using
+.Xr gethostbyname 3 ,
+returning \-1 if the host does not exist.
+Otherwise
+.Fa *ahost
+is set to the standard name of the host
+and a connection is established to a server
+residing at the well-known Internet port
+.Li shell/tcp
+(or whatever port is used by
+.Fa rshprog
+).  The parameter
+.Fa inport
+is ignored; it is only included to provide an interface similar to
+.Xr rcmd 3 .
+.Pp
+If the connection succeeds,
+a socket in the
+.Tn UNIX
+domain of type
+.Dv SOCK_STREAM
+is returned to the caller, and given to the remote
+command as 
+.Em stdin
+and
+.Em stdout ,
+and
+.Em stderr .
+.Sh DIAGNOSTICS
+The
+.Fn rcmdsh
+function
+returns a valid socket descriptor on success.
+It returns \-1 on error and prints a diagnostic message on the standard error.
+.Sh SEE ALSO
+.Xr rsh 1 ,
+.Xr socketpair 2 ,
+.Xr rcmd 3 ,
+.Xr rshd 8
+.Sh BUGS
+If
+.Xr rsh 1
+gets an error a file descriptor is still returned instead of \-1.
+.Sh HISTORY
+The
+.Fn rcmdsh
+function first appeared in
+.Ox 2.0 .
diff --git a/src/lib/libc/net/rcmdsh.c b/src/lib/libc/net/rcmdsh.c
new file mode 100644
index 0000000000..93523a4c56
--- /dev/null
+++ b/src/lib/libc/net/rcmdsh.c
@@ -0,0 +1,124 @@
+/*      $OpenBSD: rcmdsh.c,v 1.5 1998/04/25 16:23:58 millert Exp $      */ 
+
+/*
+ * This is an rcmd() replacement originally by 
+ * Chris Siebenmann <cks@utcc.utoronto.ca>.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: rcmdsh.c,v 1.5 1998/04/25 16:23:58 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include      <sys/types.h>
+#include      <sys/socket.h>
+#include      <sys/wait.h>
+#include      <signal.h>
+#include      <errno.h>
+#include      <netdb.h>
+#include      <stdio.h>
+#include      <string.h>
+#include      <pwd.h>
+#include      <paths.h>
+#include      <unistd.h>
+
+/*
+ * This is a replacement rcmd() function that uses the rsh(1)
+ * program in place of a direct rcmd(3) function call so as to
+ * avoid having to be root.  Note that rport is ignored.
+ */
+/* ARGSUSED */
+int
+rcmdsh(ahost, rport, locuser, remuser, cmd, rshprog)
+        char **ahost;
+        int rport;
+        const char *locuser, *remuser, *cmd;
+        char *rshprog;
+{
+        struct hostent *hp;
+        int cpid, sp[2];
+        char *p;
+        struct passwd *pw;
+
+        /* What rsh/shell to use. */
+        if (rshprog == NULL)
+                rshprog = _PATH_RSH;
+
+        /* locuser must exist on this host. */
+        if ((pw = getpwnam(locuser)) == NULL) {
+                (void) fprintf(stderr, "rcmdsh: unknown user: %s\n", locuser);
+                return(-1);
+        }
+
+        /* Validate remote hostname. */
+        if (strcmp(*ahost, "localhost") != 0) {
+                if ((hp = gethostbyname(*ahost)) == NULL) {
+                        herror(*ahost);
+                        return(-1);
+                }
+                *ahost = hp->h_name;
+        }
+
+        /* Get a socketpair we'll use for stdin and stdout. */
+        if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) < 0) {
+                perror("rcmdsh: socketpair");
+                return(-1);
+        }
+
+        cpid = fork();
+        if (cpid < 0) {
+                perror("rcmdsh: fork failed");
+                return(-1);
+        } else if (cpid == 0) {
+                /*
+                 * Child.  We use sp[1] to be stdin/stdout, and close sp[0].
+                 */
+                (void) close(sp[0]);
+                if (dup2(sp[1], 0) < 0 || dup2(0, 1) < 0) {
+                        perror("rcmdsh: dup2 failed");
+                        _exit(255);
+                }
+                /* Fork again to lose parent. */
+                cpid = fork();
+                if (cpid < 0) {
+                        perror("rcmdsh: fork to lose parent failed");
+                        _exit(255);
+                }
+                if (cpid > 0)
+                        _exit(0);
+
+                /* In grandchild here.  Become local user for rshprog. */
+                if (setuid(pw->pw_uid)) {
+                        (void) fprintf(stderr, "rcmdsh: setuid(%u): %s\n",
+                                       pw->pw_uid, strerror(errno));
+                        _exit(255);
+                }
+
+                /*
+                 * If remote host is "localhost" and local and remote user
+                 * are the same, avoid running remote shell for efficiency.
+                 */
+                if (!strcmp(*ahost, "localhost") && !strcmp(locuser, remuser)) {
+                        if (pw->pw_shell[0] == '\0')
+                                rshprog = _PATH_BSHELL;
+                        else
+                                rshprog = pw->pw_shell;
+                        p = strrchr(rshprog, '/');
+                        execlp(rshprog, p ? p+1 : rshprog, "-c", cmd,
+                               (char *) NULL);
+                } else {
+                        p = strrchr(rshprog, '/');
+                        execlp(rshprog, p ? p+1 : rshprog, *ahost, "-l",
+                               remuser, cmd, (char *) NULL);
+                }
+                (void) fprintf(stderr, "rcmdsh: execlp %s failed: %s\n",
+                               rshprog, strerror(errno));
+                _exit(255);
+        } else {
+                /* Parent. close sp[1], return sp[0]. */
+                (void) close(sp[1]);
+                /* Reap child. */
+                (void) wait(NULL);
+                return(sp[0]);
+        }
+        /* NOTREACHED */
+}
diff --git a/src/lib/libc/net/recv.c b/src/lib/libc/net/recv.c
new file mode 100644
index 0000000000..d209a07213
--- /dev/null
+++ b/src/lib/libc/net/recv.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1988, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: recv.c,v 1.2 1996/08/19 08:29:40 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <stddef.h>
+
+ssize_t
+recv(s, buf, len, flags)
+        int s, flags;
+        size_t len;
+        void *buf;
+{
+        return (recvfrom(s, buf, len, flags, NULL, 0));
+}
diff --git a/src/lib/libc/net/res_comp.c b/src/lib/libc/net/res_comp.c
new file mode 100644
index 0000000000..f7a0358967
--- /dev/null
+++ b/src/lib/libc/net/res_comp.c
@@ -0,0 +1,510 @@
+/*      $OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $    */
+
+/*
+ * ++Copyright++ 1985, 1993
+ * -
+ * Copyright (c) 1985, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)res_comp.c  8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$From: res_comp.c,v 8.11 1996/12/02 09:17:22 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <resolv.h>
+#include <ctype.h>
+
+#include <unistd.h>
+#include <string.h>
+
+static int      dn_find __P((u_char *exp_dn, u_char *msg,
+                             u_char **dnptrs, u_char **lastdnptr));
+
+/*
+ * Expand compressed domain name 'comp_dn' to full domain name.
+ * 'msg' is a pointer to the begining of the message,
+ * 'eomorig' points to the first location after the message,
+ * 'exp_dn' is a pointer to a buffer of size 'length' for the result.
+ * Return size of compressed name or -1 if there was an error.
+ */
+int
+dn_expand(msg, eomorig, comp_dn, exp_dn, length)
+        const u_char *msg, *eomorig, *comp_dn;
+        char *exp_dn;
+        int length;
+{
+        register const u_char *cp;
+        register char *dn;
+        register int n, c;
+        char *eom;
+        int len = -1, checked = 0;
+
+        dn = exp_dn;
+        cp = comp_dn;
+        if (length > MAXHOSTNAMELEN-1)
+                length = MAXHOSTNAMELEN-1;
+        eom = exp_dn + length;
+        /*
+         * fetch next label in domain name
+         */
+        while ((n = *cp++)) {
+                /*
+                 * Check for indirection
+                 */
+                switch (n & INDIR_MASK) {
+                case 0:
+                        if (dn != exp_dn) {
+                                if (dn >= eom)
+                                        return (-1);
+                                *dn++ = '.';
+                        }
+                        if (dn+n >= eom)
+                                return (-1);
+                        checked += n + 1;
+                        while (--n >= 0) {
+                                if (((c = *cp++) == '.') || (c == '\\')) {
+                                        if (dn + n + 2 >= eom)
+                                                return (-1);
+                                        *dn++ = '\\';
+                                }
+                                *dn++ = c;
+                                if (cp >= eomorig)      /* out of range */
+                                        return (-1);
+                        }
+                        break;
+
+                case INDIR_MASK:
+                        if (len < 0)
+                                len = cp - comp_dn + 1;
+                        cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff));
+                        if (cp < msg || cp >= eomorig)  /* out of range */
+                                return (-1);
+                        checked += 2;
+                        /*
+                         * Check for loops in the compressed name;
+                         * if we've looked at the whole message,
+                         * there must be a loop.
+                         */
+                        if (checked >= eomorig - msg)
+                                return (-1);
+                        break;
+
+                default:
+                        return (-1);                    /* flag error */
+                }
+        }
+        *dn = '\0';
+        if (len < 0)
+                len = cp - comp_dn;
+        return (len);
+}
+
+/*
+ * Compress domain name 'exp_dn' into 'comp_dn'.
+ * Return the size of the compressed name or -1.
+ * 'length' is the size of the array pointed to by 'comp_dn'.
+ * 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0]
+ * is a pointer to the beginning of the message. The list ends with NULL.
+ * 'lastdnptr' is a pointer to the end of the arrary pointed to
+ * by 'dnptrs'. Side effect is to update the list of pointers for
+ * labels inserted into the message as we compress the name.
+ * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
+ * is NULL, we don't update the list.
+ */
+int
+dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
+        const char *exp_dn;
+        u_char *comp_dn, **dnptrs, **lastdnptr;
+        int length;
+{
+        register u_char *cp, *dn;
+        register int c, l;
+        u_char **cpp, **lpp, *sp, *eob;
+        u_char *msg;
+
+        dn = (u_char *)exp_dn;
+        cp = comp_dn;
+        eob = cp + length;
+        lpp = cpp = NULL;
+        if (dnptrs != NULL) {
+                if ((msg = *dnptrs++) != NULL) {
+                        for (cpp = dnptrs; *cpp != NULL; cpp++)
+                                ;
+                        lpp = cpp;      /* end of list to search */
+                }
+        } else
+                msg = NULL;
+        for (c = *dn++; c != '\0'; ) {
+                /* look to see if we can use pointers */
+                if (msg != NULL) {
+                        if ((l = dn_find(dn-1, msg, dnptrs, lpp)) >= 0) {
+                                if (cp+1 >= eob)
+                                        return (-1);
+                                *cp++ = (l >> 8) | INDIR_MASK;
+                                *cp++ = l % 256;
+                                return (cp - comp_dn);
+                        }
+                        /* not found, save it */
+                        if (lastdnptr != NULL && cpp < lastdnptr-1) {
+                                *cpp++ = cp;
+                                *cpp = NULL;
+                        }
+                }
+                sp = cp++;      /* save ptr to length byte */
+                do {
+                        if (c == '.') {
+                                c = *dn++;
+                                break;
+                        }
+                        if (c == '\\') {
+                                if ((c = *dn++) == '\0')
+                                        break;
+                        }
+                        if (cp >= eob) {
+                                if (msg != NULL)
+                                        *lpp = NULL;
+                                return (-1);
+                        }
+                        *cp++ = c;
+                } while ((c = *dn++) != '\0');
+                /* catch trailing '.'s but not '..' */
+                if ((l = cp - sp - 1) == 0 && c == '\0') {
+                        cp--;
+                        break;
+                }
+                if (l <= 0 || l > MAXLABEL) {
+                        if (msg != NULL)
+                                *lpp = NULL;
+                        return (-1);
+                }
+                *sp = l;
+        }
+        if (cp >= eob) {
+                if (msg != NULL)
+                        *lpp = NULL;
+                return (-1);
+        }
+        *cp++ = '\0';
+        return (cp - comp_dn);
+}
+
+/*
+ * Skip over a compressed domain name. Return the size or -1.
+ */
+int
+__dn_skipname(comp_dn, eom)
+        const u_char *comp_dn, *eom;
+{
+        register const u_char *cp;
+        register int n;
+
+        cp = comp_dn;
+        while (cp < eom && (n = *cp++)) {
+                /*
+                 * check for indirection
+                 */
+                switch (n & INDIR_MASK) {
+                case 0:                 /* normal case, n == len */
+                        cp += n;
+                        continue;
+                case INDIR_MASK:        /* indirection */
+                        cp++;
+                        break;
+                default:                /* illegal type */
+                        return (-1);
+                }
+                break;
+        }
+        if (cp > eom)
+                return (-1);
+        return (cp - comp_dn);
+}
+
+static int
+mklower(ch)
+        register int ch;
+{
+        if (isascii(ch) && isupper(ch))
+                return (tolower(ch));
+        return (ch);
+}
+
+/*
+ * Search for expanded name from a list of previously compressed names.
+ * Return the offset from msg if found or -1.
+ * dnptrs is the pointer to the first name on the list,
+ * not the pointer to the start of the message.
+ */
+static int
+dn_find(exp_dn, msg, dnptrs, lastdnptr)
+        u_char *exp_dn, *msg;
+        u_char **dnptrs, **lastdnptr;
+{
+        register u_char *dn, *cp, **cpp;
+        register int n;
+        u_char *sp;
+
+        for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
+                dn = exp_dn;
+                sp = cp = *cpp;
+                while ((n = *cp++)) {
+                        /*
+                         * check for indirection
+                         */
+                        switch (n & INDIR_MASK) {
+                        case 0:         /* normal case, n == len */
+                                while (--n >= 0) {
+                                        if (*dn == '.')
+                                                goto next;
+                                        if (*dn == '\\')
+                                                dn++;
+                                        if (mklower(*dn++) != mklower(*cp++))
+                                                goto next;
+                                }
+                                if ((n = *dn++) == '\0' && *cp == '\0')
+                                        return (sp - msg);
+                                if (n == '.')
+                                        continue;
+                                goto next;
+
+                        case INDIR_MASK:        /* indirection */
+                                cp = msg + (((n & 0x3f) << 8) | *cp);
+                                break;
+
+                        default:        /* illegal type */
+                                return (-1);
+                        }
+                }
+                if (*dn == '\0')
+                        return (sp - msg);
+        next:   ;
+        }
+        return (-1);
+}
+
+/*
+ * Verify that a domain name uses an acceptable character set.
+ */
+
+/*
+ * Note the conspicuous absence of ctype macros in these definitions.  On
+ * non-ASCII hosts, we can't depend on string literals or ctype macros to
+ * tell us anything about network-format data.  The rest of the BIND system
+ * is not careful about this, but for some reason, we're doing it right here.
+ */
+#define PERIOD 0x2e
+#define hyphenchar(c) ((c) == 0x2d)
+#define bslashchar(c) ((c) == 0x5c)
+#define periodchar(c) ((c) == PERIOD)
+#define asterchar(c) ((c) == 0x2a)
+#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
+                   || ((c) >= 0x61 && (c) <= 0x7a))
+#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
+
+#define borderchar(c) (alphachar(c) || digitchar(c))
+#define middlechar(c) (borderchar(c) || hyphenchar(c))
+#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
+
+int
+res_hnok(dn)
+        const char *dn;
+{
+        int pch = PERIOD, ch = *dn++;
+
+        while (ch != '\0') {
+                int nch = *dn++;
+
+                if (periodchar(ch)) {
+                        ;
+                } else if (periodchar(pch)) {
+                        if (!borderchar(ch))
+                                return (0);
+                } else if (periodchar(nch) || nch == '\0') {
+                        if (!borderchar(ch))
+                                return (0);
+                } else {
+                        if (!middlechar(ch))
+                                return (0);
+                }
+                pch = ch, ch = nch;
+        }
+        return (1);
+}
+
+/*
+ * hostname-like (A, MX, WKS) owners can have "*" as their first label
+ * but must otherwise be as a host name.
+ */
+int
+res_ownok(dn)
+        const char *dn;
+{
+        if (asterchar(dn[0])) {
+                if (periodchar(dn[1]))
+                        return (res_hnok(dn+2));
+                if (dn[1] == '\0')
+                        return (1);
+        }
+        return (res_hnok(dn));
+}
+
+/*
+ * SOA RNAMEs and RP RNAMEs can have any printable character in their first
+ * label, but the rest of the name has to look like a host name.
+ */
+int
+res_mailok(dn)
+        const char *dn;
+{
+        int ch, escaped = 0;
+
+        /* "." is a valid missing representation */
+        if (*dn == '\0')
+                return(1);
+
+        /* otherwise <label>.<hostname> */
+        while ((ch = *dn++) != '\0') {
+                if (!domainchar(ch))
+                        return (0);
+                if (!escaped && periodchar(ch))
+                        break;
+                if (escaped)
+                        escaped = 0;
+                else if (bslashchar(ch))
+                        escaped = 1;
+        }
+        if (periodchar(ch))
+                return (res_hnok(dn));
+        return(0);
+}
+
+/*
+ * This function is quite liberal, since RFC 1034's character sets are only
+ * recommendations.
+ */
+int
+res_dnok(dn)
+        const char *dn;
+{
+        int ch;
+
+        while ((ch = *dn++) != '\0')
+                if (!domainchar(ch))
+                        return (0);
+        return (1);
+}
+
+/*
+ * Routines to insert/extract short/long's.
+ */
+
+u_int16_t
+_getshort(msgp)
+        register const u_char *msgp;
+{
+        register u_int16_t u;
+
+        GETSHORT(u, msgp);
+        return (u);
+}
+
+#ifdef NeXT
+/*
+ * nExt machines have some funky library conventions, which we must maintain.
+ */
+u_int16_t
+res_getshort(msgp)
+        register const u_char *msgp;
+{
+        return (_getshort(msgp));
+}
+#endif
+
+u_int32_t
+_getlong(msgp)
+        register const u_char *msgp;
+{
+        register u_int32_t u;
+
+        GETLONG(u, msgp);
+        return (u);
+}
+
+void
+#if defined(__STDC__) || defined(__cplusplus)
+__putshort(register u_int16_t s, register u_char *msgp) /* must match proto */
+#else
+__putshort(s, msgp)
+        register u_int16_t s;
+        register u_char *msgp;
+#endif
+{
+        PUTSHORT(s, msgp);
+}
+
+void
+__putlong(l, msgp)
+        register u_int32_t l;
+        register u_char *msgp;
+{
+        PUTLONG(l, msgp);
+}
diff --git a/src/lib/libc/net/res_data.c b/src/lib/libc/net/res_data.c
new file mode 100644
index 0000000000..b0d19c36bb
--- /dev/null
+++ b/src/lib/libc/net/res_data.c
@@ -0,0 +1,117 @@
+/*      $OpenBSD: res_data.c,v 1.1 1997/03/13 19:07:36 downsj Exp $     */
+
+/*
+ * ++Copyright++ 1995
+ * -
+ * Copyright (c) 1995
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char rcsid[] = "$From: res_data.c,v 8.2 1996/08/05 08:31:35 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_data.c,v 1.1 1997/03/13 19:07:36 downsj Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <ctype.h>
+#include <resolv.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+const char *_res_opcodes[] = {
+        "QUERY",
+        "IQUERY",
+        "CQUERYM",
+        "CQUERYU",      /* experimental */
+        "NOTIFY",       /* experimental */
+        "5",
+        "6",
+        "7",
+        "8",
+        "UPDATEA",
+        "UPDATED",
+        "UPDATEDA",
+        "UPDATEM",
+        "UPDATEMA",
+        "ZONEINIT",
+        "ZONEREF",
+};
+
+const char *_res_resultcodes[] = {
+        "NOERROR",
+        "FORMERR",
+        "SERVFAIL",
+        "NXDOMAIN",
+        "NOTIMP",
+        "REFUSED",
+        "6",
+        "7",
+        "8",
+        "9",
+        "10",
+        "11",
+        "12",
+        "13",
+        "14",
+        "NOCHANGE",
+};
diff --git a/src/lib/libc/net/res_debug.c b/src/lib/libc/net/res_debug.c
new file mode 100644
index 0000000000..c2725395a0
--- /dev/null
+++ b/src/lib/libc/net/res_debug.c
@@ -0,0 +1,1518 @@
+/*      $OpenBSD: res_debug.c,v 1.9 1998/03/19 00:30:06 millert Exp $   */
+
+/*
+ * ++Copyright++ 1985, 1990, 1993
+ * -
+ * Copyright (c) 1985, 1990, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
+ *
+ * International Business Machines, Inc. (hereinafter called IBM) grants
+ * permission under its copyrights to use, copy, modify, and distribute this
+ * Software with or without fee, provided that the above copyright notice and
+ * all paragraphs of this notice appear in all copies, and that the name of IBM
+ * not be used in connection with the marketing of any product incorporating
+ * the Software or modifications thereof, without specific, written prior
+ * permission.
+ *
+ * To the extent it has a right to do so, IBM grants an immunity from suit
+ * under its patents, if any, for the use, sale or manufacture of products to
+ * the extent that such products are used for performing Domain Name System
+ * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
+ * granted for any product per se or for any other function of any product.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$From: res_debug.c,v 8.19 1996/11/26 10:11:23 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_debug.c,v 1.9 1998/03/19 00:30:06 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <ctype.h>
+#include <netdb.h>
+#include <resolv.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+extern const char *_res_opcodes[];
+extern const char *_res_resultcodes[];
+
+/* XXX: we should use getservbyport() instead. */
+static const char *
+dewks(wks)
+        int wks;
+{
+        static char nbuf[20];
+
+        switch (wks) {
+        case 5: return "rje";
+        case 7: return "echo";
+        case 9: return "discard";
+        case 11: return "systat";
+        case 13: return "daytime";
+        case 15: return "netstat";
+        case 17: return "qotd";
+        case 19: return "chargen";
+        case 20: return "ftp-data";
+        case 21: return "ftp";
+        case 23: return "telnet";
+        case 25: return "smtp";
+        case 37: return "time";
+        case 39: return "rlp";
+        case 42: return "name";
+        case 43: return "whois";
+        case 53: return "domain";
+        case 57: return "apts";
+        case 59: return "apfs";
+        case 67: return "bootps";
+        case 68: return "bootpc";
+        case 69: return "tftp";
+        case 77: return "rje";
+        case 79: return "finger";
+        case 87: return "link";
+        case 95: return "supdup";
+        case 100: return "newacct";
+        case 101: return "hostnames";
+        case 102: return "iso-tsap";
+        case 103: return "x400";
+        case 104: return "x400-snd";
+        case 105: return "csnet-ns";
+        case 109: return "pop-2";
+        case 111: return "sunrpc";
+        case 113: return "auth";
+        case 115: return "sftp";
+        case 117: return "uucp-path";
+        case 119: return "nntp";
+        case 121: return "erpc";
+        case 123: return "ntp";
+        case 133: return "statsrv";
+        case 136: return "profile";
+        case 144: return "NeWS";
+        case 161: return "snmp";
+        case 162: return "snmp-trap";
+        case 170: return "print-srv";
+        default: (void) sprintf(nbuf, "%d", wks); return (nbuf);
+        }
+}
+
+/* XXX: we should use getprotobynumber() instead. */
+static const char *
+deproto(protonum)
+        int protonum;
+{
+        static char nbuf[20];
+
+        switch (protonum) {
+        case 1: return "icmp";
+        case 2: return "igmp";
+        case 3: return "ggp";
+        case 5: return "st";
+        case 6: return "tcp";
+        case 7: return "ucl";
+        case 8: return "egp";
+        case 9: return "igp";
+        case 11: return "nvp-II";
+        case 12: return "pup";
+        case 16: return "chaos";
+        case 17: return "udp";
+        default: (void) sprintf(nbuf, "%d", protonum); return (nbuf);
+        }
+}
+
+static const u_char *
+do_rrset(msg, len, cp, cnt, pflag, file, hs)
+        int cnt, pflag, len;
+        const u_char *cp, *msg;
+        const char *hs;
+        FILE *file;
+{
+        int n;
+        int sflag;
+
+        /*
+         * Print answer records.
+         */
+        sflag = (_res.pfcode & pflag);
+        if ((n = ntohs(cnt))) {
+                if ((!_res.pfcode) ||
+                    ((sflag) && (_res.pfcode & RES_PRF_HEAD1)))
+                        fprintf(file, hs);
+                while (--n >= 0) {
+                        if ((!_res.pfcode) || sflag) {
+                                cp = p_rr(cp, msg, file);
+                        } else {
+                                unsigned int dlen;
+                                cp += __dn_skipname(cp, cp + MAXCDNAME);
+                                cp += INT16SZ;
+                                cp += INT16SZ;
+                                cp += INT32SZ;
+                                dlen = _getshort((u_char*)cp);
+                                cp += INT16SZ;
+                                cp += dlen;
+                        }
+                        if ((cp - msg) > len)
+                                return (NULL);
+                }
+                if ((!_res.pfcode) ||
+                    ((sflag) && (_res.pfcode & RES_PRF_HEAD1)))
+                        putc('\n', file);
+        }
+        return (cp);
+}
+
+void
+__p_query(msg)
+        const u_char *msg;
+{
+        __fp_query(msg, stdout);
+}
+
+/*
+ * Print the current options.
+ * This is intended to be primarily a debugging routine.
+ */
+void
+__fp_resstat(statp, file)
+        struct __res_state *statp;
+        FILE *file;
+{
+        register u_long mask;
+
+        fprintf(file, ";; res options:");
+        if (!statp)
+                statp = &_res;
+        for (mask = 1;  mask != 0;  mask <<= 1)
+                if (statp->options & mask)
+                        fprintf(file, " %s", p_option(mask));
+        putc('\n', file);
+}
+
+/*
+ * Print the contents of a query.
+ * This is intended to be primarily a debugging routine.
+ */
+void
+__fp_nquery(msg, len, file)
+        const u_char *msg;
+        int len;
+        FILE *file;
+{
+        register const u_char *cp, *endMark;
+        register const HEADER *hp;
+        register int n;
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+                return;
+
+#define TruncTest(x) if (x > endMark) goto trunc
+#define ErrorTest(x) if (x == NULL) goto error
+
+        /*
+         * Print header fields.
+         */
+        hp = (HEADER *)msg;
+        cp = msg + HFIXEDSZ;
+        endMark = msg + len;
+        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX) || hp->rcode) {
+                fprintf(file, ";; ->>HEADER<<- opcode: %s, status: %s, id: %d",
+                        _res_opcodes[hp->opcode],
+                        _res_resultcodes[hp->rcode],
+                        ntohs(hp->id));
+                putc('\n', file);
+        }
+        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX))
+                putc(';', file);
+        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD2)) {
+                fprintf(file, "; flags:");
+                if (hp->qr)
+                        fprintf(file, " qr");
+                if (hp->aa)
+                        fprintf(file, " aa");
+                if (hp->tc)
+                        fprintf(file, " tc");
+                if (hp->rd)
+                        fprintf(file, " rd");
+                if (hp->ra)
+                        fprintf(file, " ra");
+                if (hp->unused)
+                        fprintf(file, " UNUSED-BIT-ON");
+                if (hp->ad)
+                        fprintf(file, " ad");
+                if (hp->cd)
+                        fprintf(file, " cd");
+        }
+        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD1)) {
+                fprintf(file, "; Ques: %d", ntohs(hp->qdcount));
+                fprintf(file, ", Ans: %d", ntohs(hp->ancount));
+                fprintf(file, ", Auth: %d", ntohs(hp->nscount));
+                fprintf(file, ", Addit: %d", ntohs(hp->arcount));
+        }
+        if ((!_res.pfcode) || (_res.pfcode & 
+                (RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
+                putc('\n',file);
+        }
+        /*
+         * Print question records.
+         */
+        if ((n = ntohs(hp->qdcount))) {
+                if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
+                        fprintf(file, ";; QUESTIONS:\n");
+                while (--n >= 0) {
+                        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
+                                fprintf(file, ";;\t");
+                        TruncTest(cp);
+                        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
+                                cp = p_cdnname(cp, msg, len, file);
+                        else {
+                                int n;
+                                char name[MAXDNAME];
+
+                                if ((n = dn_expand(msg, msg+len, cp, name,
+                                                sizeof name)) < 0)
+                                        cp = NULL;
+                                else
+                                        cp += n;
+                        }
+                        ErrorTest(cp);
+                        TruncTest(cp);
+                        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
+                                fprintf(file, ", type = %s",
+                                        __p_type(_getshort((u_char*)cp)));
+                        cp += INT16SZ;
+                        TruncTest(cp);
+                        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
+                                fprintf(file, ", class = %s\n",
+                                        __p_class(_getshort((u_char*)cp)));
+                        cp += INT16SZ;
+                        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_QUES))
+                                putc('\n', file);
+                }
+        }
+        /*
+         * Print authoritative answer records
+         */
+        TruncTest(cp);
+        cp = do_rrset(msg, len, cp, hp->ancount, RES_PRF_ANS, file,
+                      ";; ANSWERS:\n");
+        ErrorTest(cp);
+
+        /*
+         * print name server records
+         */
+        TruncTest(cp);
+        cp = do_rrset(msg, len, cp, hp->nscount, RES_PRF_AUTH, file,
+                      ";; AUTHORITY RECORDS:\n");
+        ErrorTest(cp);
+
+        TruncTest(cp);
+        /*
+         * print additional records
+         */
+        cp = do_rrset(msg, len, cp, hp->arcount, RES_PRF_ADD, file,
+                      ";; ADDITIONAL RECORDS:\n");
+        ErrorTest(cp);
+        return;
+ trunc:
+        fprintf(file, "\n;; ...truncated\n");
+        return;
+ error:
+        fprintf(file, "\n;; ...malformed\n");
+}
+
+void
+__fp_query(msg, file)
+        const u_char *msg;
+        FILE *file;
+{
+        fp_nquery(msg, PACKETSZ, file);
+}
+
+const u_char *
+__p_cdnname(cp, msg, len, file)
+        const u_char *cp, *msg;
+        int len;
+        FILE *file;
+{
+        char name[MAXDNAME];
+        int n;
+
+        if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
+                return (NULL);
+        if (name[0] == '\0')
+                putc('.', file);
+        else
+                fputs(name, file);
+        return (cp + n);
+}
+
+const u_char *
+__p_cdname(cp, msg, file)
+        const u_char *cp, *msg;
+        FILE *file;
+{
+        return (p_cdnname(cp, msg, PACKETSZ, file));
+}
+
+
+/* Return a fully-qualified domain name from a compressed name (with
+   length supplied).  */
+
+const u_char *
+__p_fqnname(cp, msg, msglen, name, namelen)
+        const u_char *cp, *msg;
+        int msglen;
+        char *name;
+        int namelen;
+{
+        int n, newlen;
+
+        if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
+                return (NULL);
+        newlen = strlen (name);
+        if (newlen == 0 || name[newlen - 1] != '.') {
+                if (newlen+1 >= namelen)        /* Lack space for final dot */
+                        return (NULL);
+                else
+                        strcpy(name + newlen, ".");
+        }
+        return (cp + n);
+}
+
+/* XXX: the rest of these functions need to become length-limited, too. (vix)
+ */
+
+const u_char *
+__p_fqname(cp, msg, file)
+        const u_char *cp, *msg;
+        FILE *file;
+{
+        char name[MAXDNAME];
+        const u_char *n;
+
+        n = __p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
+        if (n == NULL)
+                return (NULL);
+        fputs(name, file);
+        return (n);
+}
+
+/*
+ * Print resource record fields in human readable form.
+ */
+const u_char *
+__p_rr(cp, msg, file)
+        const u_char *cp, *msg;
+        FILE *file;
+{
+        int type, class, dlen, n, c;
+        struct in_addr inaddr;
+        const u_char *cp1, *cp2;
+        u_int32_t tmpttl, t;
+        int lcnt;
+        u_int16_t keyflags;
+        char rrname[MAXDNAME];          /* The fqdn of this RR */
+        char base64_key[MAX_KEY_BASE64];
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                h_errno = NETDB_INTERNAL;
+                return (NULL);
+        }
+        cp = __p_fqnname(cp, msg, MAXCDNAME, rrname, sizeof rrname);
+        if (!cp)
+                return (NULL);                  /* compression error */
+        fputs(rrname, file);
+        
+        type = _getshort((u_char*)cp);
+        cp += INT16SZ;
+        class = _getshort((u_char*)cp);
+        cp += INT16SZ;
+        tmpttl = _getlong((u_char*)cp);
+        cp += INT32SZ;
+        dlen = _getshort((u_char*)cp);
+        cp += INT16SZ;
+        cp1 = cp;
+        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_TTLID))
+                fprintf(file, "\t%lu", (u_long)tmpttl);
+        if ((!_res.pfcode) || (_res.pfcode & RES_PRF_CLASS))
+                fprintf(file, "\t%s", __p_class(class));
+        fprintf(file, "\t%s", __p_type(type));
+        /*
+         * Print type specific data, if appropriate
+         */
+        switch (type) {
+        case T_A:
+                switch (class) {
+                case C_IN:
+                case C_HS:
+                        bcopy(cp, (char *)&inaddr, INADDRSZ);
+                        if (dlen == 4) {
+                                fprintf(file, "\t%s", inet_ntoa(inaddr));
+                                cp += dlen;
+                        } else if (dlen == 7) {
+                                char *address;
+                                u_char protocol;
+                                in_port_t port;
+
+                                address = inet_ntoa(inaddr);
+                                cp += INADDRSZ;
+                                protocol = *(u_char*)cp;
+                                cp += sizeof (u_char);
+                                port = _getshort((u_char*)cp);
+                                cp += INT16SZ;
+                                fprintf(file, "\t%s\t; proto %d, port %d",
+                                        address, protocol, port);
+                        }
+                        break;
+                default:
+                        cp += dlen;
+                }
+                break;
+        case T_CNAME:
+        case T_MB:
+        case T_MG:
+        case T_MR:
+        case T_NS:
+        case T_PTR:
+                putc('\t', file);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                break;
+
+        case T_HINFO:
+        case T_ISDN:
+                cp2 = cp + dlen;
+                (void) fputs("\t\"", file);
+                if ((n = (unsigned char) *cp++) != 0) {
+                        for (c = n; c > 0 && cp < cp2; c--) {
+                                if (strchr("\n\"\\", *cp))
+                                        (void) putc('\\', file);
+                                (void) putc(*cp++, file);
+                        }
+                }
+                putc('"', file);
+                if (cp < cp2 && (n = (unsigned char) *cp++) != 0) {
+                        (void) fputs ("\t\"", file);
+                        for (c = n; c > 0 && cp < cp2; c--) {
+                                if (strchr("\n\"\\", *cp))
+                                        (void) putc('\\', file);
+                                (void) putc(*cp++, file);
+                        }
+                        putc('"', file);
+                } else if (type == T_HINFO) {
+                        (void) fputs("\"?\"", file);
+                        fprintf(file, "\n;; *** Warning *** OS-type missing");
+                }
+                break;
+
+        case T_SOA:
+                putc('\t', file);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                putc(' ', file);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                fputs(" (\n", file);
+                t = _getlong((u_char*)cp);  cp += INT32SZ;
+                fprintf(file, "\t\t\t%lu\t; serial\n", (u_long)t);
+                t = _getlong((u_char*)cp);  cp += INT32SZ;
+                fprintf(file, "\t\t\t%lu\t; refresh (%s)\n",
+                        (u_long)t, __p_time(t));
+                t = _getlong((u_char*)cp);  cp += INT32SZ;
+                fprintf(file, "\t\t\t%lu\t; retry (%s)\n",
+                        (u_long)t, __p_time(t));
+                t = _getlong((u_char*)cp);  cp += INT32SZ;
+                fprintf(file, "\t\t\t%lu\t; expire (%s)\n",
+                        (u_long)t, __p_time(t));
+                t = _getlong((u_char*)cp);  cp += INT32SZ;
+                fprintf(file, "\t\t\t%lu )\t; minimum (%s)",
+                        (u_long)t, __p_time(t));
+                break;
+
+        case T_MX:
+        case T_AFSDB:
+        case T_RT:
+                fprintf(file, "\t%d ", _getshort((u_char*)cp));
+                cp += INT16SZ;
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                break;
+
+        case T_PX:
+                fprintf(file, "\t%d ", _getshort((u_char*)cp));
+                cp += INT16SZ;
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                putc(' ', file);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                break;
+
+        case T_X25:
+                cp2 = cp + dlen;
+                (void) fputs("\t\"", file);
+                if ((n = (unsigned char) *cp++) != 0) {
+                        for (c = n; c > 0 && cp < cp2; c--) {
+                                if (strchr("\n\"\\", *cp))
+                                        (void) putc('\\', file);
+                                (void) putc(*cp++, file);
+                        }
+                }
+                putc('"', file);
+                break;
+
+        case T_TXT:
+                (void) putc('\t', file);
+                cp2 = cp1 + dlen;
+                while (cp < cp2) {
+                        putc('"', file);
+                        if ((n = (unsigned char) *cp++)) {
+                                for (c = n; c > 0 && cp < cp2; c--) {
+                                        if (strchr("\n\"\\", *cp))
+                                                (void) putc('\\', file);
+                                        (void) putc(*cp++, file);
+                                }
+                        }
+                        putc('"', file);
+                        if (cp < cp2)
+                                putc(' ', file);
+                }
+                break;
+
+        case T_NSAP:
+                (void) fprintf(file, "\t%s", inet_nsap_ntoa(dlen, cp, NULL));
+                cp += dlen;
+                break;
+
+        case T_AAAA: {
+                char t[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
+
+                fprintf(file, "\t%s", inet_ntop(AF_INET6, cp, t, sizeof t));
+                cp += dlen;
+                break;
+            }
+
+        case T_LOC: {
+                char t[255];
+
+                fprintf(file, "\t%s", loc_ntoa(cp, t));
+                cp += dlen;
+                break;
+            }
+
+        case T_NAPTR: {
+                u_int order, preference;
+
+                order = _getshort(cp);  cp += INT16SZ;
+                preference   = _getshort(cp);  cp += INT16SZ;
+                fprintf(file, "\t%u %u ",order, preference);
+                /* Flags */
+                n = *cp++;
+                fprintf(file,"\"%.*s\" ", (int)n, cp);
+                cp += n;
+                /* Service */
+                n = *cp++;
+                fprintf(file,"\"%.*s\" ", (int)n, cp);
+                cp += n;
+                /* Regexp */
+                n = *cp++;
+                fprintf(file,"\"%.*s\" ", (int)n, cp);
+                cp += n;
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                break;
+            }
+
+        case T_SRV: {
+                u_int priority, weight, port;
+
+                priority = _getshort(cp);  cp += INT16SZ;
+                weight   = _getshort(cp);  cp += INT16SZ;
+                port     = _getshort(cp);  cp += INT16SZ;
+                fprintf(file, "\t%u %u %u ", priority, weight, port);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                break;
+            }
+
+        case T_MINFO:
+        case T_RP:
+                putc('\t', file);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                putc(' ', file);
+                if ((cp = p_fqname(cp, msg, file)) == NULL)
+                        return (NULL);
+                break;
+
+        case T_UINFO:
+                putc('\t', file);
+                fputs((char *)cp, file);
+                cp += dlen;
+                break;
+
+        case T_UID:
+        case T_GID:
+                if (dlen == 4) {
+                        fprintf(file, "\t%u", _getlong((u_char*)cp));
+                        cp += INT32SZ;
+                }
+                break;
+
+        case T_WKS:
+                if (dlen < INT32SZ + 1)
+                        break;
+                bcopy(cp, (char *)&inaddr, INADDRSZ);
+                cp += INT32SZ;
+                fprintf(file, "\t%s %s ( ",
+                        inet_ntoa(inaddr),
+                        deproto((int) *cp));
+                cp += sizeof (u_char);
+                n = 0;
+                lcnt = 0;
+                while (cp < cp1 + dlen) {
+                        c = *cp++;
+                        do {
+                                if (c & 0200) {
+                                        if (lcnt == 0) {
+                                                fputs("\n\t\t\t", file);
+                                                lcnt = 5;
+                                        }
+                                        fputs(dewks(n), file);
+                                        putc(' ', file);
+                                        lcnt--;
+                                }
+                                c <<= 1;
+                        } while (++n & 07);
+                }
+                putc(')', file);
+                break;
+
+        case T_KEY:
+                putc('\t', file);
+                keyflags = _getshort(cp);
+                cp += 2;
+                fprintf(file,"0x%04x", keyflags );      /* flags */
+                fprintf(file," %u", *cp++);     /* protocol */
+                fprintf(file," %u (", *cp++);   /* algorithm */
+
+                n = b64_ntop(cp, (cp1 + dlen) - cp,
+                             base64_key, sizeof base64_key);
+                for (c = 0; c < n; ++c) {
+                        if (0 == (c & 0x3F))
+                                fprintf(file, "\n\t");
+                        putc(base64_key[c], file);  /* public key data */
+                }
+
+                fprintf(file, " )");
+                if (n < 0)
+                        fprintf(file, "\t; BAD BASE64");
+                fflush(file);
+                cp = cp1 + dlen;
+                break;
+
+        case T_SIG:
+                type = _getshort((u_char*)cp);
+                cp += INT16SZ;
+                fprintf(file, " %s", p_type(type));
+                fprintf(file, "\t%d", *cp++);   /* algorithm */
+                /* Check label value and print error if wrong. */
+                n = *cp++;
+                c = dn_count_labels (rrname);
+                if (n != c)
+                        fprintf(file, "\t; LABELS WRONG (%d should be %d)\n\t",
+                                n, c);
+                /* orig ttl */
+                n = _getlong((u_char*)cp);
+                if (n != tmpttl)
+                        fprintf(file, " %u", n);
+                cp += INT32SZ;
+                /* sig expire */
+                fprintf(file, " (\n\t%s",
+                                     __p_secstodate(_getlong((u_char*)cp)));
+                cp += INT32SZ;
+                /* time signed */
+                fprintf(file, " %s", __p_secstodate(_getlong((u_char*)cp)));
+                cp += INT32SZ;
+                /* sig footprint */
+                fprintf(file," %u ", _getshort((u_char*)cp));
+                cp += INT16SZ;
+                /* signer's name */
+                cp = p_fqname(cp, msg, file);
+                n = b64_ntop(cp, (cp1 + dlen) - cp,
+                             base64_key, sizeof base64_key);
+                for (c = 0; c < n; c++) {
+                        if (0 == (c & 0x3F))
+                                fprintf (file, "\n\t");
+                        putc(base64_key[c], file);              /* signature */
+                }
+                /* Clean up... */
+                fprintf(file, " )");
+                if (n < 0)
+                        fprintf(file, "\t; BAD BASE64");
+                fflush(file);
+                cp = cp1+dlen;
+                break;
+
+#ifdef ALLOW_T_UNSPEC
+        case T_UNSPEC:
+                {
+                        int NumBytes = 8;
+                        u_char *DataPtr;
+                        int i;
+
+                        if (dlen < NumBytes) NumBytes = dlen;
+                        fprintf(file, "\tFirst %d bytes of hex data:",
+                                NumBytes);
+                        for (i = 0, DataPtr = cp; i < NumBytes; i++, DataPtr++)
+                                fprintf(file, " %x", *DataPtr);
+                        cp += dlen;
+                }
+                break;
+#endif /* ALLOW_T_UNSPEC */
+
+        default:
+                fprintf(file, "\t?%d?", type);
+                cp += dlen;
+        }
+#if 0
+        fprintf(file, "\t; dlen=%d, ttl %s\n", dlen, __p_time(tmpttl));
+#else
+        putc('\n', file);
+#endif
+        if (cp - cp1 != dlen) {
+                fprintf(file, ";; packet size error (found %ld, dlen was %d)\n",
+                        (long)(cp - cp1), dlen);
+                cp = NULL;
+        }
+        return (cp);
+}
+
+/*
+ * Names of RR classes and qclasses.  Classes and qclasses are the same, except
+ * that C_ANY is a qclass but not a class.  (You can ask for records of class
+ * C_ANY, but you can't have any records of that class in the database.)
+ */
+const struct res_sym __p_class_syms[] = {
+        {C_IN,          "IN"},
+        {C_CHAOS,       "CHAOS"},
+        {C_HS,          "HS"},
+        {C_HS,          "HESIOD"},
+        {C_ANY,         "ANY"},
+        {C_IN,          (char *)0}
+};
+
+/*
+ * Names of RR types and qtypes.  Types and qtypes are the same, except
+ * that T_ANY is a qtype but not a type.  (You can ask for records of type
+ * T_ANY, but you can't have any records of that type in the database.)
+ */
+const struct res_sym __p_type_syms[] = {
+        {T_A,           "A",            "address"},
+        {T_NS,          "NS",           "name server"},
+        {T_MD,          "MD",           "mail destination (deprecated)"},
+        {T_MF,          "MF",           "mail forwarder (deprecated)"},
+        {T_CNAME,       "CNAME",        "canonical name"},
+        {T_SOA,         "SOA",          "start of authority"},
+        {T_MB,          "MB",           "mailbox"},
+        {T_MG,          "MG",           "mail group member"},
+        {T_MR,          "MR",           "mail rename"},
+        {T_NULL,        "NULL",         "null"},
+        {T_WKS,         "WKS",          "well-known service (deprecated)"},
+        {T_PTR,         "PTR",          "domain name pointer"},
+        {T_HINFO,       "HINFO",        "host information"},
+        {T_MINFO,       "MINFO",        "mailbox information"},
+        {T_MX,          "MX",           "mail exchanger"},
+        {T_TXT,         "TXT",          "text"},
+        {T_RP,          "RP",           "responsible person"},
+        {T_AFSDB,       "AFSDB",        "DCE or AFS server"},
+        {T_X25,         "X25",          "X25 address"},
+        {T_ISDN,        "ISDN",         "ISDN address"},
+        {T_RT,          "RT",           "router"},
+        {T_NSAP,        "NSAP",         "nsap address"},
+        {T_NSAP_PTR,    "NSAP_PTR",     "domain name pointer"},
+        {T_SIG,         "SIG",          "signature"},
+        {T_KEY,         "KEY",          "key"},
+        {T_PX,          "PX",           "mapping information"},
+        {T_GPOS,        "GPOS",         "geographical position (withdrawn)"},
+        {T_AAAA,        "AAAA",         "IPv6 address"},
+        {T_LOC,         "LOC",          "location"},
+        {T_NXT,         "NXT",          "next valid name (unimplemented)"},
+        {T_EID,         "EID",          "endpoint identifier (unimplemented)"},
+        {T_NIMLOC,      "NIMLOC",       "NIMROD locator (unimplemented)"},
+        {T_SRV,         "SRV",          "server selection"},
+        {T_ATMA,        "ATMA",         "ATM address (unimplemented)"},
+        {T_IXFR,        "IXFR",         "incremental zone transfer"},
+        {T_AXFR,        "AXFR",         "zone transfer"},
+        {T_MAILB,       "MAILB",        "mailbox-related data (deprecated)"},
+        {T_MAILA,       "MAILA",        "mail agent (deprecated)"},
+        {T_UINFO,       "UINFO",        "user information (nonstandard)"},
+        {T_UID,         "UID",          "user ID (nonstandard)"},
+        {T_GID,         "GID",          "group ID (nonstandard)"},
+        {T_NAPTR,       "NAPTR",        "URN Naming Authority"},
+#ifdef ALLOW_T_UNSPEC
+        {T_UNSPEC,      "UNSPEC",       "unspecified data (nonstandard)"},
+#endif /* ALLOW_T_UNSPEC */
+        {T_ANY,         "ANY",          "\"any\""},
+        {0,             NULL,           NULL}
+};
+
+int
+__sym_ston(syms, name, success)
+        const struct res_sym *syms;
+        char *name;
+        int *success;
+{
+        for (; syms->name != 0; syms++) {
+                if (strcasecmp (name, syms->name) == 0) {
+                        if (success)
+                                *success = 1;
+                        return (syms->number);
+                }
+        }
+        if (success)
+                *success = 0;
+        return (syms->number);          /* The default value. */
+}
+
+const char *
+__sym_ntos(syms, number, success)
+        const struct res_sym *syms;
+        int number;
+        int *success;
+{
+        static char unname[20];
+
+        for (; syms->name != 0; syms++) {
+                if (number == syms->number) {
+                        if (success)
+                                *success = 1;
+                        return (syms->name);
+                }
+        }
+
+        sprintf (unname, "%d", number);
+        if (success)
+                *success = 0;
+        return (unname);
+}
+
+
+const char *
+__sym_ntop(syms, number, success)
+        const struct res_sym *syms;
+        int number;
+        int *success;
+{
+        static char unname[20];
+
+        for (; syms->name != 0; syms++) {
+                if (number == syms->number) {
+                        if (success)
+                                *success = 1;
+                        return (syms->humanname);
+                }
+        }
+        sprintf(unname, "%d", number);
+        if (success)
+                *success = 0;
+        return (unname);
+}
+
+/*
+ * Return a string for the type
+ */
+const char *
+__p_type(type)
+        int type;
+{
+        return (__sym_ntos (__p_type_syms, type, (int *)0));
+}
+
+/*
+ * Return a mnemonic for class
+ */
+const char *
+__p_class(class)
+        int class;
+{
+        return (__sym_ntos (__p_class_syms, class, (int *)0));
+}
+
+/*
+ * Return a mnemonic for an option
+ */
+const char *
+__p_option(option)
+        u_long option;
+{
+        static char nbuf[40];
+
+        switch (option) {
+        case RES_INIT:          return "init";
+        case RES_DEBUG:         return "debug";
+        case RES_AAONLY:        return "aaonly(unimpl)";
+        case RES_USEVC:         return "usevc";
+        case RES_PRIMARY:       return "primry(unimpl)";
+        case RES_IGNTC:         return "igntc";
+        case RES_RECURSE:       return "recurs";
+        case RES_DEFNAMES:      return "defnam";
+        case RES_STAYOPEN:      return "styopn";
+        case RES_DNSRCH:        return "dnsrch";
+        case RES_INSECURE1:     return "insecure1";
+        case RES_INSECURE2:     return "insecure2";
+        default:                sprintf(nbuf, "?0x%lx?", (u_long)option);
+                                return (nbuf);
+        }
+}
+
+/*
+ * Return a mnemonic for a time to live
+ */
+const char *
+p_time(value)
+        u_int32_t value;
+{
+        static char nbuf[40];
+        int secs, mins, hours, days;
+        register char *p;
+
+        if (value == 0) {
+                strcpy(nbuf, "0 secs");
+                return (nbuf);
+        }
+
+        secs = value % 60;
+        value /= 60;
+        mins = value % 60;
+        value /= 60;
+        hours = value % 24;
+        value /= 24;
+        days = value;
+        value = 0;
+
+#define PLURALIZE(x)    x, (x == 1) ? "" : "s"
+        p = nbuf;
+        if (days) {
+                (void)sprintf(p, "%d day%s", PLURALIZE(days));
+                while (*++p);
+        }
+        if (hours) {
+                if (days)
+                        *p++ = ' ';
+                (void)sprintf(p, "%d hour%s", PLURALIZE(hours));
+                while (*++p);
+        }
+        if (mins) {
+                if (days || hours)
+                        *p++ = ' ';
+                (void)sprintf(p, "%d min%s", PLURALIZE(mins));
+                while (*++p);
+        }
+        if (secs || ! (days || hours || mins)) {
+                if (days || hours || mins)
+                        *p++ = ' ';
+                (void)sprintf(p, "%d sec%s", PLURALIZE(secs));
+        }
+        return (nbuf);
+}
+
+/*
+ * routines to convert between on-the-wire RR format and zone file format.
+ * Does not contain conversion to/from decimal degrees; divide or multiply
+ * by 60*60*1000 for that.
+ */
+
+static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
+                                      1000000,10000000,100000000,1000000000};
+
+/* takes an XeY precision/size value, returns a string representation. */
+static const char *
+precsize_ntoa(prec)
+        u_int8_t prec;
+{
+        static char retbuf[sizeof "90000000.00"];
+        unsigned long val;
+        int mantissa, exponent;
+
+        mantissa = (int)((prec >> 4) & 0x0f) % 10;
+        exponent = (int)((prec >> 0) & 0x0f) % 10;
+
+        val = mantissa * poweroften[exponent];
+
+        (void) sprintf(retbuf, "%ld.%.2ld", val/100, val%100);
+        return (retbuf);
+}
+
+/* converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer. */
+static u_int8_t
+precsize_aton(strptr)
+        char **strptr;
+{
+        unsigned int mval = 0, cmval = 0;
+        u_int8_t retval = 0;
+        register char *cp;
+        register int exponent;
+        register int mantissa;
+
+        cp = *strptr;
+
+        while (isdigit(*cp))
+                mval = mval * 10 + (*cp++ - '0');
+
+        if (*cp == '.') {               /* centimeters */
+                cp++;
+                if (isdigit(*cp)) {
+                        cmval = (*cp++ - '0') * 10;
+                        if (isdigit(*cp)) {
+                                cmval += (*cp++ - '0');
+                        }
+                }
+        }
+        cmval = (mval * 100) + cmval;
+
+        for (exponent = 0; exponent < 9; exponent++)
+                if (cmval < poweroften[exponent+1])
+                        break;
+
+        mantissa = cmval / poweroften[exponent];
+        if (mantissa > 9)
+                mantissa = 9;
+
+        retval = (mantissa << 4) | exponent;
+
+        *strptr = cp;
+
+        return (retval);
+}
+
+/* converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
+static u_int32_t
+latlon2ul(latlonstrptr,which)
+        char **latlonstrptr;
+        int *which;
+{
+        register char *cp;
+        u_int32_t retval;
+        int deg = 0, min = 0, secs = 0, secsfrac = 0;
+
+        cp = *latlonstrptr;
+
+        while (isdigit(*cp))
+                deg = deg * 10 + (*cp++ - '0');
+
+        while (isspace(*cp))
+                cp++;
+
+        if (!(isdigit(*cp)))
+                goto fndhemi;
+
+        while (isdigit(*cp))
+                min = min * 10 + (*cp++ - '0');
+
+        while (isspace(*cp))
+                cp++;
+
+        if (!(isdigit(*cp)))
+                goto fndhemi;
+
+        while (isdigit(*cp))
+                secs = secs * 10 + (*cp++ - '0');
+
+        if (*cp == '.') {               /* decimal seconds */
+                cp++;
+                if (isdigit(*cp)) {
+                        secsfrac = (*cp++ - '0') * 100;
+                        if (isdigit(*cp)) {
+                                secsfrac += (*cp++ - '0') * 10;
+                                if (isdigit(*cp)) {
+                                        secsfrac += (*cp++ - '0');
+                                }
+                        }
+                }
+        }
+
+        while (!isspace(*cp))   /* if any trailing garbage */
+                cp++;
+
+        while (isspace(*cp))
+                cp++;
+
+ fndhemi:
+        switch (*cp) {
+        case 'N': case 'n':
+        case 'E': case 'e':
+                retval = ((unsigned)1<<31)
+                        + (((((deg * 60) + min) * 60) + secs) * 1000)
+                        + secsfrac;
+                break;
+        case 'S': case 's':
+        case 'W': case 'w':
+                retval = ((unsigned)1<<31)
+                        - (((((deg * 60) + min) * 60) + secs) * 1000)
+                        - secsfrac;
+                break;
+        default:
+                retval = 0;     /* invalid value -- indicates error */
+                break;
+        }
+
+        switch (*cp) {
+        case 'N': case 'n':
+        case 'S': case 's':
+                *which = 1;     /* latitude */
+                break;
+        case 'E': case 'e':
+        case 'W': case 'w':
+                *which = 2;     /* longitude */
+                break;
+        default:
+                *which = 0;     /* error */
+                break;
+        }
+
+        cp++;                   /* skip the hemisphere */
+
+        while (!isspace(*cp))   /* if any trailing garbage */
+                cp++;
+
+        while (isspace(*cp))    /* move to next field */
+                cp++;
+
+        *latlonstrptr = cp;
+
+        return (retval);
+}
+
+/* converts a zone file representation in a string to an RDATA on-the-wire
+ * representation. */
+int
+loc_aton(ascii, binary)
+        const char *ascii;
+        u_char *binary;
+{
+        const char *maxcp;
+        u_char *bcp;
+        char *cp;
+
+        u_int32_t latit = 0, longit = 0, alt = 0;
+        u_int32_t lltemp1 = 0, lltemp2 = 0;
+        int altmeters = 0, altfrac = 0, altsign = 1;
+        u_int8_t hp = 0x16;     /* default = 1e6 cm = 10000.00m = 10km */
+        u_int8_t vp = 0x13;     /* default = 1e3 cm = 10.00m */
+        u_int8_t siz = 0x12;    /* default = 1e2 cm = 1.00m */
+        int which1 = 0, which2 = 0;
+
+        cp = (char *)ascii;
+        maxcp = cp + strlen(ascii);
+
+        lltemp1 = latlon2ul(&cp, &which1);
+
+        lltemp2 = latlon2ul(&cp, &which2);
+
+        switch (which1 + which2) {
+        case 3:                 /* 1 + 2, the only valid combination */
+                if ((which1 == 1) && (which2 == 2)) { /* normal case */
+                        latit = lltemp1;
+                        longit = lltemp2;
+                } else if ((which1 == 2) && (which2 == 1)) { /* reversed */
+                        longit = lltemp1;
+                        latit = lltemp2;
+                } else {        /* some kind of brokenness */
+                        return (0);
+                }
+                break;
+        default:                /* we didn't get one of each */
+                return (0);
+        }
+
+        /* altitude */
+        if (*cp == '-') {
+                altsign = -1;
+                cp++;
+        }
+    
+        if (*cp == '+')
+                cp++;
+
+        while (isdigit(*cp))
+                altmeters = altmeters * 10 + (*cp++ - '0');
+
+        if (*cp == '.') {               /* decimal meters */
+                cp++;
+                if (isdigit(*cp)) {
+                        altfrac = (*cp++ - '0') * 10;
+                        if (isdigit(*cp)) {
+                                altfrac += (*cp++ - '0');
+                        }
+                }
+        }
+
+        alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
+
+        while (!isspace(*cp) && (cp < maxcp)) /* if trailing garbage or m */
+                cp++;
+
+        while (isspace(*cp) && (cp < maxcp))
+                cp++;
+
+        if (cp >= maxcp)
+                goto defaults;
+
+        siz = precsize_aton(&cp);
+        
+        while (!isspace(*cp) && (cp < maxcp))   /* if trailing garbage or m */
+                cp++;
+
+        while (isspace(*cp) && (cp < maxcp))
+                cp++;
+
+        if (cp >= maxcp)
+                goto defaults;
+
+        hp = precsize_aton(&cp);
+
+        while (!isspace(*cp) && (cp < maxcp))   /* if trailing garbage or m */
+                cp++;
+
+        while (isspace(*cp) && (cp < maxcp))
+                cp++;
+
+        if (cp >= maxcp)
+                goto defaults;
+
+        vp = precsize_aton(&cp);
+
+ defaults:
+
+        bcp = binary;
+        *bcp++ = (u_int8_t) 0;  /* version byte */
+        *bcp++ = siz;
+        *bcp++ = hp;
+        *bcp++ = vp;
+        PUTLONG(latit,bcp);
+        PUTLONG(longit,bcp);
+        PUTLONG(alt,bcp);
+    
+        return (16);            /* size of RR in octets */
+}
+
+/* takes an on-the-wire LOC RR and formats it in a human readable format. */
+const char *
+loc_ntoa(binary, ascii)
+        const u_char *binary;
+        char *ascii;
+{
+        static char *error = "?";
+        register const u_char *cp = binary;
+
+        int latdeg, latmin, latsec, latsecfrac;
+        int longdeg, longmin, longsec, longsecfrac;
+        char northsouth, eastwest;
+        int altmeters, altfrac, altsign;
+
+        const int referencealt = 100000 * 100;
+
+        int32_t latval, longval, altval;
+        u_int32_t templ;
+        u_int8_t sizeval, hpval, vpval, versionval;
+    
+        char *sizestr, *hpstr, *vpstr;
+
+        versionval = *cp++;
+
+        if (versionval) {
+                sprintf(ascii, "; error: unknown LOC RR version");
+                return (ascii);
+        }
+
+        sizeval = *cp++;
+
+        hpval = *cp++;
+        vpval = *cp++;
+
+        GETLONG(templ, cp);
+        latval = (templ - ((unsigned)1<<31));
+
+        GETLONG(templ, cp);
+        longval = (templ - ((unsigned)1<<31));
+
+        GETLONG(templ, cp);
+        if (templ < referencealt) { /* below WGS 84 spheroid */
+                altval = referencealt - templ;
+                altsign = -1;
+        } else {
+                altval = templ - referencealt;
+                altsign = 1;
+        }
+
+        if (latval < 0) {
+                northsouth = 'S';
+                latval = -latval;
+        } else
+                northsouth = 'N';
+
+        latsecfrac = latval % 1000;
+        latval = latval / 1000;
+        latsec = latval % 60;
+        latval = latval / 60;
+        latmin = latval % 60;
+        latval = latval / 60;
+        latdeg = latval;
+
+        if (longval < 0) {
+                eastwest = 'W';
+                longval = -longval;
+        } else
+                eastwest = 'E';
+
+        longsecfrac = longval % 1000;
+        longval = longval / 1000;
+        longsec = longval % 60;
+        longval = longval / 60;
+        longmin = longval % 60;
+        longval = longval / 60;
+        longdeg = longval;
+
+        altfrac = altval % 100;
+        altmeters = (altval / 100) * altsign;
+
+        if ((sizestr = strdup(precsize_ntoa(sizeval))) == NULL)
+                sizestr = error;
+        if ((hpstr = strdup(precsize_ntoa(hpval))) == NULL)
+                hpstr = error;
+        if ((vpstr = strdup(precsize_ntoa(vpval))) == NULL)
+                vpstr = error;
+
+        sprintf(ascii,
+              "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
+                latdeg, latmin, latsec, latsecfrac, northsouth,
+                longdeg, longmin, longsec, longsecfrac, eastwest,
+                altmeters, altfrac, sizestr, hpstr, vpstr);
+
+        if (sizestr != error)
+                free(sizestr);
+        if (hpstr != error)
+                free(hpstr);
+        if (vpstr != error)
+                free(vpstr);
+
+        return (ascii);
+}
+
+
+/* Return the number of DNS hierarchy levels in the name. */
+int
+__dn_count_labels(name)
+        char *name;
+{
+        int i, len, count;
+
+        len = strlen(name);
+
+        for(i = 0, count = 0; i < len; i++) {
+                if (name[i] == '.')
+                        count++;
+        }
+
+        /* don't count initial wildcard */
+        if (name[0] == '*')
+                if (count)
+                        count--;
+
+        /* don't count the null label for root. */
+        /* if terminating '.' not found, must adjust */
+        /* count to include last label */
+        if (len > 0 && name[len-1] != '.')
+                count++;
+        return (count);
+}
+
+
+/* 
+ * Make dates expressed in seconds-since-Jan-1-1970 easy to read.  
+ * SIG records are required to be printed like this, by the Secure DNS RFC.
+ */
+char *
+__p_secstodate (secs)
+        unsigned long secs;
+{
+        static char output[15];         /* YYYYMMDDHHMMSS and null */
+        time_t clock = secs;
+        struct tm *time;
+        
+        time = gmtime(&clock);
+        time->tm_year += 1900;
+        time->tm_mon += 1;
+        sprintf(output, "%04d%02d%02d%02d%02d%02d",
+                time->tm_year, time->tm_mon, time->tm_mday,
+                time->tm_hour, time->tm_min, time->tm_sec);
+        return (output);
+}
diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
new file mode 100644
index 0000000000..df176b7fa1
--- /dev/null
+++ b/src/lib/libc/net/res_init.c
@@ -0,0 +1,518 @@
+/*      $OpenBSD: res_init.c,v 1.16 1998/03/16 05:07:01 millert Exp $   */
+
+/*
+ * ++Copyright++ 1985, 1989, 1993
+ * -
+ * Copyright (c) 1985, 1989, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)res_init.c  8.1 (Berkeley) 6/7/93";
+static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.16 1998/03/16 05:07:01 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <ctype.h>
+#include <resolv.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*-------------------------------------- info about "sortlist" --------------
+ * Marc Majka           1994/04/16
+ * Allan Nathanson      1994/10/29 (BIND 4.9.3.x)
+ *
+ * NetInfo resolver configuration directory support.
+ *
+ * Allow a NetInfo directory to be created in the hierarchy which
+ * contains the same information as the resolver configuration file.
+ *
+ * - The local domain name is stored as the value of the "domain" property.
+ * - The Internet address(es) of the name server(s) are stored as values
+ *   of the "nameserver" property.
+ * - The name server addresses are stored as values of the "nameserver"
+ *   property.
+ * - The search list for host-name lookup is stored as values of the
+ *   "search" property.
+ * - The sortlist comprised of IP address netmask pairs are stored as
+ *   values of the "sortlist" property. The IP address and optional netmask
+ *   should be seperated by a slash (/) or ampersand (&) character.
+ * - Internal resolver variables can be set from the value of the "options"
+ *   property.
+ */
+
+static void res_setoptions __P((char *, char *));
+
+#ifdef RESOLVSORT
+static const char sort_mask[] = "/&";
+#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
+static u_int32_t net_mask __P((struct in_addr));
+#endif
+
+/*
+ * Resolver state default settings.
+ */
+
+struct __res_state _res
+# if defined(__BIND_RES_TEXT)
+        = { RES_TIMEOUT, }      /* Motorola, et al. */
+# endif
+        ;
+
+/*
+ * Set up default settings.  If the configuration file exist, the values
+ * there will have precedence.  Otherwise, the server address is set to
+ * INADDR_ANY and the default domain name comes from the gethostname().
+ *
+ * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
+ * rather than INADDR_ANY ("0.0.0.0") as the default name server address
+ * since it was noted that INADDR_ANY actually meant ``the first interface
+ * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
+ * it had to be "up" in order for you to reach your own name server.  It
+ * was later decided that since the recommended practice is to always 
+ * install local static routes through 127.0.0.1 for all your network
+ * interfaces, that we could solve this problem without a code change.
+ *
+ * The configuration file should always be used, since it is the only way
+ * to specify a default domain.  If you are running a server on your local
+ * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
+ * in the configuration file.
+ *
+ * Return 0 if completes successfully, -1 on error
+ */
+int
+res_init()
+{
+        register FILE *fp;
+        register char *cp, **pp;
+        register int n;
+        char buf[BUFSIZ];
+        int nserv = 0;    /* number of nameserver records read from file */
+        int haveenv = 0;
+        int havesearch = 0;
+        size_t len;
+#ifdef RESOLVSORT
+        int nsort = 0;
+        char *net;
+#endif
+#ifndef RFC1535
+        int dots;
+#endif
+
+        /*
+         * These three fields used to be statically initialized.  This made
+         * it hard to use this code in a shared library.  It is necessary,
+         * now that we're doing dynamic initialization here, that we preserve
+         * the old semantics: if an application modifies one of these three
+         * fields of _res before res_init() is called, res_init() will not
+         * alter them.  Of course, if an application is setting them to
+         * _zero_ before calling res_init(), hoping to override what used
+         * to be the static default, we can't detect it and unexpected results
+         * will follow.  Zero for any of these fields would make no sense,
+         * so one can safely assume that the applications were already getting
+         * unexpected results.
+         *
+         * _res.options is tricky since some apps were known to diddle the bits
+         * before res_init() was first called. We can't replicate that semantic
+         * with dynamic initialization (they may have turned bits off that are
+         * set in RES_DEFAULT).  Our solution is to declare such applications
+         * "broken".  They could fool us by setting RES_INIT but none do (yet).
+         */
+        if (!_res.retrans)
+                _res.retrans = RES_TIMEOUT;
+        if (!_res.retry)
+                _res.retry = 4;
+        if (!(_res.options & RES_INIT))
+                _res.options = RES_DEFAULT;
+
+#ifdef USELOOPBACK
+        _res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
+#else
+        _res.nsaddr.sin_addr.s_addr = INADDR_ANY;
+#endif
+        _res.nsaddr.sin_family = AF_INET;
+        _res.nsaddr.sin_port = htons(NAMESERVER_PORT);
+        _res.nscount = 1;
+        _res.ndots = 1;
+        _res.pfcode = 0;
+        strncpy(_res.lookups, "f", sizeof _res.lookups);
+
+        /* Allow user to override the local domain definition */
+        if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
+                (void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
+                _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                haveenv++;
+
+                /*
+                 * Set search list to be blank-separated strings
+                 * from rest of env value.  Permits users of LOCALDOMAIN
+                 * to still have a search list, and anyone to set the
+                 * one that they want to use as an individual (even more
+                 * important now that the rfc1535 stuff restricts searches)
+                 */
+                cp = _res.defdname;
+                pp = _res.dnsrch;
+                *pp++ = cp;
+                for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
+                        if (*cp == '\n')        /* silly backwards compat */
+                                break;
+                        else if (*cp == ' ' || *cp == '\t') {
+                                *cp = 0;
+                                n = 1;
+                        } else if (n) {
+                                *pp++ = cp;
+                                n = 0;
+                                havesearch = 1;
+                        }
+                }
+                /* null terminate last domain if there are excess */
+                while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
+                        cp++;
+                *cp = '\0';
+                *pp++ = 0;
+        }
+
+#define MATCH(line, name) \
+        (!strncmp(line, name, sizeof(name) - 1) && \
+        (line[sizeof(name) - 1] == ' ' || \
+         line[sizeof(name) - 1] == '\t'))
+
+        if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
+            strncpy(_res.lookups, "bf", sizeof _res.lookups);
+
+            /* read the config file */
+            buf[0] = '\0';
+            while ((cp = fgetln(fp, &len)) != NULL) {
+                /* skip lines that are too long or zero length */
+                if (len >= sizeof(buf) || len == 0)
+                    continue;
+                (void)memcpy(buf, cp, len);
+                buf[len] = '\0';
+                /* skip comments */
+                if ((cp = strpbrk(buf, ";#")) != NULL)
+                        *cp = '\0';
+                if (buf[0] == '\0')
+                        continue;
+                /* read default domain name */
+                if (MATCH(buf, "domain")) {
+                    if (haveenv)        /* skip if have from environ */
+                            continue;
+                    cp = buf + sizeof("domain") - 1;
+                    while (*cp == ' ' || *cp == '\t')
+                            cp++;
+                    if ((*cp == '\0') || (*cp == '\n'))
+                            continue;
+                    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
+                    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                    if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
+                            *cp = '\0';
+                    havesearch = 0;
+                    continue;
+                }
+                /* lookup types */
+                if (MATCH(buf, "lookup")) {
+                    char *sp = NULL;
+
+                    bzero(_res.lookups, sizeof _res.lookups);
+                    cp = buf + sizeof("lookup") - 1;
+                    for (n = 0;; cp++) {
+                            if (n == MAXDNSLUS)
+                                    break;
+                            if ((*cp == '\0') || (*cp == '\n')) {
+                                    if (sp) {
+                                            if (*sp=='y' || *sp=='b' || *sp=='f')
+                                                    _res.lookups[n++] = *sp;
+                                            sp = NULL;
+                                    }
+                                    break;
+                            } else if ((*cp == ' ') || (*cp == '\t') || (*cp == ',')) {
+                                    if (sp) {
+                                            if (*sp=='y' || *sp=='b' || *sp=='f')
+                                                    _res.lookups[n++] = *sp;
+                                            sp = NULL;
+                                    }
+                            } else if (sp == NULL)
+                                    sp = cp;
+                    }
+                    continue;
+                }
+                /* set search list */
+                if (MATCH(buf, "search")) {
+                    if (haveenv)        /* skip if have from environ */
+                            continue;
+                    cp = buf + sizeof("search") - 1;
+                    while (*cp == ' ' || *cp == '\t')
+                            cp++;
+                    if ((*cp == '\0') || (*cp == '\n'))
+                            continue;
+                    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
+                    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+                    if ((cp = strchr(_res.defdname, '\n')) != NULL)
+                            *cp = '\0';
+                    /*
+                     * Set search list to be blank-separated strings
+                     * on rest of line.
+                     */
+                    cp = _res.defdname;
+                    pp = _res.dnsrch;
+                    *pp++ = cp;
+                    for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
+                            if (*cp == ' ' || *cp == '\t') {
+                                    *cp = 0;
+                                    n = 1;
+                            } else if (n) {
+                                    *pp++ = cp;
+                                    n = 0;
+                            }
+                    }
+                    /* null terminate last domain if there are excess */
+                    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
+                            cp++;
+                    *cp = '\0';
+                    *pp++ = 0;
+                    havesearch = 1;
+                    continue;
+                }
+                /* read nameservers to query */
+                if (MATCH(buf, "nameserver") && nserv < MAXNS) {
+                    struct in_addr a;
+
+                    cp = buf + sizeof("nameserver") - 1;
+                    while (*cp == ' ' || *cp == '\t')
+                        cp++;
+                    if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
+                        _res.nsaddr_list[nserv].sin_addr = a;
+                        _res.nsaddr_list[nserv].sin_family = AF_INET;
+                        _res.nsaddr_list[nserv].sin_port =
+                                htons(NAMESERVER_PORT);
+                        nserv++;
+                    }
+                    continue;
+                }
+#ifdef RESOLVSORT
+                if (MATCH(buf, "sortlist")) {
+                    struct in_addr a;
+
+                    cp = buf + sizeof("sortlist") - 1;
+                    while (nsort < MAXRESOLVSORT) {
+                        while (*cp == ' ' || *cp == '\t')
+                            cp++;
+                        if (*cp == '\0' || *cp == '\n' || *cp == ';')
+                            break;
+                        net = cp;
+                        while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
+                               isascii(*cp) && !isspace(*cp))
+                                cp++;
+                        n = *cp;
+                        *cp = 0;
+                        if (inet_aton(net, &a)) {
+                            _res.sort_list[nsort].addr = a;
+                            if (ISSORTMASK(n)) {
+                                *cp++ = n;
+                                net = cp;
+                                while (*cp && *cp != ';' &&
+                                        isascii(*cp) && !isspace(*cp))
+                                    cp++;
+                                n = *cp;
+                                *cp = 0;
+                                if (inet_aton(net, &a)) {
+                                    _res.sort_list[nsort].mask = a.s_addr;
+                                } else {
+                                    _res.sort_list[nsort].mask = 
+                                        net_mask(_res.sort_list[nsort].addr);
+                                }
+                            } else {
+                                _res.sort_list[nsort].mask = 
+                                    net_mask(_res.sort_list[nsort].addr);
+                            }
+                            nsort++;
+                        }
+                        *cp = n;
+                    }
+                    continue;
+                }
+#endif
+                if (MATCH(buf, "options")) {
+                    res_setoptions(buf + sizeof("options") - 1, "conf");
+                    continue;
+                }
+            }
+            if (nserv > 1) 
+                _res.nscount = nserv;
+#ifdef RESOLVSORT
+            _res.nsort = nsort;
+#endif
+            (void) fclose(fp);
+        }
+        if (_res.defdname[0] == 0 &&
+            gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
+            (cp = strchr(buf, '.')) != NULL)
+        {
+                strncpy(_res.defdname, cp + 1,
+                        sizeof(_res.defdname) - 1);
+                _res.defdname[sizeof(_res.defdname) - 1] = '\0';
+        }
+
+        /* find components of local domain that might be searched */
+        if (havesearch == 0) {
+                pp = _res.dnsrch;
+                *pp++ = _res.defdname;
+                *pp = NULL;
+
+#ifndef RFC1535
+                dots = 0;
+                for (cp = _res.defdname; *cp; cp++)
+                        dots += (*cp == '.');
+
+                cp = _res.defdname;
+                while (pp < _res.dnsrch + MAXDFLSRCH) {
+                        if (dots < LOCALDOMAINPARTS)
+                                break;
+                        cp = strchr(cp, '.') + 1;    /* we know there is one */
+                        *pp++ = cp;
+                        dots--;
+                }
+                *pp = NULL;
+#ifdef DEBUG
+                if (_res.options & RES_DEBUG) {
+                        printf(";; res_init()... default dnsrch list:\n");
+                        for (pp = _res.dnsrch; *pp; pp++)
+                                printf(";;\t%s\n", *pp);
+                        printf(";;\t..END..\n");
+                }
+#endif /* DEBUG */
+#endif /* !RFC1535 */
+        }
+
+        if (issetugid())
+                _res.options |= RES_NOALIASES;
+        else if ((cp = getenv("RES_OPTIONS")) != NULL)
+                res_setoptions(cp, "env");
+        _res.options |= RES_INIT;
+        return (0);
+}
+
+/* ARGSUSED */
+static void
+res_setoptions(options, source)
+        char *options, *source;
+{
+        char *cp = options;
+        int i;
+
+#ifdef DEBUG
+        if (_res.options & RES_DEBUG)
+                printf(";; res_setoptions(\"%s\", \"%s\")...\n",
+                       options, source);
+#endif
+        while (*cp) {
+                /* skip leading and inner runs of spaces */
+                while (*cp == ' ' || *cp == '\t')
+                        cp++;
+                /* search for and process individual options */
+                if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
+                        i = atoi(cp + sizeof("ndots:") - 1);
+                        if (i <= RES_MAXNDOTS)
+                                _res.ndots = i;
+                        else
+                                _res.ndots = RES_MAXNDOTS;
+#ifdef DEBUG
+                        if (_res.options & RES_DEBUG)
+                                printf(";;\tndots=%d\n", _res.ndots);
+#endif
+                } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
+#ifdef DEBUG
+                        if (!(_res.options & RES_DEBUG)) {
+                                printf(";; res_setoptions(\"%s\", \"%s\")..\n",
+                                       options, source);
+                                _res.options |= RES_DEBUG;
+                        }
+                        printf(";;\tdebug\n");
+#endif
+                } else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
+                        _res.options |= RES_USE_INET6;
+                } else {
+                        /* XXX - print a warning here? */
+                }
+                /* skip to next run of spaces */
+                while (*cp && *cp != ' ' && *cp != '\t')
+                        cp++;
+        }
+}
+
+#ifdef RESOLVSORT
+/* XXX - should really support CIDR which means explicit masks always. */
+static u_int32_t
+net_mask(in)            /* XXX - should really use system's version of this */
+        struct in_addr in;
+{
+        register u_int32_t i = ntohl(in.s_addr);
+
+        if (IN_CLASSA(i))
+                return (htonl(IN_CLASSA_NET));
+        else if (IN_CLASSB(i))
+                return (htonl(IN_CLASSB_NET));
+        return (htonl(IN_CLASSC_NET));
+}
+#endif
diff --git a/src/lib/libc/net/res_mkquery.c b/src/lib/libc/net/res_mkquery.c
new file mode 100644
index 0000000000..3e7e2ae5d3
--- /dev/null
+++ b/src/lib/libc/net/res_mkquery.c
@@ -0,0 +1,195 @@
+/*      $OpenBSD: res_mkquery.c,v 1.8 1997/04/13 22:37:21 provos Exp $  */
+
+/*
+ * ++Copyright++ 1985, 1993
+ * -
+ * Copyright (c) 1985, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)res_mkquery.c       8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$From: res_mkquery.c,v 8.5 1996/08/27 08:33:28 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_mkquery.c,v 1.8 1997/04/13 22:37:21 provos Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <netdb.h>
+#include <resolv.h>
+#include <string.h>
+
+/*
+ * Form all types of queries.
+ * Returns the size of the result or -1.
+ */
+/* ARGSUSED */
+int
+res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
+        int op;                 /* opcode of query */
+        const char *dname;      /* domain name */
+        int class, type;        /* class and type of query */
+        const u_char *data;     /* resource record data */
+        int datalen;            /* length of data */
+        const u_char *newrr_in; /* new rr for modify or append */
+        u_char *buf;            /* buffer to put query */
+        int buflen;             /* size of buffer */
+{
+        register HEADER *hp;
+        register u_char *cp;
+        register int n;
+        u_char *dnptrs[20], **dpp, **lastdnptr;
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                h_errno = NETDB_INTERNAL;
+                return (-1);
+        }
+#ifdef DEBUG
+        if (_res.options & RES_DEBUG)
+                printf(";; res_mkquery(%d, %s, %d, %d)\n",
+                       op, dname, class, type);
+#endif
+        /*
+         * Initialize header fields.
+         *
+         * A special random number generator is used to create non predictable
+         * and non repeating ids over a long period. It also avoids reuse
+         * by switching between two distinct number cycles.
+         */
+
+        if ((buf == NULL) || (buflen < HFIXEDSZ))
+                return (-1);
+        bzero(buf, HFIXEDSZ);
+        hp = (HEADER *) buf;
+        _res.id = res_randomid();
+        hp->id = htons(_res.id);
+        hp->opcode = op;
+        hp->rd = (_res.options & RES_RECURSE) != 0;
+        hp->rcode = NOERROR;
+        cp = buf + HFIXEDSZ;
+        buflen -= HFIXEDSZ;
+        dpp = dnptrs;
+        *dpp++ = buf;
+        *dpp++ = NULL;
+        lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
+        /*
+         * perform opcode specific processing
+         */
+        switch (op) {
+        case QUERY:     /*FALLTHROUGH*/
+        case NS_NOTIFY_OP:
+                if ((buflen -= QFIXEDSZ) < 0)
+                        return (-1);
+                if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
+                        return (-1);
+                cp += n;
+                buflen -= n;
+                __putshort(type, cp);
+                cp += INT16SZ;
+                __putshort(class, cp);
+                cp += INT16SZ;
+                hp->qdcount = htons(1);
+                if (op == QUERY || data == NULL)
+                        break;
+                /*
+                 * Make an additional record for completion domain.
+                 */
+                buflen -= RRFIXEDSZ;
+                n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
+                if (n < 0)
+                        return (-1);
+                cp += n;
+                buflen -= n;
+                __putshort(T_NULL, cp);
+                cp += INT16SZ;
+                __putshort(class, cp);
+                cp += INT16SZ;
+                __putlong(0, cp);
+                cp += INT32SZ;
+                __putshort(0, cp);
+                cp += INT16SZ;
+                hp->arcount = htons(1);
+                break;
+
+        case IQUERY:
+                /*
+                 * Initialize answer section
+                 */
+                if (buflen < 1 + RRFIXEDSZ + datalen)
+                        return (-1);
+                *cp++ = '\0';   /* no domain name */
+                __putshort(type, cp);
+                cp += INT16SZ;
+                __putshort(class, cp);
+                cp += INT16SZ;
+                __putlong(0, cp);
+                cp += INT32SZ;
+                __putshort(datalen, cp);
+                cp += INT16SZ;
+                if (datalen) {
+                        bcopy(data, cp, datalen);
+                        cp += datalen;
+                }
+                hp->ancount = htons(1);
+                break;
+
+        default:
+                return (-1);
+        }
+        return (cp - buf);
+}
diff --git a/src/lib/libc/net/res_query.c b/src/lib/libc/net/res_query.c
new file mode 100644
index 0000000000..a08897b45a
--- /dev/null
+++ b/src/lib/libc/net/res_query.c
@@ -0,0 +1,398 @@
+/*      $OpenBSD: res_query.c,v 1.12 1998/08/31 18:15:29 deraadt Exp $  */
+
+/*
+ * ++Copyright++ 1988, 1993
+ * -
+ * Copyright (c) 1988, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$From: res_query.c,v 8.9 1996/09/22 00:13:28 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_query.c,v 1.12 1998/08/31 18:15:29 deraadt Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <stdio.h>
+#include <netdb.h>
+#include <resolv.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#if PACKETSZ > 1024
+#define MAXPACKET       PACKETSZ
+#else
+#define MAXPACKET       1024
+#endif
+
+const char *hostalias __P((const char *));
+int h_errno;
+
+/*
+ * Formulate a normal query, send, and await answer.
+ * Returned answer is placed in supplied buffer "answer".
+ * Perform preliminary check of answer, returning success only
+ * if no error is indicated and the answer count is nonzero.
+ * Return the size of the response on success, -1 on error.
+ * Error number is left in h_errno.
+ *
+ * Caller must parse answer and determine whether it answers the question.
+ */
+int
+res_query(name, class, type, answer, anslen)
+        const char *name;       /* domain name */
+        int class, type;        /* class and type of query */
+        u_char *answer;         /* buffer to put answer */
+        int anslen;             /* size of answer buffer */
+{
+        u_char buf[MAXPACKET];
+        register HEADER *hp = (HEADER *) answer;
+        int n;
+
+        hp->rcode = NOERROR;    /* default */
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                h_errno = NETDB_INTERNAL;
+                return (-1);
+        }
+#ifdef DEBUG
+        if (_res.options & RES_DEBUG)
+                printf(";; res_query(%s, %d, %d)\n", name, class, type);
+#endif
+
+        n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
+                        buf, sizeof(buf));
+        if (n <= 0) {
+#ifdef DEBUG
+                if (_res.options & RES_DEBUG)
+                        printf(";; res_query: mkquery failed\n");
+#endif
+                h_errno = NO_RECOVERY;
+                return (n);
+        }
+        n = res_send(buf, n, answer, anslen);
+        if (n < 0) {
+#ifdef DEBUG
+                if (_res.options & RES_DEBUG)
+                        printf(";; res_query: send error\n");
+#endif
+                h_errno = TRY_AGAIN;
+                return (n);
+        }
+
+        if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
+#ifdef DEBUG
+                if (_res.options & RES_DEBUG)
+                        printf(";; rcode = %d, ancount=%d\n", hp->rcode,
+                            ntohs(hp->ancount));
+#endif
+                switch (hp->rcode) {
+                case NXDOMAIN:
+                        h_errno = HOST_NOT_FOUND;
+                        break;
+                case SERVFAIL:
+                        h_errno = TRY_AGAIN;
+                        break;
+                case NOERROR:
+                        h_errno = NO_DATA;
+                        break;
+                case FORMERR:
+                case NOTIMP:
+                case REFUSED:
+                default:
+                        h_errno = NO_RECOVERY;
+                        break;
+                }
+                return (-1);
+        }
+        return (n);
+}
+
+/*
+ * Formulate a normal query, send, and retrieve answer in supplied buffer.
+ * Return the size of the response on success, -1 on error.
+ * If enabled, implement search rules until answer or unrecoverable failure
+ * is detected.  Error code, if any, is left in h_errno.
+ */
+int
+res_search(name, class, type, answer, anslen)
+        const char *name;       /* domain name */
+        int class, type;        /* class and type of query */
+        u_char *answer;         /* buffer to put answer */
+        int anslen;             /* size of answer */
+{
+        register const char *cp, * const *domain;
+        HEADER *hp = (HEADER *) answer;
+        u_int dots;
+        int trailing_dot, ret, saved_herrno;
+        int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                h_errno = NETDB_INTERNAL;
+                return (-1);
+        }
+        errno = 0;
+        h_errno = HOST_NOT_FOUND;       /* default, if we never query */
+        dots = 0;
+        for (cp = name; *cp; cp++)
+                dots += (*cp == '.');
+        trailing_dot = 0;
+        if (cp > name && *--cp == '.')
+                trailing_dot++;
+
+        /*
+         * if there aren't any dots, it could be a user-level alias
+         */
+        if (!dots && (cp = __hostalias(name)) != NULL)
+                return (res_query(cp, class, type, answer, anslen));
+
+        /*
+         * If there are dots in the name already, let's just give it a try
+         * 'as is'.  The threshold can be set with the "ndots" option.
+         */
+        saved_herrno = -1;
+        if (dots >= _res.ndots) {
+                ret = res_querydomain(name, NULL, class, type, answer, anslen);
+                if (ret > 0)
+                        return (ret);
+                saved_herrno = h_errno;
+                tried_as_is++;
+        }
+
+        /*
+         * We do at least one level of search if
+         *      - there is no dot and RES_DEFNAME is set, or
+         *      - there is at least one dot, there is no trailing dot,
+         *        and RES_DNSRCH is set.
+         */
+        if ((!dots && (_res.options & RES_DEFNAMES)) ||
+            (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
+                int done = 0;
+
+                for (domain = (const char * const *)_res.dnsrch;
+                     *domain && !done;
+                     domain++) {
+
+                        ret = res_querydomain(name, *domain, class, type,
+                                              answer, anslen);
+                        if (ret > 0)
+                                return (ret);
+
+                        /*
+                         * If no server present, give up.
+                         * If name isn't found in this domain,
+                         * keep trying higher domains in the search list
+                         * (if that's enabled).
+                         * On a NO_DATA error, keep trying, otherwise
+                         * a wildcard entry of another type could keep us
+                         * from finding this entry higher in the domain.
+                         * If we get some other error (negative answer or
+                         * server failure), then stop searching up,
+                         * but try the input name below in case it's
+                         * fully-qualified.
+                         */
+                        if (errno == ECONNREFUSED) {
+                                h_errno = TRY_AGAIN;
+                                return (-1);
+                        }
+
+                        switch (h_errno) {
+                        case NO_DATA:
+                                got_nodata++;
+                                /* FALLTHROUGH */
+                        case HOST_NOT_FOUND:
+                                /* keep trying */
+                                break;
+                        case TRY_AGAIN:
+                                if (hp->rcode == SERVFAIL) {
+                                        /* try next search element, if any */
+                                        got_servfail++;
+                                        break;
+                                }
+                                /* FALLTHROUGH */
+                        default:
+                                /* anything else implies that we're done */
+                                done++;
+                        }
+
+                        /* if we got here for some reason other than DNSRCH,
+                         * we only wanted one iteration of the loop, so stop.
+                         */
+                        if (!(_res.options & RES_DNSRCH))
+                                done++;
+                }
+        }
+
+        /* if we have not already tried the name "as is", do that now.
+         * note that we do this regardless of how many dots were in the
+         * name or whether it ends with a dot.
+         */
+        if (!tried_as_is) {
+                ret = res_querydomain(name, NULL, class, type, answer, anslen);
+                if (ret > 0)
+                        return (ret);
+        }
+
+        /* if we got here, we didn't satisfy the search.
+         * if we did an initial full query, return that query's h_errno
+         * (note that we wouldn't be here if that query had succeeded).
+         * else if we ever got a nodata, send that back as the reason.
+         * else send back meaningless h_errno, that being the one from
+         * the last DNSRCH we did.
+         */
+        if (saved_herrno != -1)
+                h_errno = saved_herrno;
+        else if (got_nodata)
+                h_errno = NO_DATA;
+        else if (got_servfail)
+                h_errno = TRY_AGAIN;
+        return (-1);
+}
+
+/*
+ * Perform a call on res_query on the concatenation of name and domain,
+ * removing a trailing dot from name if domain is NULL.
+ */
+int
+res_querydomain(name, domain, class, type, answer, anslen)
+        const char *name, *domain;
+        int class, type;        /* class and type of query */
+        u_char *answer;         /* buffer to put answer */
+        int anslen;             /* size of answer */
+{
+        char nbuf[MAXDNAME*2+1];
+        const char *longname = nbuf;
+        int n;
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                h_errno = NETDB_INTERNAL;
+                return (-1);
+        }
+#ifdef DEBUG
+        if (_res.options & RES_DEBUG)
+                printf(";; res_querydomain(%s, %s, %d, %d)\n",
+                       name, domain?domain:"<Nil>", class, type);
+#endif
+        if (domain == NULL) {
+                /*
+                 * Check for trailing '.';
+                 * copy without '.' if present.
+                 */
+                n = strlen(name) - 1;
+                if (n != (0 - 1) && name[n] == '.' && n < sizeof(nbuf) - 1) {
+                        bcopy(name, nbuf, n);
+                        nbuf[n] = '\0';
+                } else
+                        longname = name;
+        } else
+                sprintf(nbuf, "%.*s.%.*s", MAXDNAME, name, MAXDNAME, domain);
+
+        return (res_query(longname, class, type, answer, anslen));
+}
+
+const char *
+hostalias(name)
+        register const char *name;
+{
+        register char *cp1, *cp2;
+        FILE *fp;
+        char *file;
+        char buf[BUFSIZ];
+        static char abuf[MAXDNAME];
+        size_t len;
+
+        if (_res.options & RES_NOALIASES)
+                return (NULL);
+        file = getenv("HOSTALIASES");
+        if (issetugid() != 0 || file == NULL || (fp = fopen(file, "r")) == NULL)
+                return (NULL);
+        setbuf(fp, NULL);
+        while ((cp1 = fgetln(fp, &len)) != NULL) {
+                if (cp1[len-1] == '\n')
+                        len--;
+                if (len >= sizeof(buf) || len == 0)
+                        continue;
+                (void)memcpy(buf, cp1, len);
+                buf[len] = '\0';
+                
+                for (cp1 = buf; *cp1 && !isspace(*cp1); ++cp1)
+                        ;
+                if (!*cp1)
+                        break;
+                *cp1 = '\0';
+                if (!strcasecmp(buf, name)) {
+                        while (isspace(*++cp1))
+                                ;
+                        if (!*cp1)
+                                break;
+                        for (cp2 = cp1 + 1; *cp2 && !isspace(*cp2); ++cp2)
+                                ;
+                        strncpy(abuf, cp1, sizeof(abuf) - 1);
+                        abuf[sizeof(abuf) - 1] = *cp2 = '\0';
+                        fclose(fp);
+                        return (abuf);
+                }
+        }
+        fclose(fp);
+        return (NULL);
+}
diff --git a/src/lib/libc/net/res_random.c b/src/lib/libc/net/res_random.c
new file mode 100644
index 0000000000..bd32a50c33
--- /dev/null
+++ b/src/lib/libc/net/res_random.c
@@ -0,0 +1,233 @@
+/* $OpenBSD: res_random.c,v 1.7 1997/07/25 20:30:08 mickey Exp $ */
+
+/*
+ * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * All rights reserved.
+ *
+ * Theo de Raadt <deraadt@openbsd.org> came up with the idea of using
+ * such a mathematical system to generate more random (yet non-repeating)
+ * ids to solve the resolver/named problem.  But Niels designed the
+ * actual system based on the constraints.
+ *
+ * Redistribution and use in source 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 Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* 
+ * seed = random 15bit
+ * n = prime, g0 = generator to n,
+ * j = random so that gcd(j,n-1) == 1
+ * g = g0^j mod n will be a generator again.
+ *
+ * X[0] = random seed.
+ * X[n] = a*X[n-1]+b mod m is a Linear Congruential Generator
+ * with a = 7^(even random) mod m, 
+ *      b = random with gcd(b,m) == 1
+ *      m = 31104 and a maximal period of m-1.
+ *
+ * The transaction id is determined by:
+ * id[n] = seed xor (g^X[n] mod n)
+ *
+ * Effectivly the id is restricted to the lower 15 bits, thus
+ * yielding two different cycles by toggling the msb on and off.
+ * This avoids reuse issues caused by reseeding.
+ *
+ * The 16 bit space is very small and brute force attempts are
+ * entirly feasible, we skip a random number of transaction ids
+ * so that an attacker will not get sequential ids.
+ */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <resolv.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define RU_OUT  180             /* Time after wich will be reseeded */
+#define RU_MAX  30000           /* Uniq cycle, avoid blackjack prediction */
+#define RU_GEN  2               /* Starting generator */
+#define RU_N    32749           /* RU_N-1 = 2*2*3*2729 */
+#define RU_AGEN 7               /* determine ru_a as RU_AGEN^(2*rand) */
+#define RU_M    31104           /* RU_M = 2^7*3^5 - don't change */
+
+#define PFAC_N 3
+const static u_int16_t pfacts[PFAC_N] = {
+        2, 
+        3,
+        2729
+};
+
+static u_int16_t ru_x;
+static u_int16_t ru_seed;
+static u_int16_t ru_a, ru_b;
+static u_int16_t ru_g;
+static u_int16_t ru_counter = 0;
+static u_int16_t ru_msb = 0;
+static long ru_reseed;
+static u_int32_t tmp;                /* Storage for unused random */
+static struct timeval tv;
+
+static u_int16_t pmod __P((u_int16_t, u_int16_t, u_int16_t));
+static void res_initid __P((void));
+
+/*
+ * Do a fast modular exponation, returned value will be in the range
+ * of 0 - (mod-1)
+ */
+
+#ifdef __STDC__
+static u_int16_t
+pmod(u_int16_t gen, u_int16_t exp, u_int16_t mod)
+#else
+static u_int16_t
+pmod(gen, exp, mod)
+        u_int16_t gen, exp, mod;
+#endif
+{
+        u_int16_t s, t, u;
+
+        s = 1;
+        t = gen;
+        u = exp;
+
+        while (u) {
+                if (u & 1)
+                        s = (s*t) % mod;
+                u >>= 1;
+                t = (t*t) % mod;
+        }
+        return (s);
+}
+
+/* 
+ * Initalizes the seed and chooses a suitable generator. Also toggles 
+ * the msb flag. The msb flag is used to generate two distinct
+ * cycles of random numbers and thus avoiding reuse of ids.
+ *
+ * This function is called from res_randomid() when needed, an 
+ * application does not have to worry about it.
+ */
+static void 
+res_initid()
+{
+        u_int16_t j, i;
+        int noprime = 1;
+
+        tmp = arc4random();
+        ru_x = (tmp & 0xFFFF) % RU_M;
+
+        /* 15 bits of random seed */
+        ru_seed = (tmp >> 16) & 0x7FFF;
+
+        tmp = arc4random();
+
+        /* Determine the LCG we use */
+        ru_b = (tmp & 0xfffe) | 1;
+        ru_a = pmod(RU_AGEN, (tmp >> 16) & 0xfffe, RU_M);
+        while (ru_b % 3 == 0)
+          ru_b += 2;
+        
+        tmp = arc4random();
+        j = tmp % RU_N;
+        tmp = tmp >> 16;
+
+        /* 
+         * Do a fast gcd(j,RU_N-1), so we can find a j with
+         * gcd(j, RU_N-1) == 1, giving a new generator for
+         * RU_GEN^j mod RU_N
+         */
+
+        while (noprime) {
+                for (i=0; i<PFAC_N; i++)
+                        if (j%pfacts[i] == 0)
+                                break;
+
+                if (i>=PFAC_N)
+                        noprime = 0;
+                else 
+                        j = (j+1) % RU_N;
+        }
+
+        ru_g = pmod(RU_GEN,j,RU_N);
+        ru_counter = 0;
+
+        gettimeofday(&tv, NULL);
+        ru_reseed = tv.tv_sec + RU_OUT;
+        ru_msb = ru_msb == 0x8000 ? 0 : 0x8000; 
+}
+
+u_int
+res_randomid()
+{
+        int i, n;
+
+        gettimeofday(&tv, NULL);
+        if (ru_counter >= RU_MAX || tv.tv_sec > ru_reseed)
+                res_initid();
+
+        if (!tmp)
+                tmp = arc4random();
+
+        /* Skip a random number of ids */
+        n = tmp & 0x7; tmp = tmp >> 3;
+        if (ru_counter + n >= RU_MAX)
+                res_initid();
+
+        for (i=0; i<=n; i++)
+                /* Linear Congruential Generator */
+                ru_x = (ru_a*ru_x + ru_b) % RU_M;
+
+        ru_counter += i;
+
+        return (ru_seed ^ pmod(ru_g,ru_x,RU_N)) | ru_msb;
+}
+
+#if 0
+void
+main(int argc, char **argv)
+{
+        int i, n;
+        u_int16_t wert;
+
+        res_initid();
+
+        printf("Generator: %d\n", ru_g);
+        printf("Seed: %d\n", ru_seed);
+        printf("Reseed at %ld\n", ru_reseed);
+        printf("Ru_X: %d\n", ru_x);
+        printf("Ru_A: %d\n", ru_a);
+        printf("Ru_B: %d\n", ru_b);
+
+        n = atoi(argv[1]);
+        for (i=0;i<n;i++) {
+                wert = res_randomid();
+                printf("%06d\n", wert);
+        }
+}
+#endif
+
diff --git a/src/lib/libc/net/res_send.c b/src/lib/libc/net/res_send.c
new file mode 100644
index 0000000000..0cda3510eb
--- /dev/null
+++ b/src/lib/libc/net/res_send.c
@@ -0,0 +1,780 @@
+/*      $OpenBSD: res_send.c,v 1.8 1998/03/19 00:30:08 millert Exp $    */
+
+/*
+ * ++Copyright++ 1985, 1989, 1993
+ * -
+ * Copyright (c) 1985, 1989, 1993
+ *    The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)res_send.c  8.1 (Berkeley) 6/4/93";
+static char rcsid[] = "$From: res_send.c,v 8.12 1996/10/08 04:51:06 vixie Exp $";
+#else
+static char rcsid[] = "$OpenBSD: res_send.c,v 1.8 1998/03/19 00:30:08 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+        /* change this to "0"
+         * if you talk to a lot
+         * of multi-homed SunOS
+         * ("broken") name servers.
+         */
+#define CHECK_SRVR_ADDR 1       /* XXX - should be in options.h */
+
+/*
+ * Send query to name server and wait for reply.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <arpa/inet.h>
+
+#include <stdio.h>
+#include <netdb.h>
+#include <errno.h>
+#include <resolv.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static int s = -1;      /* socket used for communications */
+static int connected = 0;       /* is the socket connected */
+static int vc = 0;      /* is the socket a virtual ciruit? */
+
+#ifndef FD_SET
+/* XXX - should be in portability.h */
+#define NFDBITS         32
+#define FD_SETSIZE      32
+#define FD_SET(n, p)    ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
+#define FD_CLR(n, p)    ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
+#define FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
+#define FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
+#endif
+
+#define CAN_RECONNECT 1
+
+#ifndef DEBUG
+#   define Dprint(cond, args) /*empty*/
+#   define DprintQ(cond, args, query, size) /*empty*/
+#   define Aerror(file, string, error, address) /*empty*/
+#   define Perror(file, string, error) /*empty*/
+#else
+#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
+#   define DprintQ(cond, args, query, size) if (cond) {\
+                        fprintf args;\
+                        __fp_nquery(query, size, stdout);\
+                } else {}
+    static void
+    Aerror(file, string, error, address)
+        FILE *file;
+        char *string;
+        int error;
+        struct sockaddr_in address;
+    {
+        int save = errno;
+
+        if (_res.options & RES_DEBUG) {
+                fprintf(file, "res_send: %s ([%s].%u): %s\n",
+                        string,
+                        inet_ntoa(address.sin_addr),
+                        ntohs(address.sin_port),
+                        strerror(error));
+        }
+        errno = save;
+    }
+    static void
+    Perror(file, string, error)
+        FILE *file;
+        char *string;
+        int error;
+    {
+        int save = errno;
+
+        if (_res.options & RES_DEBUG) {
+                fprintf(file, "res_send: %s: %s\n",
+                        string, strerror(error));
+        }
+        errno = save;
+    }
+#endif
+
+static res_send_qhook Qhook = NULL;
+static res_send_rhook Rhook = NULL;
+
+void
+res_send_setqhook(hook)
+        res_send_qhook hook;
+{
+
+        Qhook = hook;
+}
+
+void
+res_send_setrhook(hook)
+        res_send_rhook hook;
+{
+
+        Rhook = hook;
+}
+
+/* int
+ * res_isourserver(ina)
+ *      looks up "ina" in _res.ns_addr_list[]
+ * returns:
+ *      0  : not found
+ *      >0 : found
+ * author:
+ *      paul vixie, 29may94
+ */
+int
+res_isourserver(inp)
+        const struct sockaddr_in *inp;
+{
+        struct sockaddr_in ina;
+        register int ns, ret;
+
+        ina = *inp;
+        ret = 0;
+        for (ns = 0;  ns < _res.nscount;  ns++) {
+                register const struct sockaddr_in *srv = &_res.nsaddr_list[ns];
+
+                if (srv->sin_family == ina.sin_family &&
+                    srv->sin_port == ina.sin_port &&
+                    (srv->sin_addr.s_addr == INADDR_ANY ||
+                     srv->sin_addr.s_addr == ina.sin_addr.s_addr)) {
+                        ret++;
+                        break;
+                }
+        }
+        return (ret);
+}
+
+/* int
+ * res_nameinquery(name, type, class, buf, eom)
+ *      look for (name,type,class) in the query section of packet (buf,eom)
+ * returns:
+ *      -1 : format error
+ *      0  : not found
+ *      >0 : found
+ * author:
+ *      paul vixie, 29may94
+ */
+int
+res_nameinquery(name, type, class, buf, eom)
+        const char *name;
+        register int type, class;
+        const u_char *buf, *eom;
+{
+        register const u_char *cp = buf + HFIXEDSZ;
+        int qdcount = ntohs(((HEADER*)buf)->qdcount);
+
+        while (qdcount-- > 0) {
+                char tname[MAXDNAME+1];
+                register int n, ttype, tclass;
+
+                n = dn_expand(buf, eom, cp, tname, sizeof tname);
+                if (n < 0)
+                        return (-1);
+                cp += n;
+                ttype = _getshort(cp); cp += INT16SZ;
+                tclass = _getshort(cp); cp += INT16SZ;
+                if (ttype == type &&
+                    tclass == class &&
+                    strcasecmp(tname, name) == 0)
+                        return (1);
+        }
+        return (0);
+}
+
+/* int
+ * res_queriesmatch(buf1, eom1, buf2, eom2)
+ *      is there a 1:1 mapping of (name,type,class)
+ *      in (buf1,eom1) and (buf2,eom2)?
+ * returns:
+ *      -1 : format error
+ *      0  : not a 1:1 mapping
+ *      >0 : is a 1:1 mapping
+ * author:
+ *      paul vixie, 29may94
+ */
+int
+res_queriesmatch(buf1, eom1, buf2, eom2)
+        const u_char *buf1, *eom1;
+        const u_char *buf2, *eom2;
+{
+        register const u_char *cp = buf1 + HFIXEDSZ;
+        int qdcount = ntohs(((HEADER*)buf1)->qdcount);
+
+        if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
+                return (0);
+        while (qdcount-- > 0) {
+                char tname[MAXDNAME+1];
+                register int n, ttype, tclass;
+
+                n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
+                if (n < 0)
+                        return (-1);
+                cp += n;
+                ttype = _getshort(cp);  cp += INT16SZ;
+                tclass = _getshort(cp); cp += INT16SZ;
+                if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
+                        return (0);
+        }
+        return (1);
+}
+
+int
+res_send(buf, buflen, ans, anssiz)
+        const u_char *buf;
+        int buflen;
+        u_char *ans;
+        int anssiz;
+{
+        HEADER *hp = (HEADER *) buf;
+        HEADER *anhp = (HEADER *) ans;
+        int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns;
+        register int n;
+        u_int badns;    /* XXX NSMAX can't exceed #/bits in this var */
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+                /* errno should have been set by res_init() in this case. */
+                return (-1);
+        }
+        DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
+                (stdout, ";; res_send()\n"), buf, buflen);
+        v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
+        gotsomewhere = 0;
+        connreset = 0;
+        terrno = ETIMEDOUT;
+        badns = 0;
+
+        /*
+         * Send request, RETRY times, or until successful
+         */
+        for (try = 0; try < _res.retry; try++) {
+            for (ns = 0; ns < _res.nscount; ns++) {
+                struct sockaddr_in *nsap = &_res.nsaddr_list[ns];
+    same_ns:
+                if (badns & (1 << ns)) {
+                        res_close();
+                        goto next_ns;
+                }
+
+                if (Qhook) {
+                        int done = 0, loops = 0;
+
+                        do {
+                                res_sendhookact act;
+
+                                act = (*Qhook)(&nsap, &buf, &buflen,
+                                               ans, anssiz, &resplen);
+                                switch (act) {
+                                case res_goahead:
+                                        done = 1;
+                                        break;
+                                case res_nextns:
+                                        res_close();
+                                        goto next_ns;
+                                case res_done:
+                                        return (resplen);
+                                case res_modified:
+                                        /* give the hook another try */
+                                        if (++loops < 42) /*doug adams*/
+                                                break;
+                                        /*FALLTHROUGH*/
+                                case res_error:
+                                        /*FALLTHROUGH*/
+                                default:
+                                        return (-1);
+                                }
+                        } while (!done);
+                }
+
+                Dprint(_res.options & RES_DEBUG,
+                       (stdout, ";; Querying server (# %d) address = %s\n",
+                        ns + 1, inet_ntoa(nsap->sin_addr)));
+
+                if (v_circuit) {
+                        int truncated;
+                        struct iovec iov[2];
+                        u_short len;
+                        u_char *cp;
+
+                        /*
+                         * Use virtual circuit;
+                         * at most one attempt per server.
+                         */
+                        try = _res.retry;
+                        truncated = 0;
+                        if ((s < 0) || (!vc)) {
+                                if (s >= 0)
+                                        res_close();
+
+                                s = socket(PF_INET, SOCK_STREAM, 0);
+                                if (s < 0) {
+                                        terrno = errno;
+                                        Perror(stderr, "socket(vc)", errno);
+                                        return (-1);
+                                }
+                                errno = 0;
+                                if (connect(s, (struct sockaddr *)nsap,
+                                            sizeof(struct sockaddr)) < 0) {
+                                        terrno = errno;
+                                        Aerror(stderr, "connect/vc",
+                                               errno, *nsap);
+                                        badns |= (1 << ns);
+                                        res_close();
+                                        goto next_ns;
+                                }
+                                vc = 1;
+                        }
+                        /*
+                         * Send length & message
+                         */
+                        putshort((u_short)buflen, (u_char*)&len);
+                        iov[0].iov_base = (caddr_t)&len;
+                        iov[0].iov_len = INT16SZ;
+                        iov[1].iov_base = (caddr_t)buf;
+                        iov[1].iov_len = buflen;
+                        if (writev(s, iov, 2) != (INT16SZ + buflen)) {
+                                terrno = errno;
+                                Perror(stderr, "write failed", errno);
+                                badns |= (1 << ns);
+                                res_close();
+                                goto next_ns;
+                        }
+                        /*
+                         * Receive length & response
+                         */
+read_len:
+                        cp = ans;
+                        len = INT16SZ;
+                        while ((n = read(s, (char *)cp, (int)len)) > 0) {
+                                cp += n;
+                                if ((len -= n) <= 0)
+                                        break;
+                        }
+                        if (n <= 0) {
+                                terrno = errno;
+                                Perror(stderr, "read failed", errno);
+                                res_close();
+                                /*
+                                 * A long running process might get its TCP
+                                 * connection reset if the remote server was
+                                 * restarted.  Requery the server instead of
+                                 * trying a new one.  When there is only one
+                                 * server, this means that a query might work
+                                 * instead of failing.  We only allow one reset
+                                 * per query to prevent looping.
+                                 */
+                                if (terrno == ECONNRESET && !connreset) {
+                                        connreset = 1;
+                                        res_close();
+                                        goto same_ns;
+                                }
+                                res_close();
+                                goto next_ns;
+                        }
+                        resplen = _getshort(ans);
+                        if (resplen > anssiz) {
+                                Dprint(_res.options & RES_DEBUG,
+                                       (stdout, ";; response truncated\n")
+                                       );
+                                truncated = 1;
+                                len = anssiz;
+                        } else
+                                len = resplen;
+                        cp = ans;
+                        while (len != 0 &&
+                               (n = read(s, (char *)cp, (int)len)) > 0) {
+                                cp += n;
+                                len -= n;
+                        }
+                        if (n <= 0) {
+                                terrno = errno;
+                                Perror(stderr, "read(vc)", errno);
+                                res_close();
+                                goto next_ns;
+                        }
+                        if (truncated) {
+                                /*
+                                 * Flush rest of answer
+                                 * so connection stays in synch.
+                                 */
+                                anhp->tc = 1;
+                                len = resplen - anssiz;
+                                while (len != 0) {
+                                        char junk[PACKETSZ];
+
+                                        n = (len > sizeof(junk)
+                                             ? sizeof(junk)
+                                             : len);
+                                        if ((n = read(s, junk, n)) > 0)
+                                                len -= n;
+                                        else
+                                                break;
+                                }
+                        }
+                        /*
+                         * The calling applicating has bailed out of
+                         * a previous call and failed to arrange to have
+                         * the circuit closed or the server has got
+                         * itself confused. Anyway drop the packet and
+                         * wait for the correct one.
+                         */
+                        if (hp->id != anhp->id) {
+                                DprintQ((_res.options & RES_DEBUG) ||
+                                        (_res.pfcode & RES_PRF_REPLY),
+                                        (stdout, ";; old answer (unexpected):\n"),
+                                        ans, (resplen>anssiz)?anssiz:resplen);
+                                goto read_len;
+                        }
+                } else {
+                        /*
+                         * Use datagrams.
+                         */
+                        struct timeval timeout;
+                        fd_set *dsmaskp;
+                        struct sockaddr_in from;
+                        int fromlen;
+
+                        if ((s < 0) || vc) {
+                                if (vc)
+                                        res_close();
+                                s = socket(PF_INET, SOCK_DGRAM, 0);
+                                if (s < 0) {
+#if !CAN_RECONNECT
+ bad_dg_sock:
+#endif
+                                        terrno = errno;
+                                        Perror(stderr, "socket(dg)", errno);
+                                        return (-1);
+                                }
+                                connected = 0;
+                        }
+                        /*
+                         * On a 4.3BSD+ machine (client and server,
+                         * actually), sending to a nameserver datagram
+                         * port with no nameserver will cause an
+                         * ICMP port unreachable message to be returned.
+                         * If our datagram socket is "connected" to the
+                         * server, we get an ECONNREFUSED error on the next
+                         * socket operation, and select returns if the
+                         * error message is received.  We can thus detect
+                         * the absence of a nameserver without timing out.
+                         * If we have sent queries to at least two servers,
+                         * however, we don't want to remain connected,
+                         * as we wish to receive answers from the first
+                         * server to respond.
+                         */
+                        if (_res.nscount == 1 || (try == 0 && ns == 0)) {
+                                /*
+                                 * Connect only if we are sure we won't
+                                 * receive a response from another server.
+                                 */
+                                if (!connected) {
+                                        if (connect(s, (struct sockaddr *)nsap,
+                                                    sizeof(struct sockaddr)
+                                                    ) < 0) {
+                                                Aerror(stderr,
+                                                       "connect(dg)",
+                                                       errno, *nsap);
+                                                badns |= (1 << ns);
+                                                res_close();
+                                                goto next_ns;
+                                        }
+                                        connected = 1;
+                                }
+                                if (send(s, (char*)buf, buflen, 0) != buflen) {
+                                        Perror(stderr, "send", errno);
+                                        badns |= (1 << ns);
+                                        res_close();
+                                        goto next_ns;
+                                }
+                        } else {
+                                /*
+                                 * Disconnect if we want to listen
+                                 * for responses from more than one server.
+                                 */
+                                if (connected) {
+#if CAN_RECONNECT
+                                        struct sockaddr_in no_addr;
+
+                                        no_addr.sin_family = AF_INET;
+                                        no_addr.sin_addr.s_addr = INADDR_ANY;
+                                        no_addr.sin_port = 0;
+                                        (void) connect(s,
+                                                       (struct sockaddr *)
+                                                        &no_addr,
+                                                       sizeof(no_addr));
+#else
+                                        int s1 = socket(PF_INET, SOCK_DGRAM,0);
+                                        if (s1 < 0)
+                                                goto bad_dg_sock;
+                                        (void) dup2(s1, s);
+                                        (void) close(s1);
+                                        Dprint(_res.options & RES_DEBUG,
+                                               (stdout, ";; new DG socket\n"))
+#endif
+                                        connected = 0;
+                                        errno = 0;
+                                }
+                                if (sendto(s, (char*)buf, buflen, 0,
+                                           (struct sockaddr *)nsap,
+                                           sizeof(struct sockaddr))
+                                    != buflen) {
+                                        Aerror(stderr, "sendto", errno, *nsap);
+                                        badns |= (1 << ns);
+                                        res_close();
+                                        goto next_ns;
+                                }
+                        }
+
+                        /*
+                         * Wait for reply
+                         */
+                        timeout.tv_sec = (_res.retrans << try);
+                        if (try > 0)
+                                timeout.tv_sec /= _res.nscount;
+                        if ((long) timeout.tv_sec <= 0)
+                                timeout.tv_sec = 1;
+                        timeout.tv_usec = 0;
+    wait:
+                        dsmaskp = (fd_set *)calloc(howmany(s+1, NFDBITS),
+                                                   sizeof(fd_mask));
+                        if (dsmaskp == NULL) {
+                                res_close();
+                                goto next_ns;
+                        }
+                        FD_SET(s, dsmaskp);
+                        n = select(s+1, dsmaskp, (fd_set *)NULL,
+                                   (fd_set *)NULL, &timeout);
+                        free(dsmaskp);
+                        if (n < 0) {
+                                if (errno == EINTR)
+                                        goto wait;
+                                Perror(stderr, "select", errno);
+                                res_close();
+                                goto next_ns;
+                        }
+                        if (n == 0) {
+                                /*
+                                 * timeout
+                                 */
+                                Dprint(_res.options & RES_DEBUG,
+                                       (stdout, ";; timeout\n"));
+                                gotsomewhere = 1;
+                                res_close();
+                                goto next_ns;
+                        }
+                        errno = 0;
+                        fromlen = sizeof(struct sockaddr_in);
+                        resplen = recvfrom(s, (char*)ans, anssiz, 0,
+                                           (struct sockaddr *)&from, &fromlen);
+                        if (resplen <= 0) {
+                                Perror(stderr, "recvfrom", errno);
+                                res_close();
+                                goto next_ns;
+                        }
+                        gotsomewhere = 1;
+                        if (hp->id != anhp->id) {
+                                /*
+                                 * response from old query, ignore it.
+                                 * XXX - potential security hazard could
+                                 *       be detected here.
+                                 */
+                                DprintQ((_res.options & RES_DEBUG) ||
+                                        (_res.pfcode & RES_PRF_REPLY),
+                                        (stdout, ";; old answer:\n"),
+                                        ans, (resplen>anssiz)?anssiz:resplen);
+                                goto wait;
+                        }
+#if CHECK_SRVR_ADDR
+                        if (!(_res.options & RES_INSECURE1) &&
+                            !res_isourserver(&from)) {
+                                /*
+                                 * response from wrong server? ignore it.
+                                 * XXX - potential security hazard could
+                                 *       be detected here.
+                                 */
+                                DprintQ((_res.options & RES_DEBUG) ||
+                                        (_res.pfcode & RES_PRF_REPLY),
+                                        (stdout, ";; not our server:\n"),
+                                        ans, (resplen>anssiz)?anssiz:resplen);
+                                goto wait;
+                        }
+#endif
+                        if (!(_res.options & RES_INSECURE2) &&
+                            !res_queriesmatch(buf, buf + buflen,
+                                              ans, ans + anssiz)) {
+                                /*
+                                 * response contains wrong query? ignore it.
+                                 * XXX - potential security hazard could
+                                 *       be detected here.
+                                 */
+                                DprintQ((_res.options & RES_DEBUG) ||
+                                        (_res.pfcode & RES_PRF_REPLY),
+                                        (stdout, ";; wrong query name:\n"),
+                                        ans, (resplen>anssiz)?anssiz:resplen);
+                                goto wait;
+                        }
+                        if (anhp->rcode == SERVFAIL ||
+                            anhp->rcode == NOTIMP ||
+                            anhp->rcode == REFUSED) {
+                                DprintQ(_res.options & RES_DEBUG,
+                                        (stdout, "server rejected query:\n"),
+                                        ans, (resplen>anssiz)?anssiz:resplen);
+                                badns |= (1 << ns);
+                                res_close();
+                                /* don't retry if called from dig */
+                                if (!_res.pfcode)
+                                        goto next_ns;
+                        }
+                        if (!(_res.options & RES_IGNTC) && anhp->tc) {
+                                /*
+                                 * get rest of answer;
+                                 * use TCP with same server.
+                                 */
+                                Dprint(_res.options & RES_DEBUG,
+                                       (stdout, ";; truncated answer\n"));
+                                v_circuit = 1;
+                                res_close();
+                                goto same_ns;
+                        }
+                } /*if vc/dg*/
+                Dprint((_res.options & RES_DEBUG) ||
+                       ((_res.pfcode & RES_PRF_REPLY) &&
+                        (_res.pfcode & RES_PRF_HEAD1)),
+                       (stdout, ";; got answer:\n"));
+                DprintQ((_res.options & RES_DEBUG) ||
+                        (_res.pfcode & RES_PRF_REPLY),
+                        (stdout, ""),
+                        ans, (resplen>anssiz)?anssiz:resplen);
+                /*
+                 * If using virtual circuits, we assume that the first server
+                 * is preferred over the rest (i.e. it is on the local
+                 * machine) and only keep that one open.
+                 * If we have temporarily opened a virtual circuit,
+                 * or if we haven't been asked to keep a socket open,
+                 * close the socket.
+                 */
+                if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
+                    !(_res.options & RES_STAYOPEN)) {
+                        res_close();
+                }
+                if (Rhook) {
+                        int done = 0, loops = 0;
+
+                        do {
+                                res_sendhookact act;
+
+                                act = (*Rhook)(nsap, buf, buflen,
+                                               ans, anssiz, &resplen);
+                                switch (act) {
+                                case res_goahead:
+                                case res_done:
+                                        done = 1;
+                                        break;
+                                case res_nextns:
+                                        res_close();
+                                        goto next_ns;
+                                case res_modified:
+                                        /* give the hook another try */
+                                        if (++loops < 42) /*doug adams*/
+                                                break;
+                                        /*FALLTHROUGH*/
+                                case res_error:
+                                        /*FALLTHROUGH*/
+                                default:
+                                        return (-1);
+                                }
+                        } while (!done);
+
+                }
+                return (resplen);
+    next_ns: ;
+           } /*foreach ns*/
+        } /*foreach retry*/
+        res_close();
+        if (!v_circuit) {
+                if (!gotsomewhere)
+                        errno = ECONNREFUSED;   /* no nameservers found */
+                else
+                        errno = ETIMEDOUT;      /* no answer obtained */
+        } else
+                errno = terrno;
+        return (-1);
+}
+
+/*
+ * This routine is for closing the socket if a virtual circuit is used and
+ * the program wants to close it.  This provides support for endhostent()
+ * which expects to close the socket.
+ *
+ * This routine is not expected to be user visible.
+ */
+void
+res_close()
+{
+        if (s >= 0) {
+                (void) close(s);
+                s = -1;
+                connected = 0;
+                vc = 0;
+        }
+}
diff --git a/src/lib/libc/net/resolver.3 b/src/lib/libc/net/resolver.3
new file mode 100644
index 0000000000..389906d8a3
--- /dev/null
+++ b/src/lib/libc/net/resolver.3
@@ -0,0 +1,345 @@
+.\"     $OpenBSD: resolver.3,v 1.6 1999/02/27 21:55:34 deraadt Exp $
+.\"
+.\" Copyright (c) 1985, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 4, 1993
+.Dt RESOLVER 3
+.Os BSD 4.3
+.Sh NAME
+.Nm res_query ,
+.Nm res_search ,
+.Nm res_mkquery ,
+.Nm res_send ,
+.Nm res_init ,
+.Nm dn_comp ,
+.Nm dn_expand
+.Nd resolver routines
+.Sh SYNOPSIS
+.Fd #include <sys/types.h>
+.Fd #include <netinet/in.h>
+.Fd #include <arpa/nameser.h>
+.Fd #include <resolv.h>
+.Fo res_query
+.Fa "char *dname"
+.Fa "int class"
+.Fa "int type"
+.Fa "u_char *answer"
+.Fa "int anslen"
+.Fc
+.Fo res_search
+.Fa "char *dname"
+.Fa "int class"
+.Fa "int type"
+.Fa "u_char *answer"
+.Fa "int anslen"
+.Fc
+.Fo res_mkquery
+.Fa "int op"
+.Fa "char *dname"
+.Fa "int class"
+.Fa "int type"
+.Fa "char *data"
+.Fa "int datalen"
+.Fa "struct rrec *newrr"
+.Fa "char *buf"
+.Fa "int buflen"
+.Fc
+.Fo res_send
+.Fa "char *msg"
+.Fa "int msglen"
+.Fa "char *answer"
+.Fa "int anslen"
+.Fc
+.Fn res_init 
+.Fo dn_comp
+.Fa "char *exp_dn"
+.Fa "char *comp_dn"
+.Fa "int length"
+.Fa "char **dnptrs"
+.Fa "char **lastdnptr"
+.Fc
+.Fo dn_expand
+.Fa "u_char *msg"
+.Fa "u_char *eomorig"
+.Fa "u_char *comp_dn"
+.Fa "u_char *exp_dn"
+.Fa "int length"
+.Fc
+.Sh DESCRIPTION
+These routines are used for making, sending and interpreting
+query and reply messages with Internet domain name servers.
+.Pp
+Global configuration and state information that is used by the
+resolver routines is kept in the structure
+.Em _res .
+Most of the values have reasonable defaults and can be ignored.
+Options
+stored in
+.Em _res.options
+are defined in
+.Pa resolv.h
+and are as follows.
+Options are stored as a simple bit mask containing the bitwise ``or''
+of the options enabled.
+.Bl -tag -width RES_USE_INET6
+.It Dv RES_INIT
+True if the initial name server address and default domain name are
+initialized (i.e.,
+.Fn res_init
+has been called).
+.It Dv RES_DEBUG
+Print debugging messages.
+.It Dv RES_AAONLY
+Accept authoritative answers only.
+With this option,
+.Fn res_send
+should continue until it finds an authoritative answer or finds an error.
+Currently this is not implemented.
+.It Dv RES_USEVC
+Use
+.Tn TCP
+connections for queries instead of
+.Tn UDP
+datagrams.
+.It Dv RES_STAYOPEN
+Used with
+.Dv RES_USEVC
+to keep the
+.Tn TCP
+connection open between
+queries.
+This is useful only in programs that regularly do many queries.
+.Tn UDP
+should be the normal mode used.
+.It Dv RES_IGNTC
+Unused currently (ignore truncation errors, i.e., don't retry with
+.Tn TCP ) .
+.It Dv RES_RECURSE
+Set the recursion-desired bit in queries.
+This is the default.
+.Pf ( Fn res_send
+does not do iterative queries and expects the name server
+to handle recursion.)
+.It Dv RES_DEFNAMES
+If set,
+.Fn res_search
+will append the default domain name to single-component names
+(those that do not contain a dot).
+This option is enabled by default.
+.It Dv RES_DNSRCH
+If this option is set,
+.Fn res_search
+will search for host names in the current domain and in parent domains; see
+.Xr hostname 7 .
+This is used by the standard host lookup routine
+.Xr gethostbyname 3 .
+This option is enabled by default.
+.It Dv RES_USE_INET6
+Enable support for IPv6 addresses.
+.El
+.Pp
+The
+.Fn res_init
+routine
+reads the configuration file (if any; see
+.Xr resolv.conf 5 )
+to get the default domain name,
+search list and
+the Internet address of the local name server(s).
+If no server is configured, the host running
+the resolver is tried.
+The current domain name is defined by the hostname
+if not specified in the configuration file;
+it can be overridden by the environment variable
+.Ev LOCALDOMAIN .
+This environment variable may contain several blank-separated
+tokens if you wish to override the
+.Fa search list
+on a per-process basis.
+This is similar to the
+.Fa search
+command in the configuration file.
+Another environment variable
+.Ev RES_OPTIONS
+can be set to override certain internal resolver options which
+are otherwise set by changing fields in the
+.Fa _res
+structure or are inherited from the configuration file's
+.Fa options
+command.
+The syntax of the
+.Ev RES_OPTIONS
+environment variable is explained in
+.Xr resolv.conf 5 .
+Initialization normally occurs on the first call
+to one of the following routines.
+.Pp
+The
+.Fn res_query
+function provides an interface to the server query mechanism.
+It constructs a query, sends it to the local server,
+awaits a response, and makes preliminary checks on the reply.
+The query requests information of the specified
+.Fa type
+and
+.Fa class
+for the specified fully-qualified domain name
+.Fa dname .
+The reply message is left in the
+.Fa answer
+buffer with length
+.Fa anslen
+supplied by the caller.
+.Pp
+The
+.Fn res_search
+routine makes a query and awaits a response like
+.Fn res_query ,
+but in addition, it implements the default and search rules
+controlled by the
+.Dv RES_DEFNAMES
+and
+.Dv RES_DNSRCH
+options.
+It returns the first successful reply.
+.Pp
+The remaining routines are lower-level routines used by
+.Fn res_query .
+The
+.Fn res_mkquery
+function
+constructs a standard query message and places it in
+.Fa buf .
+It returns the size of the query, or \-1 if the query is
+larger than
+.Fa buflen .
+The query type
+.Fa op
+is usually
+.Dv QUERY ,
+but can be any of the query types defined in
+.Aq Pa arpa/nameser.h .
+The domain name for the query is given by
+.Fa dname .
+.Fa newrr
+is currently unused but is intended for making update messages.
+.Pp
+The
+.Fn res_send
+routine
+sends a pre-formatted query and returns an answer.
+It will call
+.Fn res_init
+if
+.Dv RES_INIT
+is not set, send the query to the local name server, and
+handle timeouts and retries.
+The length of the reply message is returned, or
+\-1 if there were errors.
+.Pp
+The
+.Fn dn_comp
+function
+compresses the domain name
+.Fa exp_dn
+and stores it in
+.Fa comp_dn .
+The size of the compressed name is returned or \-1 if there were errors.
+The size of the array pointed to by
+.Fa comp_dn
+is given by
+.Fa length .
+The compression uses
+an array of pointers
+.Fa dnptrs
+to previously-compressed names in the current message.
+The first pointer points
+to the beginning of the message and the list ends with
+.Dv NULL .
+The limit to the array is specified by
+.Fa lastdnptr .
+A side effect of
+.Fn dn_comp
+is to update the list of pointers for
+labels inserted into the message
+as the name is compressed.
+If
+.Em dnptr
+is
+.Dv NULL, names are not compressed.
+If
+.Fa lastdnptr
+is
+.Dv NULL ,
+the list of labels is not updated.
+.Pp
+The
+.Fn dn_expand
+entry
+expands the compressed domain name
+.Fa comp_dn
+to a full domain name
+The compressed name is contained in a query or reply message;
+.Fa msg
+is a pointer to the beginning of the message.
+The uncompressed name is placed in the buffer indicated by
+.Fa exp_dn
+which is of size
+.Fa length .
+The size of compressed name is returned or \-1 if there was an error.
+.Sh FILES
+.Bl -tag -width Pa
+/etc/resolv.conf
+The configuration file
+see
+.Xr resolv.conf 5 .
+.El
+.Sh SEE ALSO
+.Xr gethostbyname 3 ,
+.Xr named 8 ,
+.Xr resolv.conf 5 ,
+.Xr hostname 7 ,
+.Pp
+.%T RFC1032 ,
+.%T RFC1033 ,
+.%T RFC1034 ,
+.%T RFC1035 ,
+.%T RFC1535 ,
+.%T RFC974
+.Rs
+.%T "Name Server Operations Guide for BIND"
+.Re
+.Sh HISTORY
+The
+.Nm
+function appeared in 
+.Bx 4.3 .
diff --git a/src/lib/libc/net/send.c b/src/lib/libc/net/send.c
new file mode 100644
index 0000000000..8495931ca3
--- /dev/null
+++ b/src/lib/libc/net/send.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1988, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: send.c,v 1.2 1996/08/19 08:29:52 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <stddef.h>
+
+ssize_t
+send(s, msg, len, flags)
+        int s, flags;
+        size_t len;
+        const void *msg;
+{
+        return (sendto(s, msg, len, flags, NULL, 0));
+}
diff --git a/src/lib/libc/net/sethostent.c b/src/lib/libc/net/sethostent.c
new file mode 100644
index 0000000000..5392a2f11b
--- /dev/null
+++ b/src/lib/libc/net/sethostent.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1985, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: sethostent.c,v 1.4 1997/03/15 21:53:50 pefo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <netdb.h>
+#include <resolv.h>
+
+void
+sethostent(stayopen)
+        int stayopen;
+{
+
+        if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+                return;
+        if (stayopen)
+                _res.options |= RES_STAYOPEN | RES_USEVC;
+}
+
+void
+endhostent()
+{
+        _res.options &= ~(RES_STAYOPEN | RES_USEVC);
+        res_close();
+}
diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
new file mode 100644
index 0000000000..3191f08328
--- /dev/null
+++ b/src/lib/libc/stdlib/Makefile.inc
@@ -0,0 +1,54 @@
+#       $OpenBDS: Makefile.inc,v 1.6 1996/08/21 03:47:21 tholo Exp $
+
+# stdlib sources
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/stdlib ${LIBCSRCDIR}/stdlib
+
+SRCS+=  a64l.c abort.c atexit.c atoi.c atof.c atol.c bsearch.c calloc.c \
+        cfree.c exit.c getenv.c getopt.c getsubopt.c heapsort.c l64a.c \
+        malloc.c merge.c multibyte.c putenv.c qsort.c radixsort.c rand.c \
+        random.c realpath.c setenv.c strtod.c strtol.c strtoq.c strtoul.c \
+        strtouq.c system.c tfind.c tsearch.c \
+        _rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \
+        mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c
+
+.if   (${MACHINE_ARCH} == "m68k")
+SRCS+=  abs.S div.c labs.c ldiv.c
+LSRCS+= abs.c
+.elif (${MACHINE_ARCH} == "i386")
+SRCS+=  abs.S div.S labs.S ldiv.S
+LSRCS+= abs.c div.c labs.c ldiv.c
+.elif (${MACHINE_ARCH} == "ns32k")
+SRCS+=  abs.S div.c labs.c ldiv.c
+LSRCS+= abs.c
+.elif (${MACHINE_ARCH} == "tahoe")
+SRCS+=  abs.S div.c labs.c ldiv.c
+LSRCS+= abs.c
+.elif (${MACHINE_ARCH} == "vax")
+SRCS+=  abs.c div.c labs.c ldiv.c
+.elif (${MACHINE_ARCH} == "alpha")
+# XXX should be .S's
+SRCS+=  abs.c div.c labs.c ldiv.c
+.else
+SRCS+=  abs.c div.c labs.c ldiv.c
+.endif
+
+MAN+=   a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
+        calloc.3 div.3 exit.3 getenv.3 getopt.3 getsubopt.3 labs.3 ldiv.3 \
+        malloc.3 memory.3 qabs.3 qdiv.3 qsort.3 radixsort.3 rand48.3 rand.3 \
+        random.3 realpath.3 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3
+
+MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
+MLINKS+=malloc.3 free.3 malloc.3 realloc.3
+MLINKS+=malloc.3 cfree.3 malloc.3 malloc.conf.5
+MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
+MLINKS+=rand.3 srand.3
+MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3
+MLINKS+=rand48.3 drand48.3 rand48.3 erand48.3 rand48.3 lrand48.3
+MLINKS+=rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 jrand48.3
+MLINKS+=rand48.3 srand48.3 rand48.3 seed48.3 rand48.3 lcong48.3
+MLINKS+=strtol.3 strtoq.3
+MLINKS+=strtoul.3 strtouq.3
+MLINKS+=tsearch.3 tfind.3
+MLINKS+=tsearch.3 tdelete.3
+MLINKS+=tsearch.3 twalk.3
+MLINKS+=a64l.3 l64a.3
diff --git a/src/lib/libc/stdlib/_rand48.c b/src/lib/libc/stdlib/_rand48.c
new file mode 100644
index 0000000000..fed7372f68
--- /dev/null
+++ b/src/lib/libc/stdlib/_rand48.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: _rand48.c,v 1.2 1996/08/19 08:33:19 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+unsigned short __rand48_seed[3] = {
+        RAND48_SEED_0,
+        RAND48_SEED_1,
+        RAND48_SEED_2
+};
+unsigned short __rand48_mult[3] = {
+        RAND48_MULT_0,
+        RAND48_MULT_1,
+        RAND48_MULT_2
+};
+unsigned short __rand48_add = RAND48_ADD;
+
+void
+__dorand48(unsigned short xseed[3])
+{
+        unsigned long accu;
+        unsigned short temp[2];
+
+        accu = (unsigned long) __rand48_mult[0] * (unsigned long) xseed[0] +
+         (unsigned long) __rand48_add;
+        temp[0] = (unsigned short) accu;        /* lower 16 bits */
+        accu >>= sizeof(unsigned short) * 8;
+        accu += (unsigned long) __rand48_mult[0] * (unsigned long) xseed[1] +
+         (unsigned long) __rand48_mult[1] * (unsigned long) xseed[0];
+        temp[1] = (unsigned short) accu;        /* middle 16 bits */
+        accu >>= sizeof(unsigned short) * 8;
+        accu += __rand48_mult[0] * xseed[2] + __rand48_mult[1] * xseed[1] + __rand48_mult[2] * xseed[0];
+        xseed[0] = temp[0];
+        xseed[1] = temp[1];
+        xseed[2] = (unsigned short) accu;
+}
diff --git a/src/lib/libc/stdlib/a64l.3 b/src/lib/libc/stdlib/a64l.3
new file mode 100644
index 0000000000..0607338cba
--- /dev/null
+++ b/src/lib/libc/stdlib/a64l.3
@@ -0,0 +1,122 @@
+.\"
+.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+.\" 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. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $OpenBSD: a64l.3,v 1.3 1999/02/27 21:55:53 deraadt Exp $
+.\"
+.Dd August 17, 1997
+.Dt A64L 3
+.Os
+.Sh NAME
+.Nm a64l ,
+.Nm l64a
+.Nd convert between 32-bit integer and radix-64 ASCII string
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft long
+.Fn a64l "const char *s"
+.Ft char *
+.Fn l64a "long l"
+.Sh DESCRIPTION
+The
+.Fn a64l
+and
+.Fn l64a
+functions are used to maintain numbers stored in radix-64
+ASCII characters.  This is a notation by which 32-bit integers
+can be represented by up to six characters; each character
+represents a "digit" in a radix-64 notation.
+.Pp
+The characters used to represent "digits" are '.' for 0, '/' for 1,
+'0' through '9' for 2-11, 'A' through 'Z' for 12-37, and 'a' through
+'z' for 38-63.
+.Pp
+The
+.Fn a64l
+function takes a pointer to a null-terminated radix-64 representation
+and returns a corresponding 32-bit value.  If the string pointed to by
+.Ar s
+contains more than six characters,
+.Fn a64l
+will use the first six.
+.Fn a64l
+scans the character string from left to right, decoding
+each character as a 6-bit radix-64 number.  If a long integer is
+larger than 32 bits, the return value will be sign-extended.
+.Pp
+.Fn l64a
+takes a long integer argument
+.Ar l
+and returns a pointer to the corresponding radix-64 representation.
+.Sh RETURN VALUES
+On success,
+.Fn a64l
+returns a 32-bit representation of
+.Ar s .
+If
+.Ar s
+is a NULL pointer or if it contains "digits" other than those described above,
+.Fn a64l
+returns -1L and sets the global variable errno to
+.Va EINVAL .
+.Pp
+On success,
+.Fn l64a
+returns a pointer to a string containing the radix-64 representation of
+.Ar l .
+If
+.Ar l
+is 0,
+.Fn l64a
+returns a pointer to the empty string.
+If
+.Ar l
+is negative,
+.Fn l64a
+returns a NULL pointer and sets the global variable errno to
+.Va EINVAL .
+.Sh WARNINGS
+The value returned by
+.Fn l64a
+is a pointer into a static buffer, the contents of which
+will be overwritten by subsequent calls.
+.Pp
+The value returned by
+.Fn a64l
+may be incorrect if the value is too large; for that reason, only strings
+that resulted from a call to
+.Fn l64a
+should be used to call
+.Fn a64l .
+.Pp
+If a long integer is larger than 32 bits, only the low-order
+32 bits are used.
+.Sh STANDARDS
+The
+.Fn a64l                                                           
+and
+.Fn l64a
+functions conform to
+.St -xpg4.2 .
diff --git a/src/lib/libc/stdlib/a64l.c b/src/lib/libc/stdlib/a64l.c
new file mode 100644
index 0000000000..a68f0a6dcd
--- /dev/null
+++ b/src/lib/libc/stdlib/a64l.c
@@ -0,0 +1,46 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: a64l.c,v 1.3 1997/08/17 22:58:34 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <errno.h>
+#include <stdlib.h>
+
+long
+a64l(s)
+        const char *s;
+{
+        long value, digit, shift;
+        int i;
+
+        if (s == NULL) {
+                errno = EINVAL;
+                return(-1L);
+        }
+
+        value = 0;
+        shift = 0;
+        for (i = 0; *s && i < 6; i++, s++) {
+                if (*s >= '.' && *s <= '/')
+                        digit = *s - '.';
+                else if (*s >= '0' && *s <= '9')
+                        digit = *s - '0' + 2;
+                else if (*s >= 'A' && *s <= 'Z')
+                        digit = *s - 'A' + 12;
+                else if (*s >= 'a' && *s <= 'z')
+                        digit = *s - 'a' + 38;
+                else {
+                        errno = EINVAL;
+                        return(-1L);
+                }
+
+                value |= digit << shift;
+                shift += 6;
+        }
+
+        return(value);
+}
diff --git a/src/lib/libc/stdlib/abort.3 b/src/lib/libc/stdlib/abort.3
new file mode 100644
index 0000000000..92c9a354d0
--- /dev/null
+++ b/src/lib/libc/stdlib/abort.3
@@ -0,0 +1,70 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: abort.3,v 1.4 1997/07/17 07:39:41 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt ABORT 3
+.Os
+.Sh NAME
+.Nm abort
+.Nd cause abnormal program termination
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void
+.Fn abort void
+.Sh DESCRIPTION
+The
+.Fn abort
+function causes abnormal program termination to occur, unless the
+signal
+.Dv SIGABRT
+is being caught and the signal handler does not return.
+.Pp
+Any open streams are flushed and closed.
+.Sh RETURN VALUES
+The
+.Nm abort
+function
+never returns.
+.Sh SEE ALSO
+.Xr sigaction 2 ,
+.Xr exit 3
+.Sh STANDARDS
+The
+.Fn abort
+function
+conforms to
+.St -p1003.1-90 .
diff --git a/src/lib/libc/stdlib/abort.c b/src/lib/libc/stdlib/abort.c
new file mode 100644
index 0000000000..4cc6257acb
--- /dev/null
+++ b/src/lib/libc/stdlib/abort.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 1985 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: abort.c,v 1.6 1998/11/20 11:18:49 d Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "thread_private.h"
+
+void (*__cleanup)();
+
+void
+abort()
+{
+        static int cleanup_called = 0;
+        sigset_t mask;
+
+
+        sigfillset(&mask);
+        /*
+         * don't block SIGABRT to give any handler a chance; we ignore
+         * any errors -- X311J doesn't allow abort to return anyway.
+         */
+        sigdelset(&mask, SIGABRT);
+#ifdef _THREAD_SAFE
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#else  _THREAD_SAFE
+        (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#endif _THREAD_SAFE
+
+        /*
+         * POSIX requires we flush stdio buffers on abort
+         */
+        if (cleanup_called == 0 && __cleanup != NULL) {
+                cleanup_called = 1;
+                (*__cleanup)();
+        }
+
+        (void)kill(getpid(), SIGABRT);
+
+        /*
+         * if SIGABRT ignored, or caught and the handler returns, do
+         * it again, only harder.
+         */
+        (void)signal(SIGABRT, SIG_DFL);
+#ifdef _THREAD_SAFE
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#else  _THREAD_SAFE
+        (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#endif _THREAD_SAFE
+        (void)kill(getpid(), SIGABRT);
+        exit(1);
+}
diff --git a/src/lib/libc/stdlib/abs.3 b/src/lib/libc/stdlib/abs.3
new file mode 100644
index 0000000000..77f82b9402
--- /dev/null
+++ b/src/lib/libc/stdlib/abs.3
@@ -0,0 +1,73 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: abs.3,v 1.2 1996/08/19 08:33:21 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt ABS 3
+.Os
+.Sh NAME
+.Nm abs
+.Nd integer absolute value function
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft int
+.Fn abs "int j"
+.Sh DESCRIPTION
+The
+.Fn abs
+function
+computes
+the absolute value of the integer
+.Ar j .
+.Sh RETURN VALUES
+The
+.Fn abs
+function
+returns
+the absolute value.
+.Sh SEE ALSO
+.Xr floor 3 ,
+.Xr labs 3 ,
+.Xr cabs 3 ,
+.Xr hypot 3 ,
+.Xr math 3
+.Sh STANDARDS
+The
+.Fn abs
+function conforms to
+.St -ansiC .
+.Sh BUGS
+The absolute value of the most negative integer remains negative.
diff --git a/src/lib/libc/stdlib/abs.c b/src/lib/libc/stdlib/abs.c
new file mode 100644
index 0000000000..7c79e4073c
--- /dev/null
+++ b/src/lib/libc/stdlib/abs.c
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: abs.c,v 1.2 1996/08/19 08:33:21 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+int
+abs(j)
+        int j;
+{
+        return(j < 0 ? -j : j);
+}
diff --git a/src/lib/libc/stdlib/alloca.3 b/src/lib/libc/stdlib/alloca.3
new file mode 100644
index 0000000000..ef87220772
--- /dev/null
+++ b/src/lib/libc/stdlib/alloca.3
@@ -0,0 +1,75 @@
+.\" Copyright (c) 1980, 1991 Regents of the University of California.
+.\" 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: alloca.3,v 1.3 1996/08/19 08:33:22 tholo Exp $
+.\"
+.Dd May 2, 1991
+.Dt ALLOCA 3
+.Os BSD 4
+.Sh NAME
+.Nm alloca
+.Nd memory allocator
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void *
+.Fn alloca "size_t size"
+.Sh DESCRIPTION
+The
+.Fn alloca
+function
+allocates 
+.Fa size
+bytes of space in the stack frame of the caller.
+This temporary space is automatically freed on
+return.
+.Sh RETURN VALUES
+The
+.Fn alloca
+function returns a pointer to the beginning of the allocated space.
+.Sh SEE ALSO
+.Xr brk 2 ,
+.Xr pagesize 2
+.Xr calloc 3 ,
+.Xr malloc 3 ,
+.Xr realloc 3 ,
+.Sh BUGS
+The
+.Fn alloca
+function
+is machine dependent; its use is discouraged.
+.\" .Sh HISTORY
+.\" The
+.\" .Fn alloca
+.\" function appeared in
+.\" .Bx ?? .
+.\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd 
+.\" The first man page (or link to a man page that I can find at the
+.\" moment is 4.3...
diff --git a/src/lib/libc/stdlib/atexit.3 b/src/lib/libc/stdlib/atexit.3
new file mode 100644
index 0000000000..0b10f010fa
--- /dev/null
+++ b/src/lib/libc/stdlib/atexit.3
@@ -0,0 +1,77 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: atexit.3,v 1.2 1996/08/19 08:33:22 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt ATEXIT 3
+.Os
+.Sh NAME
+.Nm atexit
+.Nd register a function to be called on exit
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft int
+.Fn atexit "void (*function)(void)"
+.Sh DESCRIPTION
+The
+.Fn atexit
+function
+registers the given
+.Ar function
+to be called at program exit, whether via
+.Xr exit 3
+or via return from the program's
+.Em main .
+Functions so registered are called in reverse order;
+no arguments are passed.
+At least 32 functions can always be registered,
+and more are allowed as long as sufficient memory can be allocated.
+.Sh RETURN VALUES
+.Rv -std atexit
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er ENOMEM
+No memory was available to add the function to the list.
+The existing list of functions is unmodified.
+.El
+.Sh SEE ALSO
+.Xr exit 3
+.Sh STANDARDS
+The
+.Fn atexit
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/atexit.c b/src/lib/libc/stdlib/atexit.c
new file mode 100644
index 0000000000..c0fb624141
--- /dev/null
+++ b/src/lib/libc/stdlib/atexit.c
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: atexit.c,v 1.2 1996/08/19 08:33:22 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include "atexit.h"
+
+struct atexit *__atexit;
+
+/*
+ * Register a function to be performed at exit.
+ */
+int
+atexit(fn)
+        void (*fn)();
+{
+        static struct atexit __atexit0; /* one guaranteed table */
+        register struct atexit *p;
+
+        if ((p = __atexit) == NULL)
+                __atexit = p = &__atexit0;
+        else if (p->ind >= ATEXIT_SIZE) {
+                if ((p = malloc(sizeof(*p))) == NULL)
+                        return (-1);
+                p->ind = 0;
+                p->next = __atexit;
+                __atexit = p;
+        }
+        p->fns[p->ind++] = fn;
+        return (0);
+}
diff --git a/src/lib/libc/stdlib/atexit.h b/src/lib/libc/stdlib/atexit.h
new file mode 100644
index 0000000000..e41a7cb86c
--- /dev/null
+++ b/src/lib/libc/stdlib/atexit.h
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      $OpenBSD: atexit.h,v 1.2 1996/08/19 08:33:23 tholo Exp $
+ */
+
+/* must be at least 32 to guarantee ANSI conformance */
+#define ATEXIT_SIZE     32
+
+struct atexit {
+        struct atexit *next;            /* next in list */
+        int ind;                        /* next index in this table */
+        void (*fns[ATEXIT_SIZE])();     /* the table itself */
+};
+
+extern struct atexit *__atexit;         /* points to head of LIFO stack */
diff --git a/src/lib/libc/stdlib/atof.3 b/src/lib/libc/stdlib/atof.3
new file mode 100644
index 0000000000..cc1b500b0f
--- /dev/null
+++ b/src/lib/libc/stdlib/atof.3
@@ -0,0 +1,73 @@
+.\" Copyright (c) 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: atof.3,v 1.2 1996/08/19 08:33:23 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt ATOF 3
+.Os
+.Sh NAME
+.Nm atof
+.Nd convert
+.Tn ASCII
+string to double
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft double
+.Fn atof "const char *nptr"
+.Sh DESCRIPTION
+The
+.Fn atof
+function converts the initial portion of the string pointed to by
+.Ar nptr
+to
+.Ar double
+representation.
+.Pp
+It is equivalent to:
+.Bd -literal -offset indent
+strtod(nptr, (char **)NULL);
+.Ed
+.Sh SEE ALSO
+.Xr atoi 3 ,
+.Xr atol 3 ,
+.Xr strtod 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
+.Sh STANDARDS
+The
+.Fn atof
+function conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/atof.c b/src/lib/libc/stdlib/atof.c
new file mode 100644
index 0000000000..30bac19899
--- /dev/null
+++ b/src/lib/libc/stdlib/atof.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1988 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: atof.c,v 1.2 1996/08/19 08:33:24 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+double
+atof(ascii)
+        const char *ascii;
+{
+        return(strtod(ascii, (char **)NULL));
+}
diff --git a/src/lib/libc/stdlib/atoi.3 b/src/lib/libc/stdlib/atoi.3
new file mode 100644
index 0000000000..280a989e8e
--- /dev/null
+++ b/src/lib/libc/stdlib/atoi.3
@@ -0,0 +1,73 @@
+.\" Copyright (c) 1990, 1991, 1993
+.\"    The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: atoi.3,v 1.2 1996/08/10 04:51:31 tholo Exp $
+.\"
+.Dd June 4, 1993
+.Dt ATOI 3
+.Os
+.Sh NAME
+.Nm atoi
+.Nd convert
+.Tn ASCII
+string to integer
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft int
+.Fn atoi "const char *nptr"
+.Sh DESCRIPTION
+The
+.Fn atoi
+function converts the initial portion of the string pointed to by
+.Em nptr
+to
+.Em integer
+representation.
+.Pp
+It is equivalent to:
+.Bd -literal -offset indent
+(int)strtol(nptr, (char **)NULL, 10);
+.Ed
+.Sh SEE ALSO
+.Xr atof 3 ,
+.Xr atol 3 ,
+.Xr strtod 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
+.Sh STANDARDS
+The
+.Fn atoi
+function conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/atoi.c b/src/lib/libc/stdlib/atoi.c
new file mode 100644
index 0000000000..a74d6e1351
--- /dev/null
+++ b/src/lib/libc/stdlib/atoi.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: atoi.c,v 1.2 1996/08/19 08:33:24 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+int
+atoi(str)
+        const char *str;
+{
+        return((int)strtol(str, (char **)NULL, 10));
+}
diff --git a/src/lib/libc/stdlib/atol.3 b/src/lib/libc/stdlib/atol.3
new file mode 100644
index 0000000000..2b49bd1f2c
--- /dev/null
+++ b/src/lib/libc/stdlib/atol.3
@@ -0,0 +1,74 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: atol.3,v 1.2 1996/08/19 08:33:25 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt ATOL 3
+.Os
+.Sh NAME
+.Nm atol
+.Nd convert
+.Tn ASCII
+string to long integer
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft long
+.Fn atol "const char *nptr"
+.Sh DESCRIPTION
+The
+.Fn atol
+function converts the initial portion of the string pointed to by
+.Ar nptr
+to
+.Em long integer
+representation.
+.Pp
+It is equivalent to:
+.Bd -literal -offset indent
+strtol(nptr, (char **)NULL, 10);
+.Ed
+.Sh SEE ALSO
+.Xr atof 3 ,
+.Xr atoi 3 ,
+.Xr strtod 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
+.Sh STANDARDS
+The
+.Fn atol
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/atol.c b/src/lib/libc/stdlib/atol.c
new file mode 100644
index 0000000000..528a932214
--- /dev/null
+++ b/src/lib/libc/stdlib/atol.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: atol.c,v 1.2 1996/08/19 08:33:26 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+long
+atol(str)
+        const char *str;
+{
+        return(strtol(str, (char **)NULL, 10));
+}
diff --git a/src/lib/libc/stdlib/bsearch.3 b/src/lib/libc/stdlib/bsearch.3
new file mode 100644
index 0000000000..570a4227b4
--- /dev/null
+++ b/src/lib/libc/stdlib/bsearch.3
@@ -0,0 +1,90 @@
+.\" Copyright (c) 1990, 1991, 1993, 1994
+.\"    The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: bsearch.3,v 1.3 1997/06/13 23:41:35 deraadt Exp $
+.\"
+.Dd April 19, 1994
+.Dt BSEARCH 3
+.Os
+.Sh NAME
+.Nm bsearch
+.Nd binary search of a sorted table
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void *
+.Fn bsearch "const void *key" "const void *base" "size_t nmemb" "size_t size" "int (*compar) (const void *, const void *)"
+.Sh DESCRIPTION
+The
+.Fn bsearch
+function searches an array of
+.Fa nmemb
+objects, the initial member of which is 
+pointed to by
+.Fa base ,
+for a member that matches the object pointed to by
+.Fa key .
+The size of each member of the array is specified by 
+.Fa size .
+.Pp
+The contents of the array should be in ascending sorted order according
+to the comparison function referenced by
+.Fa compar .
+The
+.Fa compar
+routine
+is expected to have
+two arguments which point to the
+.Fa key
+object and to an array member, in that order, and should return an integer
+less than, equal to, or greater than zero if the
+.Fa key
+object is found, respectively, to be less than, to match, or be
+greater than the array member.
+.Sh RETURN VALUES
+The
+.Fn bsearch
+function returns a pointer to a matching member of the array, or a null
+pointer if no match is found.
+If two members compare as equal, which member is matched is unspecified.
+.Sh SEE ALSO
+.Xr db 3 ,
+.Xr lsearch 3 ,
+.Xr qsort 3 ,
+.Xr tsearch 3
+.Sh STANDARDS
+The
+.Fn bsearch
+function conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/bsearch.c b/src/lib/libc/stdlib/bsearch.c
new file mode 100644
index 0000000000..eeef9bffc6
--- /dev/null
+++ b/src/lib/libc/stdlib/bsearch.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: bsearch.c,v 1.2 1996/08/19 08:33:26 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+/*
+ * Perform a binary search.
+ *
+ * The code below is a bit sneaky.  After a comparison fails, we
+ * divide the work in half by moving either left or right. If lim
+ * is odd, moving left simply involves halving lim: e.g., when lim
+ * is 5 we look at item 2, so we change lim to 2 so that we will
+ * look at items 0 & 1.  If lim is even, the same applies.  If lim
+ * is odd, moving right again involes halving lim, this time moving
+ * the base up one item past p: e.g., when lim is 5 we change base
+ * to item 3 and make lim 2 so that we will look at items 3 and 4.
+ * If lim is even, however, we have to shrink it by one before
+ * halving: e.g., when lim is 4, we still looked at item 2, so we
+ * have to make lim 3, then halve, obtaining 1, so that we will only
+ * look at item 3.
+ */
+void *
+bsearch(key, base0, nmemb, size, compar)
+        register const void *key;
+        const void *base0;
+        size_t nmemb;
+        register size_t size;
+        register int (*compar) __P((const void *, const void *));
+{
+        register const char *base = base0;
+        register int lim, cmp;
+        register const void *p;
+
+        for (lim = nmemb; lim != 0; lim >>= 1) {
+                p = base + (lim >> 1) * size;
+                cmp = (*compar)(key, p);
+                if (cmp == 0)
+                        return ((void *)p);
+                if (cmp > 0) {  /* key > p: move right */
+                        base = (char *)p + size;
+                        lim--;
+                } /* else move left */
+        }
+        return (NULL);
+}
diff --git a/src/lib/libc/stdlib/calloc.3 b/src/lib/libc/stdlib/calloc.3
new file mode 100644
index 0000000000..13a912169c
--- /dev/null
+++ b/src/lib/libc/stdlib/calloc.3
@@ -0,0 +1,70 @@
+.\" Copyright (c) 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: calloc.3,v 1.3 1996/12/10 09:06:10 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt CALLOC 3
+.Os
+.Sh NAME
+.Nm calloc
+.Nd allocate clean memory (zero initialized space)
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void *
+.Fn calloc "size_t nmemb" "size_t size"
+.Sh DESCRIPTION
+The
+.Fn calloc
+function allocates space for an array of 
+.Fa nmemb
+objects, each of whose size is
+.Fa size .
+The space is initialized to all bits zero.
+.Sh RETURN VALUES
+The
+.Fn calloc
+function returns
+a pointer to
+the allocated space if successful; otherwise a null pointer is returned.
+.Sh SEE ALSO
+.Xr malloc 3 ,
+.Xr realloc 3 ,
+.Xr free 3
+.Sh STANDARDS
+The
+.Fn calloc
+function conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/calloc.c b/src/lib/libc/stdlib/calloc.c
new file mode 100644
index 0000000000..a2c4f84493
--- /dev/null
+++ b/src/lib/libc/stdlib/calloc.c
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: calloc.c,v 1.3 1996/08/20 17:42:33 downsj Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include <string.h>
+
+void *
+calloc(num, size)
+        size_t num;
+        register size_t size;
+{
+        register void *p;
+
+        size *= num;
+        p = malloc(size);
+        if (p)
+                memset(p, '\0', size);
+        return(p);
+}
diff --git a/src/lib/libc/stdlib/cfree.c b/src/lib/libc/stdlib/cfree.c
new file mode 100644
index 0000000000..3af32039a9
--- /dev/null
+++ b/src/lib/libc/stdlib/cfree.c
@@ -0,0 +1,49 @@
+/*      $OpenBSD: cfree.c,v 1.1 1996/08/21 03:47:22 tholo Exp $ */
+
+/*
+ * Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
+ * 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 SigmaSoft, Th.  Lockert.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: cfree.c,v 1.1 1996/08/21 03:47:22 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/cdefs.h>
+
+#ifdef __indr_reference
+__indr_reference(free, cfree);
+#else
+
+void
+cfree(p)
+        void *p;
+{
+    free(p);
+}
+#endif
diff --git a/src/lib/libc/stdlib/div.3 b/src/lib/libc/stdlib/div.3
new file mode 100644
index 0000000000..0d8c56d86b
--- /dev/null
+++ b/src/lib/libc/stdlib/div.3
@@ -0,0 +1,69 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: div.3,v 1.2 1996/08/19 08:33:28 tholo Exp $
+.\"
+.Dd April 19, 1991
+.Dt DIV 3
+.Os
+.Sh NAME
+.Nm div
+.Nd return quotient and remainder from division
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft div_t
+.Fn div "int num" "int denom"
+.Sh DESCRIPTION
+The
+.Fn div
+function
+computes the value
+.Fa num/denom
+and returns the quotient and remainder in a structure named
+.Fa div_t
+that contains two
+.Em int
+members named
+.Fa quot
+and
+.Fa rem .
+.Sh SEE ALSO
+.Xr ldiv 3 ,
+.Xr qdiv 3 ,
+.Xr math 3
+.Sh STANDARDS
+The
+.Fn div
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/div.c b/src/lib/libc/stdlib/div.c
new file mode 100644
index 0000000000..c1fae29008
--- /dev/null
+++ b/src/lib/libc/stdlib/div.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: div.c,v 1.2 1996/08/19 08:33:29 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>             /* div_t */
+
+div_t
+div(num, denom)
+        int num, denom;
+{
+        div_t r;
+
+        r.quot = num / denom;
+        r.rem = num % denom;
+        /*
+         * The ANSI standard says that |r.quot| <= |n/d|, where
+         * n/d is to be computed in infinite precision.  In other
+         * words, we should always truncate the quotient towards
+         * 0, never -infinity.
+         *
+         * Machine division and remainer may work either way when
+         * one or both of n or d is negative.  If only one is
+         * negative and r.quot has been truncated towards -inf,
+         * r.rem will have the same sign as denom and the opposite
+         * sign of num; if both are negative and r.quot has been
+         * truncated towards -inf, r.rem will be positive (will
+         * have the opposite sign of num).  These are considered
+         * `wrong'.
+         *
+         * If both are num and denom are positive, r will always
+         * be positive.
+         *
+         * This all boils down to:
+         *      if num >= 0, but r.rem < 0, we got the wrong answer.
+         * In that case, to get the right answer, add 1 to r.quot and
+         * subtract denom from r.rem.
+         */
+        if (num >= 0 && r.rem < 0) {
+                r.quot++;
+                r.rem -= denom;
+        }
+        return (r);
+}
diff --git a/src/lib/libc/stdlib/drand48.c b/src/lib/libc/stdlib/drand48.c
new file mode 100644
index 0000000000..02886d5b62
--- /dev/null
+++ b/src/lib/libc/stdlib/drand48.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: drand48.c,v 1.2 1996/08/19 08:33:29 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+extern unsigned short __rand48_seed[3];
+
+double
+drand48(void)
+{
+        return erand48(__rand48_seed);
+}
diff --git a/src/lib/libc/stdlib/erand48.c b/src/lib/libc/stdlib/erand48.c
new file mode 100644
index 0000000000..b92dacffcc
--- /dev/null
+++ b/src/lib/libc/stdlib/erand48.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: erand48.c,v 1.2 1996/08/19 08:33:29 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+double
+erand48(unsigned short xseed[3])
+{
+        __dorand48(xseed);
+        return ldexp((double) xseed[0], -48) +
+               ldexp((double) xseed[1], -32) +
+               ldexp((double) xseed[2], -16);
+}
diff --git a/src/lib/libc/stdlib/exit.3 b/src/lib/libc/stdlib/exit.3
new file mode 100644
index 0000000000..326c5539a8
--- /dev/null
+++ b/src/lib/libc/stdlib/exit.3
@@ -0,0 +1,83 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: exit.3,v 1.3 1999/02/27 21:55:55 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt EXIT 3
+.Os
+.Sh NAME
+.Nm exit
+.Nd perform normal program termination
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void
+.Fn exit "int status"
+.Sh DESCRIPTION
+.Fn exit
+terminates a process.
+.Pp
+Before termination it performs the following functions in the
+order listed:
+.Bl -enum -offset indent
+.It
+Call the functions registered with the
+.Xr atexit 3
+function, in the reverse order of their registration.
+.It
+Flush all open output streams.
+.It
+Close all open streams.
+.It
+Unlink all files created with the
+.Xr tmpfile 3
+function.
+.El
+.Sh RETURN VALUES
+The
+.Fn exit
+function
+never returns.
+.Sh SEE ALSO
+.Xr _exit 2 ,
+.Xr atexit 3 ,
+.Xr intro 3 ,
+.Xr tmpfile 3
+.Sh STANDARDS
+The
+.Fn exit
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/exit.c b/src/lib/libc/stdlib/exit.c
new file mode 100644
index 0000000000..bc7fd395ca
--- /dev/null
+++ b/src/lib/libc/stdlib/exit.c
@@ -0,0 +1,69 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: exit.c,v 1.3 1998/11/20 11:18:50 d Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include "atexit.h"
+
+void (*__cleanup)();
+
+/*
+ * This variable is zero until a process has created a thread.
+ * It is used to avoid calling locking functions in libc when they
+ * are not required. By default, libc is intended to be(come)
+ * thread-safe, but without a (significant) penalty to non-threaded
+ * processes.
+ */
+int     __isthreaded    = 0;
+
+/*
+ * Exit, flushing stdio buffers if necessary.
+ */
+void
+exit(status)
+        int status;
+{
+        register struct atexit *p;
+        register int n;
+
+        for (p = __atexit; p; p = p->next)
+                for (n = p->ind; --n >= 0;)
+                        (*p->fns[n])();
+        if (__cleanup)
+                (*__cleanup)();
+        _exit(status);
+}
diff --git a/src/lib/libc/stdlib/getenv.3 b/src/lib/libc/stdlib/getenv.3
new file mode 100644
index 0000000000..ed89ccbe7d
--- /dev/null
+++ b/src/lib/libc/stdlib/getenv.3
@@ -0,0 +1,155 @@
+.\" Copyright (c) 1988, 1991, 1993
+.\"    The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: getenv.3,v 1.3 1998/11/10 22:27:30 espie Exp $
+.\"
+.Dd December 11, 1993
+.Dt GETENV 3
+.Os
+.Sh NAME
+.Nm getenv ,
+.Nm putenv ,
+.Nm setenv ,
+.Nm unsetenv
+.Nd environment variable functions
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft char *
+.Fn getenv "const char *name"
+.Ft int
+.Fn setenv "const char *name" "const char *value" "int overwrite"
+.Ft int
+.Fn putenv "const char *string"
+.Ft void
+.Fn unsetenv "const char *name"
+.Sh DESCRIPTION
+These functions set, unset and fetch environment variables from the
+host
+.Em environment list .
+For compatibility with differing environment conventions,
+the given arguments
+.Ar name
+and
+.Ar value
+may be appended and prepended, 
+respectively,
+with an equal sign
+.Dq Li \&= .
+.Pp
+The
+.Fn getenv
+function obtains the current value of the environment variable,
+.Ar name .
+If the variable
+.Ar name
+is not in the current environment,
+a null pointer is returned.
+.Pp
+The
+.Fn setenv
+function inserts or resets the environment variable
+.Ar name
+in the current environment list.
+If the variable
+.Ar name
+does not exist in the list,
+it is inserted with the given
+.Ar value.
+If the variable does exist, the argument
+.Ar overwrite
+is tested; if
+.Ar overwrite is
+zero, the
+variable is not reset, otherwise it is reset
+to the given
+.Ar value .
+.Pp
+The
+.Fn putenv
+function takes an argument of the form ``name=value'' and is
+equivalent to:
+.Bd -literal -offset indent
+setenv(name, value, 1);
+.Ed
+.Pp
+The
+.Fn unsetenv
+function
+deletes all instances of the variable name pointed to by
+.Fa name
+from the list.
+.Sh RETURN VALUES
+The functions
+.Fn setenv
+and
+.Fn putenv
+return zero if successful; otherwise the global variable
+.Va errno
+is set to indicate the error and a
+\-1 is returned.
+.Pp
+If
+.Fn getenv
+is succesful, the string returned should be considered read-only. 
+.Sh ERRORS
+.Bl -tag -width [ENOMEM]
+.It Bq Er ENOMEM
+The function
+.Fn setenv
+or
+.Fn putenv
+failed because they were unable to allocate memory for the environment.
+.El
+.Sh SEE ALSO
+.Xr csh 1 ,
+.Xr sh 1 ,
+.Xr execve 2 ,
+.Xr environ 7
+.Sh STANDARDS
+The
+.Fn getenv
+function conforms to
+.St -ansiC .
+.Sh HISTORY
+The functions
+.Fn setenv
+and
+.Fn unsetenv
+appeared in
+.At v7 .
+The
+.Fn putenv
+function appeared in
+.Bx 4.3 Reno .
diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c
new file mode 100644
index 0000000000..4db86df915
--- /dev/null
+++ b/src/lib/libc/stdlib/getenv.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 1987, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: getenv.c,v 1.4 1998/07/16 18:02:33 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ * __findenv --
+ *      Returns pointer to value associated with name, if any, else NULL.
+ *      Sets offset to be the offset of the name/value combination in the
+ *      environmental array, for use by setenv(3) and unsetenv(3).
+ *      Explicitly removes '=' in argument name.
+ *
+ *      This routine *should* be a static; don't use it.
+ */
+char *
+__findenv(name, offset)
+        register const char *name;
+        int *offset;
+{
+        extern char **environ;
+        register int len, i;
+        register const char *np;
+        register char **p, *cp;
+
+        if (name == NULL || environ == NULL)
+                return (NULL);
+        for (np = name; *np && *np != '='; ++np)
+                ;
+        len = np - name;
+        for (p = environ; (cp = *p) != NULL; ++p) {
+                for (np = name, i = len; i && *cp; i--)
+                        if (*cp++ != *np++)
+                                break;
+                if (i == 0 && *cp++ == '=') {
+                        *offset = p - environ;
+                        return (cp);
+                }
+        }
+        return (NULL);
+}
+
+/*
+ * getenv --
+ *      Returns ptr to value associated with name, if any, else NULL.
+ */
+char *
+getenv(name)
+        const char *name;
+{
+        int offset;
+        char *__findenv();
+
+        return(__findenv(name, &offset));
+}
diff --git a/src/lib/libc/stdlib/getopt.3 b/src/lib/libc/stdlib/getopt.3
new file mode 100644
index 0000000000..4340ff54fd
--- /dev/null
+++ b/src/lib/libc/stdlib/getopt.3
@@ -0,0 +1,261 @@
+.\" Copyright (c) 1988, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: getopt.3,v 1.6 1998/05/05 19:36:03 deraadt Exp $
+.\"
+.Dd April 19, 1994
+.Dt GETOPT 3
+.Os BSD 4.3
+.Sh NAME
+.Nm getopt
+.Nd get option character from command line argument list
+.Sh SYNOPSIS
+.Fd #include <unistd.h>
+.Vt extern char *optarg;
+.Vt extern int   optind;
+.Vt extern int   optopt;
+.Vt extern int   opterr;
+.Vt extern int   optreset;
+.Ft int
+.Fn getopt "int argc" "char * const *argv" "const char *optstring"
+.Sh DESCRIPTION
+The
+.Fn getopt
+function incrementally parses a command line argument list
+.Fa argv
+and returns the next
+.Em known
+option character.
+An option character is
+.Em known
+if it has been specified in the string of accepted option characters,
+.Fa optstring .
+.Pp
+The option string
+.Fa optstring
+may contain the following elements: individual characters, and
+characters followed by a colon to indicate an option argument
+is to follow.
+For example, an option string
+.Li "\&""x""
+recognizes an option
+.Dq Fl x ,
+and an option string
+.Li "\&""x:""
+recognizes an option and argument
+.Dq Fl x Ar argument .
+It does not matter to
+.Fn getopt
+if a following argument has leading white space.
+.Pp
+On return from
+.Fn getopt ,
+.Va optarg
+points to an option argument, if it is anticipated,
+and the variable
+.Va optind
+contains the index to the next
+.Fa argv
+argument for a subsequent call
+to
+.Fn getopt .
+The variable
+.Va optopt
+saves the last
+.Em known
+option character returned by
+.Fn getopt .
+.Pp
+The variable
+.Va opterr
+and
+.Va optind
+are both initialized to 1.
+The
+.Va optind
+variable may be set to another value before a set of calls to
+.Fn getopt
+in order to skip over more or less argv entries.
+.Pp
+In order to use
+.Fn getopt
+to evaluate multiple sets of arguments, or to evaluate a single set of
+arguments multiple times,
+the variable
+.Va optreset
+must be set to 1 before the second and each additional set of calls to
+.Fn getopt ,
+and the variable
+.Va optind
+must be reinitialized.
+.Pp
+The
+.Fn getopt
+function
+returns \-1
+when the argument list is exhausted, or a non-recognized
+option is encountered.
+The interpretation of options in the argument list may be cancelled
+by the option
+.Ql --
+(double dash) which causes
+.Fn getopt
+to signal the end of argument processing and returns \-1.
+When all options have been processed (i.e., up to the first non-option
+argument),
+.Fn getopt
+returns \-1.
+.Sh DIAGNOSTICS
+If the
+.Fn getopt
+function encounters a character not found in the string
+.Va optstring
+or detects
+a missing option argument it writes an error message to 
+.Em stderr 
+and returns
+.Ql ? .
+Setting
+.Va opterr
+to a zero will disable these error messages.
+If
+.Va optstring 
+has a leading 
+.Ql \&:
+then a missing option argument causes a
+.Ql \&:
+to be returned in addition to suppressing any error messages.
+.Pp
+Option arguments are allowed to begin with
+.Dq Li \- ;
+this is reasonable but
+reduces the amount of error checking possible.
+.Sh EXTENSIONS
+The
+.Va optreset
+variable was added to make it possible to call the
+.Fn getopt
+function multiple times.
+This is an extension to the
+.St -p1003.2
+specification.
+.Sh EXAMPLE
+.Bd -literal -compact
+extern char *optarg;
+extern int optind;
+int bflag, ch, fd;
+
+bflag = 0;
+while ((ch = getopt(argc, argv, "bf:")) != -1) {
+        switch (ch) {
+        case 'b':
+                bflag = 1;
+                break;
+        case 'f':
+                if ((fd = open(optarg, O_RDONLY, 0)) < 0) {
+                        (void)fprintf(stderr,
+                            "myname: %s: %s\en", optarg, strerror(errno));
+                        exit(1);
+                }
+                break;
+        case '?':
+        default:
+                usage();
+        }
+}
+argc -= optind;
+argv += optind;
+.Ed
+.Sh HISTORY
+The
+.Fn getopt
+function appeared
+.Bx 4.3 .
+.Sh BUGS
+The
+.Fn getopt
+function was once specified to return
+.Dv EOF 
+instead of \-1.
+This was changed by
+.St -p1003.2-92
+to decouple 
+.Fn getopt
+from 
+.Pa <stdio.h> .
+.Pp
+A single dash
+.Dq Li -
+may be specified as a character in
+.Fa optstring ,
+however it should
+.Em never
+have an argument associated with it.
+This allows
+.Fn getopt
+to be used with programs that expect
+.Dq Li -
+as an option flag.
+This practice is wrong, and should not be used in any current development.
+It is provided for backward compatibility
+.Em only .
+By default, a single dash causes
+.Fn getopt
+to return \-1.
+This is, we believe, compatible with System V.
+.Pp
+It is also possible to handle digits as option letters.
+This allows
+.Fn getopt
+to be used with programs that expect a number
+.Pq Dq Li \&-\&3
+as an option.
+This practice is wrong, and should not be used in any current development.
+It is provided for backward compatibility
+.Em only .
+The following code fragment works in most cases.
+.Bd -literal -offset indent
+int length;
+char *p;
+
+while ((c = getopt(argc, argv, "0123456789")) != -1)
+        switch (c) {
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+                p = argv[optind - 1];
+                if (p[0] == '-' && p[1] == ch && !p[2])
+                        length = atoi(++p);
+                else
+                        length = atoi(argv[optind] + 1);
+                break;
+        }
+}
+.Ed
diff --git a/src/lib/libc/stdlib/getopt.c b/src/lib/libc/stdlib/getopt.c
new file mode 100644
index 0000000000..b7f6163662
--- /dev/null
+++ b/src/lib/libc/stdlib/getopt.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 1987, 1993, 1994
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: getopt.c,v 1.2 1996/08/19 08:33:32 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int     opterr = 1,             /* if error message should be printed */
+        optind = 1,             /* index into parent argv vector */
+        optopt,                 /* character checked for validity */
+        optreset;               /* reset getopt */
+char    *optarg;                /* argument associated with option */
+
+#define BADCH   (int)'?'
+#define BADARG  (int)':'
+#define EMSG    ""
+
+/*
+ * getopt --
+ *      Parse argc/argv argument vector.
+ */
+int
+getopt(nargc, nargv, ostr)
+        int nargc;
+        char * const *nargv;
+        const char *ostr;
+{
+        extern char *__progname;
+        static char *place = EMSG;              /* option letter processing */
+        char *oli;                              /* option letter list index */
+
+        if (optreset || !*place) {              /* update scanning pointer */
+                optreset = 0;
+                if (optind >= nargc || *(place = nargv[optind]) != '-') {
+                        place = EMSG;
+                        return (-1);
+                }
+                if (place[1] && *++place == '-') {      /* found "--" */
+                        ++optind;
+                        place = EMSG;
+                        return (-1);
+                }
+        }                                       /* option letter okay? */
+        if ((optopt = (int)*place++) == (int)':' ||
+            !(oli = strchr(ostr, optopt))) {
+                /*
+                 * if the user didn't specify '-' as an option,
+                 * assume it means -1.
+                 */
+                if (optopt == (int)'-')
+                        return (-1);
+                if (!*place)
+                        ++optind;
+                if (opterr && *ostr != ':')
+                        (void)fprintf(stderr,
+                            "%s: illegal option -- %c\n", __progname, optopt);
+                return (BADCH);
+        }
+        if (*++oli != ':') {                    /* don't need argument */
+                optarg = NULL;
+                if (!*place)
+                        ++optind;
+        }
+        else {                                  /* need an argument */
+                if (*place)                     /* no white space */
+                        optarg = place;
+                else if (nargc <= ++optind) {   /* no arg */
+                        place = EMSG;
+                        if (*ostr == ':')
+                                return (BADARG);
+                        if (opterr)
+                                (void)fprintf(stderr,
+                                    "%s: option requires an argument -- %c\n",
+                                    __progname, optopt);
+                        return (BADCH);
+                }
+                else                            /* white space */
+                        optarg = nargv[optind];
+                place = EMSG;
+                ++optind;
+        }
+        return (optopt);                        /* dump back option letter */
+}
diff --git a/src/lib/libc/stdlib/getsubopt.3 b/src/lib/libc/stdlib/getsubopt.3
new file mode 100644
index 0000000000..8acc91bdd1
--- /dev/null
+++ b/src/lib/libc/stdlib/getsubopt.3
@@ -0,0 +1,148 @@
+.\" $OpenBSD: getsubopt.3,v 1.2 1998/06/15 17:55:07 mickey Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)getsubopt.3 8.1 (Berkeley) 6/9/93
+.\"
+.Dd June 9, 1993
+.Dt GETSUBOPT 3
+.Os
+.Sh NAME
+.Nm getsubopt
+.Nd get sub options from an argument
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Vt extern char *suboptarg
+.Ft int
+.Fn getsubopt "char **optionp" "char * const *tokens" "char **valuep"
+.Sh DESCRIPTION
+The
+.Fn getsubopt
+function
+parses a string containing tokens delimited by one or more tab, space or
+comma
+.Pq Ql \&,
+characters.
+It is intended for use in parsing groups of option arguments provided
+as part of a utility command line.
+.Pp
+The argument
+.Fa optionp
+is a pointer to a pointer to the string.
+The argument
+.Fa tokens
+is a pointer to a
+.Dv NULL Ns -terminated
+array of pointers to strings.
+.Pp
+The
+.Fn getsubopt
+function
+returns the zero-based offset of the pointer in the
+.Fa tokens
+array referencing a string which matches the first token
+in the string, or, \-1 if the string contains no tokens or
+.Fa tokens
+does not contain a matching string.
+.Pp
+If the token is of the form ``name=value'', the location referenced by
+.Fa valuep
+will be set to point to the start of the ``value'' portion of the token.
+.Pp
+On return from
+.Fn getsubopt ,
+.Fa optionp
+will be set to point to the start of the next token in the string,
+or the null at the end of the string if no more tokens are present.
+The external variable
+.Fa suboptarg
+will be set to point to the start of the current token, or
+.Dv NULL
+if no
+tokens were present.
+The argument
+.Fa valuep
+will be set to point to the ``value'' portion of the token, or
+.Dv NULL
+if no ``value'' portion was present.
+.Sh EXAMPLE
+.Bd -literal -compact
+char *tokens[] = {
+        #define ONE     0
+                "one",
+        #define TWO     1
+                "two",
+        NULL
+};
+
+\&...
+
+extern char *optarg, *suboptarg;
+char *options, *value;
+
+while ((ch = getopt(argc, argv, "ab:")) != \-1) {
+        switch(ch) {
+        case 'a':
+                /* process ``a'' option */
+                break;
+        case 'b':
+                options = optarg;
+                while (*options) {
+                        switch(getsubopt(&options, tokens, &value)) {
+                        case ONE:
+                                /* process ``one'' sub option */
+                                break;
+                        case TWO:
+                                /* process ``two'' sub option */
+                                if (!value)
+                                        error("no value for two");
+                                i = atoi(value);
+                                break;
+                        case \-1:
+                                if (suboptarg)
+                                        error("illegal sub option %s",
+                                          suboptarg);
+                                else
+                                        error("missing sub option");
+                                break;
+                }
+                break;
+        }
+.Ed
+.Sh SEE ALSO
+.Xr getopt 3 ,
+.Xr strsep 3
+.Sh HISTORY
+The
+.Fn getsubopt
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/getsubopt.c b/src/lib/libc/stdlib/getsubopt.c
new file mode 100644
index 0000000000..1667a31d7d
--- /dev/null
+++ b/src/lib/libc/stdlib/getsubopt.c
@@ -0,0 +1,106 @@
+/*      $OpenBSD: getsubopt.c,v 1.1 1997/08/20 04:02:17 millert Exp $   */
+
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)getsubopt.c 8.1 (Berkeley) 6/4/93";
+#else
+static char rcsid[] = "$OpenBSD: getsubopt.c,v 1.1 1997/08/20 04:02:17 millert Exp $";
+#endif
+#endif /* not lint */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ * The SVID interface to getsubopt provides no way of figuring out which
+ * part of the suboptions list wasn't matched.  This makes error messages
+ * tricky...  The extern variable suboptarg is a pointer to the token
+ * which didn't match.
+ */
+char *suboptarg;
+
+int
+getsubopt(optionp, tokens, valuep)
+        register char **optionp, **valuep;
+        register char * const *tokens;
+{
+        register int cnt;
+        register char *p;
+
+        suboptarg = *valuep = NULL;
+
+        if (!optionp || !*optionp)
+                return(-1);
+
+        /* skip leading white-space, commas */
+        for (p = *optionp; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
+
+        if (!*p) {
+                *optionp = p;
+                return(-1);
+        }
+
+        /* save the start of the token, and skip the rest of the token. */
+        for (suboptarg = p;
+            *++p && *p != ',' && *p != '=' && *p != ' ' && *p != '\t';);
+
+        if (*p) {
+                /*
+                 * If there's an equals sign, set the value pointer, and
+                 * skip over the value part of the token.  Terminate the
+                 * token.
+                 */
+                if (*p == '=') {
+                        *p = '\0';
+                        for (*valuep = ++p;
+                            *p && *p != ',' && *p != ' ' && *p != '\t'; ++p);
+                        if (*p) 
+                                *p++ = '\0';
+                } else
+                        *p++ = '\0';
+                /* Skip any whitespace or commas after this token. */
+                for (; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
+        }
+
+        /* set optionp for next round. */
+        *optionp = p;
+
+        for (cnt = 0; *tokens; ++tokens, ++cnt)
+                if (!strcmp(suboptarg, *tokens))
+                        return(cnt);
+        return(-1);
+}
diff --git a/src/lib/libc/stdlib/heapsort.c b/src/lib/libc/stdlib/heapsort.c
new file mode 100644
index 0000000000..e3e4392e05
--- /dev/null
+++ b/src/lib/libc/stdlib/heapsort.c
@@ -0,0 +1,183 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ronnie Kon at Mindcraft Inc., Kevin Lew and Elmer Yglesias.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: heapsort.c,v 1.2 1996/08/19 08:33:32 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/*
+ * Swap two areas of size number of bytes.  Although qsort(3) permits random
+ * blocks of memory to be sorted, sorting pointers is almost certainly the
+ * common case (and, were it not, could easily be made so).  Regardless, it
+ * isn't worth optimizing; the SWAP's get sped up by the cache, and pointer
+ * arithmetic gets lost in the time required for comparison function calls.
+ */
+#define SWAP(a, b, count, size, tmp) { \
+        count = size; \
+        do { \
+                tmp = *a; \
+                *a++ = *b; \
+                *b++ = tmp; \
+        } while (--count); \
+}
+
+/* Copy one block of size size to another. */
+#define COPY(a, b, count, size, tmp1, tmp2) { \
+        count = size; \
+        tmp1 = a; \
+        tmp2 = b; \
+        do { \
+                *tmp1++ = *tmp2++; \
+        } while (--count); \
+}
+
+/*
+ * Build the list into a heap, where a heap is defined such that for
+ * the records K1 ... KN, Kj/2 >= Kj for 1 <= j/2 <= j <= N.
+ *
+ * There two cases.  If j == nmemb, select largest of Ki and Kj.  If
+ * j < nmemb, select largest of Ki, Kj and Kj+1.
+ */
+#define CREATE(initval, nmemb, par_i, child_i, par, child, size, count, tmp) { \
+        for (par_i = initval; (child_i = par_i * 2) <= nmemb; \
+            par_i = child_i) { \
+                child = base + child_i * size; \
+                if (child_i < nmemb && compar(child, child + size) < 0) { \
+                        child += size; \
+                        ++child_i; \
+                } \
+                par = base + par_i * size; \
+                if (compar(child, par) <= 0) \
+                        break; \
+                SWAP(par, child, count, size, tmp); \
+        } \
+}
+
+/*
+ * Select the top of the heap and 'heapify'.  Since by far the most expensive
+ * action is the call to the compar function, a considerable optimization
+ * in the average case can be achieved due to the fact that k, the displaced
+ * elememt, is ususally quite small, so it would be preferable to first
+ * heapify, always maintaining the invariant that the larger child is copied
+ * over its parent's record.
+ *
+ * Then, starting from the *bottom* of the heap, finding k's correct place,
+ * again maintianing the invariant.  As a result of the invariant no element
+ * is 'lost' when k is assigned its correct place in the heap.
+ *
+ * The time savings from this optimization are on the order of 15-20% for the
+ * average case. See Knuth, Vol. 3, page 158, problem 18.
+ *
+ * XXX Don't break the #define SELECT line, below.  Reiser cpp gets upset.
+ */
+#define SELECT(par_i, child_i, nmemb, par, child, size, k, count, tmp1, tmp2) { \
+        for (par_i = 1; (child_i = par_i * 2) <= nmemb; par_i = child_i) { \
+                child = base + child_i * size; \
+                if (child_i < nmemb && compar(child, child + size) < 0) { \
+                        child += size; \
+                        ++child_i; \
+                } \
+                par = base + par_i * size; \
+                COPY(par, child, count, size, tmp1, tmp2); \
+        } \
+        for (;;) { \
+                child_i = par_i; \
+                par_i = child_i / 2; \
+                child = base + child_i * size; \
+                par = base + par_i * size; \
+                if (child_i == 1 || compar(k, par) < 0) { \
+                        COPY(child, k, count, size, tmp1, tmp2); \
+                        break; \
+                } \
+                COPY(child, par, count, size, tmp1, tmp2); \
+        } \
+}
+
+/*
+ * Heapsort -- Knuth, Vol. 3, page 145.  Runs in O (N lg N), both average
+ * and worst.  While heapsort is faster than the worst case of quicksort,
+ * the BSD quicksort does median selection so that the chance of finding
+ * a data set that will trigger the worst case is nonexistent.  Heapsort's
+ * only advantage over quicksort is that it requires little additional memory.
+ */
+int
+heapsort(vbase, nmemb, size, compar)
+        void *vbase;
+        size_t nmemb, size;
+        int (*compar) __P((const void *, const void *));
+{
+        register int cnt, i, j, l;
+        register char tmp, *tmp1, *tmp2;
+        char *base, *k, *p, *t;
+
+        if (nmemb <= 1)
+                return (0);
+
+        if (!size) {
+                errno = EINVAL;
+                return (-1);
+        }
+
+        if ((k = malloc(size)) == NULL)
+                return (-1);
+
+        /*
+         * Items are numbered from 1 to nmemb, so offset from size bytes
+         * below the starting address.
+         */
+        base = (char *)vbase - size;
+
+        for (l = nmemb / 2 + 1; --l;)
+                CREATE(l, nmemb, i, j, t, p, size, cnt, tmp);
+
+        /*
+         * For each element of the heap, save the largest element into its
+         * final slot, save the displaced element (k), then recreate the
+         * heap.
+         */
+        while (nmemb > 1) {
+                COPY(k, base + nmemb * size, cnt, size, tmp1, tmp2);
+                COPY(base + nmemb * size, base + size, cnt, size, tmp1, tmp2);
+                --nmemb;
+                SELECT(i, j, nmemb, t, p, size, k, cnt, tmp1, tmp2);
+        }
+        free(k);
+        return (0);
+}
diff --git a/src/lib/libc/stdlib/jrand48.c b/src/lib/libc/stdlib/jrand48.c
new file mode 100644
index 0000000000..99cddb71e5
--- /dev/null
+++ b/src/lib/libc/stdlib/jrand48.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: jrand48.c,v 1.2 1996/08/19 08:33:33 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+long
+jrand48(unsigned short xseed[3])
+{
+        __dorand48(xseed);
+        return ((long) xseed[2] << 16) + (long) xseed[1];
+}
diff --git a/src/lib/libc/stdlib/l64a.c b/src/lib/libc/stdlib/l64a.c
new file mode 100644
index 0000000000..4e99391254
--- /dev/null
+++ b/src/lib/libc/stdlib/l64a.c
@@ -0,0 +1,46 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: l64a.c,v 1.3 1997/08/17 22:58:34 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <errno.h>
+#include <stdlib.h>
+
+char *
+l64a(value)
+        long value;
+{
+        static char buf[8];
+        char *s = buf;
+        int digit;
+        int i;
+
+        if (value < 0) {
+                errno = EINVAL;
+                return(NULL);
+        }
+
+        for (i = 0; value != 0 && i < 6; i++) {
+                digit = value & 0x3f;
+
+                if (digit < 2) 
+                        *s = digit + '.';
+                else if (digit < 12)
+                        *s = digit + '0' - 2;
+                else if (digit < 38)
+                        *s = digit + 'A' - 12;
+                else
+                        *s = digit + 'a' - 38;
+
+                value >>= 6;
+                s++;
+        }
+
+        *s = '\0';
+
+        return(buf);
+}
diff --git a/src/lib/libc/stdlib/labs.3 b/src/lib/libc/stdlib/labs.3
new file mode 100644
index 0000000000..05eae329df
--- /dev/null
+++ b/src/lib/libc/stdlib/labs.3
@@ -0,0 +1,66 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: labs.3,v 1.2 1996/08/19 08:33:34 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt LABS 3
+.Os
+.Sh NAME
+.Nm labs
+.Nd return the absolute value of a long integer
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft long
+.Fn labs "long j"
+.Sh DESCRIPTION
+The
+.Fn labs
+function
+returns the absolute value of the long integer
+.Ar j .
+.Sh SEE ALSO
+.Xr abs 3 ,
+.Xr floor 3 ,
+.Xr cabs 3 ,
+.Xr math 3
+.Sh STANDARDS
+The
+.Fn labs
+function
+conforms to
+.St -ansiC .
+.Sh BUGS
+The absolute value of the most negative integer remains negative.
diff --git a/src/lib/libc/stdlib/labs.c b/src/lib/libc/stdlib/labs.c
new file mode 100644
index 0000000000..f20e2c29be
--- /dev/null
+++ b/src/lib/libc/stdlib/labs.c
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: labs.c,v 1.2 1996/08/19 08:33:34 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+long
+labs(j)
+        long j;
+{
+        return(j < 0 ? -j : j);
+}
diff --git a/src/lib/libc/stdlib/lcong48.c b/src/lib/libc/stdlib/lcong48.c
new file mode 100644
index 0000000000..44bd74e48a
--- /dev/null
+++ b/src/lib/libc/stdlib/lcong48.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: lcong48.c,v 1.2 1996/08/19 08:33:35 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+extern unsigned short __rand48_seed[3];
+extern unsigned short __rand48_mult[3];
+extern unsigned short __rand48_add;
+
+void
+lcong48(unsigned short p[7])
+{
+        __rand48_seed[0] = p[0];
+        __rand48_seed[1] = p[1];
+        __rand48_seed[2] = p[2];
+        __rand48_mult[0] = p[3];
+        __rand48_mult[1] = p[4];
+        __rand48_mult[2] = p[5];
+        __rand48_add = p[6];
+}
diff --git a/src/lib/libc/stdlib/ldiv.3 b/src/lib/libc/stdlib/ldiv.3
new file mode 100644
index 0000000000..8757f4ddd5
--- /dev/null
+++ b/src/lib/libc/stdlib/ldiv.3
@@ -0,0 +1,71 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: ldiv.3,v 1.2 1996/08/19 08:33:35 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt LDIV 3
+.Os
+.Sh NAME
+.Nm ldiv
+.Nd return quotient and remainder from division
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft ldiv_t
+.Fn ldiv "long num" "long denom"
+.Sh DESCRIPTION
+The
+.Fn ldiv
+function
+computes the value
+.Ar num/denom
+and returns the quotient and remainder in a structure named
+.Ar ldiv_t
+that contains two
+.Em long integer
+members named
+.Ar quot
+and
+.Ar rem .
+.Sh SEE ALSO
+.Xr div 3 ,
+.Xr qdiv 3 ,
+.Xr math 3
+.Sh STANDARDS
+The
+.Fn ldiv
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/ldiv.c b/src/lib/libc/stdlib/ldiv.c
new file mode 100644
index 0000000000..908c2bf0aa
--- /dev/null
+++ b/src/lib/libc/stdlib/ldiv.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: ldiv.c,v 1.2 1996/08/19 08:33:35 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>             /* ldiv_t */
+
+ldiv_t
+ldiv(num, denom)
+        long num, denom;
+{
+        ldiv_t r;
+
+        /* see div.c for comments */
+
+        r.quot = num / denom;
+        r.rem = num % denom;
+        if (num >= 0 && r.rem < 0) {
+                r.quot++;
+                r.rem -= denom;
+        }
+        return (r);
+}
diff --git a/src/lib/libc/stdlib/lrand48.c b/src/lib/libc/stdlib/lrand48.c
new file mode 100644
index 0000000000..6b7524a51b
--- /dev/null
+++ b/src/lib/libc/stdlib/lrand48.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: lrand48.c,v 1.2 1996/08/19 08:33:36 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+extern unsigned short __rand48_seed[3];
+
+long
+lrand48(void)
+{
+        __dorand48(__rand48_seed);
+        return ((long) __rand48_seed[2] << 15) + ((long) __rand48_seed[1] >> 1);
+}
diff --git a/src/lib/libc/stdlib/malloc.3 b/src/lib/libc/stdlib/malloc.3
new file mode 100644
index 0000000000..9edff6709c
--- /dev/null
+++ b/src/lib/libc/stdlib/malloc.3
@@ -0,0 +1,355 @@
+.\" Copyright (c) 1980, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: malloc.3,v 1.11 1999/03/23 21:07:57 millert Exp $
+.\"
+.Dd August 27, 1996
+.Dt MALLOC 3
+.Os OpenBSD
+.Sh NAME
+.Nm malloc ,
+.Nd general memory allocation function
+.Pp
+.Nm free ,
+.Nm cfree
+.Nd free up memory allocated with malloc, calloc or realloc
+.Pp
+.Nm realloc
+.Nd reallocation of memory function
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void *
+.Fn malloc "size_t size"
+.Ft void
+.Fn free "void *ptr"
+.Ft void
+.Fn cfree "void *ptr"
+.Ft void *
+.Fn realloc "void *ptr" "size_t size"
+.Ft char *
+.Va malloc_options
+.Sh DESCRIPTION
+The
+.Fn malloc
+function allocates uninitialized space for an object whose
+size is specified by
+.Fa size .
+The
+.Fn malloc
+function maintains multiple lists of free blocks according to size, allocating
+space from the appropriate list.
+.Pp
+The allocated space is
+suitably aligned (after possible pointer
+coercion) for storage of any type of object. If the space is of
+.Em pagesize
+or larger, the memory returned will be page-aligned.
+.Pp
+Allocation of a zero size object returns a pointer to a zero size object.
+.Pp
+The
+.Fn free
+function causes the space pointed to by
+.Fa ptr
+to be deallocated, that is, at least made available for further allocation,
+but if possible, it will passed back to the kernel with
+.Xr sbrk 2 .
+If
+.Fa ptr
+is a null pointer, no action occurs.
+.Pp
+A
+.Fn cfree
+function is also provided for compatibility with old systems and other
+.Nm malloc
+libraries; it is simply an alias for
+.Fn free .
+.Pp
+The
+.Fn realloc
+function changes the size of the object pointed to by
+.Fa ptr
+to
+.Fa size
+bytes and returns a pointer to the (possibly moved) object.
+The contents of the object are unchanged up to the lesser
+of the new and old sizes.
+If the new size is larger, the value of the newly allocated portion
+of the object is indeterminate and uninitialized.
+If
+.Fa ptr
+is a null pointer, the
+.Fn realloc
+function behaves like the
+.Fn malloc 
+function for the specified size.
+If the space cannot be allocated, the object 
+pointed to by
+.Fa ptr
+is unchanged.
+If
+.Fa size
+is zero and
+.Fa ptr
+is not a null pointer, the object it points to is freed and a new zero size
+object is returned.
+.Pp
+When using
+.Fn realloc
+one must be careful to avoid the following idiom:
+.Pp
+.Bd -literal -offset indent
+if ((p = realloc(p, nsize)) == NULL)
+        return NULL;
+.Ed
+.Pp
+In most cases, this will result in a leak of memory.
+As stated earlier, a return value of
+.Fa NULL
+indicates that the old object still remains allocated.
+Better code looks like this:
+.Bd -literal -offset indent
+if ((p2 = realloc(p, nsize)) == NULL) {
+        if (p)
+                free(p);
+        p = NULL;
+        return NULL;
+}
+p = p2;
+.Ed
+.Pp
+Malloc will first look for a symbolic link called
+.Pa /etc/malloc.conf
+and next check the environment for a variable called
+.Ev MALLOC_OPTIONS
+and finally for the global variable
+.Va malloc_options
+and scan them for flags in that order.
+Flags are single letters, uppercase means on, lowercase means off.
+.Bl -tag -width indent
+.It A
+``abort'' malloc will coredump the process, rather than tolerate failure.
+This is a very handy debugging aid, since the core file will represent the
+time of failure,
+rather than when the NULL pointer was accessed.
+
+.It D
+``dump'' malloc will dump statistics in a file called ``malloc.out'' at exit.
+This option requires the library to have been compiled with -DMALLOC_STATS in
+order to have any effect.
+
+.It J
+``junk'' fill some junk into the area allocated.
+Currently junk is bytes of 0xd0, this is pronounced ``Duh'' :-)
+
+.It H
+``hint'' pass a hint to the kernel about pages we don't use.  If the
+machine is paging a lot this may help a bit.
+
+.It N
+Do not output warning messages when encountering possible corruption
+or bad pointers.
+
+.It R
+``realloc'' always reallocate when
+.Fn realloc
+is called, even if the initial allocation was big enough.
+This can substantially aid in compacting memory.
+
+.It U
+``utrace'' generate entries for
+.Xr ktrace 1
+for all operations.
+Consult the source for this one.
+
+.It X
+``xmalloc'' 
+rather than return failure,
+.Xr abort 3
+the program with a diagnostic message on stderr.
+It is the intention that this option be set at compile time by
+including in the source:
+.Bd -literal -offset indent
+extern char *malloc_options;
+malloc_options = "X";
+.Ed
+
+.It Z
+``zero'' fill some junk into the area allocated (see ``J''),
+except for the exact length the user asked for, which is zeroed.
+
+.It <
+``Half the cache size'' Reduce the size of the cache by a factor of two.
+
+.It >
+``Double the cache size'' Double the size of the cache by a factor of two.
+.El
+.Pp
+So to set a systemwide reduction of cache size and coredumps on problems
+one would:
+.Li ln -s 'A<' /etc/malloc.conf
+.Pp
+The ``J'' and ``Z'' is mostly for testing and debugging,
+if a program changes behavior if either of these options are used,
+it is buggy.
+.Pp
+The default cache size is 16 pages.
+.Sh ENVIRONMENT
+See above.
+.Sh RETURN VALUES
+The
+.Fn malloc
+function returns
+a pointer to the allocated space if successful; otherwise
+a null pointer is returned.
+.Pp
+The
+.Fn free
+function returns no value.
+.Pp
+The
+.Fn realloc
+function a pointer to the possibly moved allocated space;
+otherwise a null pointer is returned.
+.Sh MESSAGES
+If 
+.Fn malloc ,
+.Fn free
+or 
+.Fn realloc
+detects an error or warning condition,
+a message will be printed to filedescriptor
+2 (not using stdio).
+Errors will always result in the process being 
+.Xr abort 2 'ed,
+If the ``A'' option has been specified, also warnings will
+.Xr abort 2 
+the process.
+.Pp
+Here is a brief description of the error messages and what they mean:
+.Pp
+``(ES): mumble mumble mumble'':
+malloc have been compiled with -DEXTRA_SANITY and something looks
+fishy in there.  Consult sources and or wizards.
+.Pp
+``allocation failed''
+if the ``A'' option is specified it is an error for
+.Fn malloc
+or 
+.Fn realloc
+to return NULL.
+.Pp
+``mmap(2) failed, check limits.''
+This is a rather weird condition that is most likely to mean that
+the system is seriously overloaded or that your ulimits are sick.
+.Pp
+``freelist is destroyed.''
+mallocs internal freelist has been stomped on.
+.Pp
+Here is a brief description of the warning messages and what they mean:
+.Pp
+``chunk/page is already free.''
+A pointer to a free chunk is attempted freed again.
+.Pp
+``junk pointer, too high to make sense.''
+The pointer doesn't make sense.  It's above the area of memory that
+malloc knows something about.
+This could be a pointer from some
+.Xr mmap 2 'ed 
+memory.
+.Pp
+``junk pointer, too low to make sense.''
+The pointer doesn't make sense.  It's below the area of memory that
+malloc knows something about.
+This pointer probably came from your data or bss segments.
+.Pp
+``malloc() has never been called.''
+Nothing has ever been allocated, yet something is being freed or
+realloc'ed.
+.Pp
+``modified (chunk-/page-) pointer.''
+The pointer passed to free or realloc has been modified.
+.Pp
+``pointer to wrong page.''
+The pointer that malloc is trying to free is not pointing to
+a sensible page.
+.Pp
+``recursive call.''
+You have tried to call recursively into these functions.
+I can only imagine this as happening if you call one of these
+functions from a signal function, which happens to be called
+while you're already in here.
+Well, sorry to say: that's not supported.
+If this is a problem for you I'd like to hear about it.  It
+would be possible to add a sigblock() around this package,
+but it would have a performance penalty that is not acceptable
+as the default.
+.Pp
+``unknown char in MALLOC_OPTIONS''
+we found something we didn't understand.
+.Sh FILES
+.Bl -tag -width "/etc/malloc.conf"
+.It Pa /etc/malloc.conf
+symbolic link to file containing option flags
+.Sh SEE ALSO
+.Xr brk 2 ,
+.Xr alloca 3 ,
+.Xr calloc 3 ,
+.Xr getpagesize 3 ,
+.Xr memory 3
+.Pa /usr/share/doc/papers/malloc.ascii.gz
+.Sh STANDARDS
+The
+.Fn malloc
+function conforms to
+.St -ansiC .
+.Sh HISTORY
+The present implementation of malloc started out as a filesystem on a drum
+attached to a 20bit binary challenged computer built with discrete germanium
+transistors, and it has since graduated to handle primary storage rather than
+secondary.
+.Pp
+The main difference from other malloc implementations are believed to be that
+the free pages are not accessed until allocated.
+Most malloc implementations will store a data structure containing a, 
+possibly double-, linked list in the free chunks of memory, used to tie
+all the free memory together.
+That is a quite suboptimal thing to do.
+Every time the free-list is traversed, all the otherwise unused, and very
+likely paged out, pages get faulted into primary memory, just to see what
+lies after them in the list.
+.Pp
+On systems which are paging, this can make a factor five in difference on the
+page-faults of a process.
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
new file mode 100644
index 0000000000..e75c7cdb09
--- /dev/null
+++ b/src/lib/libc/stdlib/malloc.c
@@ -0,0 +1,1263 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+ * ----------------------------------------------------------------------------
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.35 1999/02/03 03:58:05 d Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Defining MALLOC_EXTRA_SANITY will enable extra checks which are
+ * related to internal conditions and consistency in malloc.c. This has
+ * a noticeable runtime performance hit, and generally will not do you
+ * any good unless you fiddle with the internals of malloc or want
+ * to catch random pointer corruption as early as possible.
+ */
+#ifndef MALLOC_EXTRA_SANITY
+#undef MALLOC_EXTRA_SANITY
+#endif
+
+/*
+ * Defining MALLOC_STATS will enable you to call malloc_dump() and set
+ * the [dD] options in the MALLOC_OPTIONS environment variable.
+ * It has no run-time performance hit, but does pull in stdio...
+ */
+#ifndef MALLOC_STATS
+#undef MALLOC_STATS
+#endif
+
+/*
+ * What to use for Junk.  This is the byte value we use to fill with
+ * when the 'J' option is enabled.
+ */
+#define SOME_JUNK       0xd0            /* as in "Duh" :-) */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/mman.h>
+
+/*
+ * The basic parameters you can tweak.
+ *
+ * malloc_pageshift     pagesize = 1 << malloc_pageshift
+ *                      It's probably best if this is the native
+ *                      page size, but it shouldn't have to be.
+ *
+ * malloc_minsize       minimum size of an allocation in bytes.
+ *                      If this is too small it's too much work
+ *                      to manage them.  This is also the smallest
+ *                      unit of alignment used for the storage
+ *                      returned by malloc/realloc.
+ *
+ */
+
+#if defined(__i386__) && defined(__FreeBSD__)
+#   define malloc_pageshift             12U
+#   define malloc_minsize               16U
+#endif /* __i386__ && __FreeBSD__ */
+
+#if defined(__sparc__) && !defined(__OpenBSD__)
+#   define malloc_pageshirt             12U
+#   define malloc_minsize               16U
+#   define MAP_ANON                     (0)
+#   define USE_DEV_ZERO
+#   define MADV_FREE                    MADV_DONTNEED
+#endif /* __sparc__ */
+
+/* Insert your combination here... */
+#if defined(__FOOCPU__) && defined(__BAROS__)
+#   define malloc_pageshift             12U
+#   define malloc_minsize               16U
+#endif /* __FOOCPU__ && __BAROS__ */
+
+#if defined(__OpenBSD__) && !defined(__sparc__)
+#   define      malloc_pageshift        (PGSHIFT)
+#   define      malloc_minsize          16U
+#endif /* __OpenBSD__ */
+
+#ifdef _THREAD_SAFE
+# include "thread_private.h"
+# if 0
+   /* kernel threads */
+#  include <pthread.h>
+   static pthread_mutex_t malloc_lock;
+#  define THREAD_LOCK()         pthread_mutex_lock(&malloc_lock)
+#  define THREAD_UNLOCK()       pthread_mutex_unlock(&malloc_lock)
+#  define THREAD_LOCK_INIT()    pthread_mutex_init(&malloc_lock, 0);
+# else
+   /* user threads */
+#  include "spinlock.h"
+   static spinlock_t malloc_lock = _SPINLOCK_INITIALIZER;
+#  define THREAD_LOCK()         if (__isthreaded) _SPINLOCK(&malloc_lock)
+#  define THREAD_UNLOCK()       if (__isthreaded) _SPINUNLOCK(&malloc_lock)
+#  define THREAD_LOCK_INIT()    
+   /*
+    * Malloc can't use the wrapped write() if it fails very early, so
+    * we use the unwrapped syscall _thread_sys_write()
+    */
+#  define write _thread_sys_write
+   ssize_t write __P((int, const void *, size_t));
+#   undef malloc
+#   undef realloc
+#   undef free
+# endif
+#else
+  /* no threads */
+# define THREAD_LOCK()
+# define THREAD_UNLOCK()
+# define THREAD_LOCK_INIT()
+#endif
+
+/*
+ * No user serviceable parts behind this point.
+ *
+ * This structure describes a page worth of chunks.
+ */
+
+struct pginfo {
+    struct pginfo       *next;  /* next on the free list */
+    void                *page;  /* Pointer to the page */
+    u_short             size;   /* size of this page's chunks */
+    u_short             shift;  /* How far to shift for this size chunks */
+    u_short             free;   /* How many free chunks */
+    u_short             total;  /* How many chunk */
+    u_long              bits[1]; /* Which chunks are free */
+};
+
+/*
+ * This structure describes a number of free pages.
+ */
+
+struct pgfree {
+    struct pgfree       *next;  /* next run of free pages */
+    struct pgfree       *prev;  /* prev run of free pages */
+    void                *page;  /* pointer to free pages */
+    void                *end;   /* pointer to end of free pages */
+    u_long              size;   /* number of bytes free */
+};
+
+/*
+ * How many bits per u_long in the bitmap.
+ * Change only if not 8 bits/byte
+ */
+#define MALLOC_BITS     (8*sizeof(u_long))
+
+/*
+ * Magic values to put in the page_directory
+ */
+#define MALLOC_NOT_MINE ((struct pginfo*) 0)
+#define MALLOC_FREE     ((struct pginfo*) 1)
+#define MALLOC_FIRST    ((struct pginfo*) 2)
+#define MALLOC_FOLLOW   ((struct pginfo*) 3)
+#define MALLOC_MAGIC    ((struct pginfo*) 4)
+
+#ifndef malloc_pageshift
+#define malloc_pageshift                12U
+#endif
+
+#ifndef malloc_minsize
+#define malloc_minsize                  16U
+#endif
+
+#ifndef malloc_pageshift
+#error  "malloc_pageshift undefined"
+#endif
+
+#if !defined(malloc_pagesize)
+#define malloc_pagesize                 (1UL<<malloc_pageshift)
+#endif
+
+#if ((1UL<<malloc_pageshift) != malloc_pagesize)
+#error  "(1UL<<malloc_pageshift) != malloc_pagesize"
+#endif
+
+#ifndef malloc_maxsize
+#define malloc_maxsize                  ((malloc_pagesize)>>1)
+#endif
+
+/* A mask for the offset inside a page.  */
+#define malloc_pagemask ((malloc_pagesize)-1)
+
+#define pageround(foo) (((foo) + (malloc_pagemask))&(~(malloc_pagemask)))
+#define ptr2index(foo) (((u_long)(foo) >> malloc_pageshift)-malloc_origo)
+
+/* fd of /dev/zero */
+#ifdef USE_DEV_ZERO
+static int fdzero;
+#define MMAP_FD fdzero
+#define INIT_MMAP() \
+        { if ((fdzero=open("/dev/zero", O_RDWR, 0000)) == -1) \
+            wrterror("open of /dev/zero"); }
+#else
+#define MMAP_FD (-1)
+#define INIT_MMAP()
+#endif
+
+/* Set when initialization has been done */
+static unsigned malloc_started; 
+
+/* Number of free pages we cache */
+static unsigned malloc_cache = 16;
+
+/* The offset from pagenumber to index into the page directory */
+static u_long malloc_origo;
+
+/* The last index in the page directory we care about */
+static u_long last_index;
+
+/* Pointer to page directory. Allocated "as if with" malloc */
+static struct   pginfo **page_dir;
+
+/* How many slots in the page directory */
+static size_t   malloc_ninfo;
+
+/* Free pages line up here */
+static struct pgfree free_list;
+
+/* Abort(), user doesn't handle problems.  */
+static int malloc_abort;
+
+/* Are we trying to die ?  */
+static int suicide;
+
+#ifdef MALLOC_STATS
+/* dump statistics */
+static int malloc_stats;
+#endif
+
+/* avoid outputting warnings?  */
+static int malloc_silent;
+
+/* always realloc ?  */
+static int malloc_realloc;
+
+#ifdef __FreeBSD__
+/* pass the kernel a hint on free pages ?  */
+static int malloc_hint;
+#endif
+
+/* xmalloc behaviour ?  */
+static int malloc_xmalloc;
+
+/* zero fill ?  */
+static int malloc_zero;
+
+/* junk fill ?  */
+static int malloc_junk;
+
+#ifdef __FreeBSD__
+/* utrace ?  */
+static int malloc_utrace;
+
+struct ut { void *p; size_t s; void *r; };
+
+void utrace __P((struct ut *, int));
+
+#define UTRACE(a, b, c) \
+        if (malloc_utrace) \
+                {struct ut u; u.p=a; u.s = b; u.r=c; utrace(&u, sizeof u);}
+#else /* !__FreeBSD__ */
+#define UTRACE(a,b,c)
+#endif
+
+/* my last break. */
+static void *malloc_brk;
+
+/* one location cache for free-list holders */
+static struct pgfree *px;
+
+/* compile-time options */
+char *malloc_options;
+
+/* Name of the current public function */
+static char *malloc_func;
+
+/* Macro for mmap */
+#define MMAP(size) \
+        mmap((void *)0, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, \
+            MMAP_FD, (off_t)0);
+
+/*
+ * Necessary function declarations
+ */
+static int extend_pgdir(u_long index);
+static void *imalloc(size_t size);
+static void ifree(void *ptr);
+static void *irealloc(void *ptr, size_t size);
+static void *malloc_bytes(size_t size);
+
+#ifdef MALLOC_STATS
+void
+malloc_dump(fd)
+    FILE *fd;
+{
+    struct pginfo **pd;
+    struct pgfree *pf;
+    int j;
+
+    pd = page_dir;
+
+    /* print out all the pages */
+    for(j=0;j<=last_index;j++) {
+        fprintf(fd, "%08lx %5d ", (j+malloc_origo) << malloc_pageshift, j);
+        if (pd[j] == MALLOC_NOT_MINE) {
+            for(j++;j<=last_index && pd[j] == MALLOC_NOT_MINE;j++)
+                ;
+            j--;
+            fprintf(fd, ".. %5d not mine\n",    j);
+        } else if (pd[j] == MALLOC_FREE) {
+            for(j++;j<=last_index && pd[j] == MALLOC_FREE;j++)
+                ;
+            j--;
+            fprintf(fd, ".. %5d free\n", j);
+        } else if (pd[j] == MALLOC_FIRST) {
+            for(j++;j<=last_index && pd[j] == MALLOC_FOLLOW;j++)
+                ;
+            j--;
+            fprintf(fd, ".. %5d in use\n", j);
+        } else if (pd[j] < MALLOC_MAGIC) {
+            fprintf(fd, "(%p)\n", pd[j]);
+        } else {
+            fprintf(fd, "%p %d (of %d) x %d @ %p --> %p\n",
+                pd[j], pd[j]->free, pd[j]->total,
+                pd[j]->size, pd[j]->page, pd[j]->next);
+        }
+    }
+
+    for(pf=free_list.next; pf; pf=pf->next) {
+        fprintf(fd, "Free: @%p [%p...%p[ %ld ->%p <-%p\n",
+                pf, pf->page, pf->end, pf->size, pf->prev, pf->next);
+        if (pf == pf->next) {
+                fprintf(fd, "Free_list loops.\n");
+                break;
+        }
+    }
+
+    /* print out various info */
+    fprintf(fd, "Minsize\t%d\n", malloc_minsize);
+    fprintf(fd, "Maxsize\t%d\n", malloc_maxsize);
+    fprintf(fd, "Pagesize\t%lu\n", (u_long)malloc_pagesize);
+    fprintf(fd, "Pageshift\t%d\n", malloc_pageshift);
+    fprintf(fd, "FirstPage\t%ld\n", malloc_origo);
+    fprintf(fd, "LastPage\t%ld %lx\n", last_index+malloc_pageshift,
+        (last_index + malloc_pageshift) << malloc_pageshift);
+    fprintf(fd, "Break\t%ld\n", (u_long)sbrk(0) >> malloc_pageshift);
+}
+#endif /* MALLOC_STATS */
+
+extern char *__progname;
+
+static void
+wrterror(p)
+    char *p;
+{
+    char *q = " error: ";
+    write(2, __progname, strlen(__progname));
+    write(2, malloc_func, strlen(malloc_func));
+    write(2, q, strlen(q));
+    write(2, p, strlen(p));
+    suicide = 1;
+#ifdef MALLOC_STATS
+    if (malloc_stats)
+        malloc_dump(stderr);
+#endif /* MALLOC_STATS */
+    abort();
+}
+
+static void
+wrtwarning(p)
+    char *p;
+{
+    char *q = " warning: ";
+    if (malloc_abort)
+        wrterror(p);
+    else if (malloc_silent)
+        return;
+    write(2, __progname, strlen(__progname));
+    write(2, malloc_func, strlen(malloc_func));
+    write(2, q, strlen(q));
+    write(2, p, strlen(p));
+}
+
+#ifdef MALLOC_STATS
+static void
+malloc_exit()
+{
+    FILE *fd = fopen("malloc.out", "a");
+    char *q = "malloc() warning: Couldn't dump stats.\n";
+    if (fd) {
+        malloc_dump(fd);
+        fclose(fd);
+    } else
+        write(2, q, strlen(q));
+}
+#endif /* MALLOC_STATS */
+
+
+/*
+ * Allocate a number of pages from the OS
+ */
+static void *
+map_pages(pages)
+    int pages;
+{
+    caddr_t result, tail;
+
+    result = (caddr_t)pageround((u_long)sbrk(0));
+    tail = result + (pages << malloc_pageshift);
+
+    if (brk(tail)) {
+#ifdef MALLOC_EXTRA_SANITY
+        wrterror("(ES): map_pages fails\n");
+#endif /* MALLOC_EXTRA_SANITY */
+        return 0;
+    }
+
+    last_index = ptr2index(tail) - 1;
+    malloc_brk = tail;
+
+    if ((last_index+1) >= malloc_ninfo && !extend_pgdir(last_index))
+        return 0;
+
+    return result;
+}
+
+/*
+ * Extend page directory
+ */
+static int
+extend_pgdir(index)
+    u_long index;
+{
+    struct  pginfo **new, **old;
+    size_t i, oldlen;
+
+    /* Make it this many pages */
+    i = index * sizeof *page_dir;
+    i /= malloc_pagesize;
+    i += 2;
+
+    /* remember the old mapping size */
+    oldlen = malloc_ninfo * sizeof *page_dir;
+
+    /*
+     * NOTE: we allocate new pages and copy the directory rather than tempt
+     * fate by trying to "grow" the region.. There is nothing to prevent
+     * us from accidently re-mapping space that's been allocated by our caller
+     * via dlopen() or other mmap().
+     *
+     * The copy problem is not too bad, as there is 4K of page index per
+     * 4MB of malloc arena.
+     *
+     * We can totally avoid the copy if we open a file descriptor to associate
+     * the anon mappings with.  Then, when we remap the pages at the new
+     * address, the old pages will be "magically" remapped..  But this means
+     * keeping open a "secret" file descriptor.....
+     */
+
+    /* Get new pages */
+    new = (struct pginfo**) MMAP(i * malloc_pagesize);
+    if (new == (struct pginfo **)-1)
+        return 0;
+
+    /* Copy the old stuff */
+    memcpy(new, page_dir,
+            malloc_ninfo * sizeof *page_dir);
+
+    /* register the new size */
+    malloc_ninfo = i * malloc_pagesize / sizeof *page_dir;
+
+    /* swap the pointers */
+    old = page_dir;
+    page_dir = new;
+
+    /* Now free the old stuff */
+    munmap(old, oldlen);
+    return 1;
+}
+
+/*
+ * Initialize the world
+ */
+static void
+malloc_init ()
+{
+    char *p, b[64];
+    int i, j;
+    int save_errno = errno;
+
+    THREAD_LOCK_INIT();
+
+    INIT_MMAP();
+
+#ifdef MALLOC_EXTRA_SANITY
+    malloc_junk = 1;
+#endif /* MALLOC_EXTRA_SANITY */
+
+    for (i = 0; i < 3; i++) {
+        if (i == 0) {
+            j = readlink("/etc/malloc.conf", b, sizeof b - 1);
+            if (j <= 0)
+                continue;
+            b[j] = '\0';
+            p = b;
+        } else if (i == 1) {
+            if (issetugid() == 0)
+                p = getenv("MALLOC_OPTIONS");
+            else
+                continue;
+        } else if (i == 2) {
+            p = malloc_options;
+        }
+        for (; p && *p; p++) {
+            switch (*p) {
+                case '>': malloc_cache   <<= 1; break;
+                case '<': malloc_cache   >>= 1; break;
+                case 'a': malloc_abort   = 0; break;
+                case 'A': malloc_abort   = 1; break;
+#ifdef MALLOC_STATS
+                case 'd': malloc_stats   = 0; break;
+                case 'D': malloc_stats   = 1; break;
+#endif /* MALLOC_STATS */
+#ifdef __FreeBSD__
+                case 'h': malloc_hint    = 0; break;
+                case 'H': malloc_hint    = 1; break;
+#endif /* __FreeBSD__ */
+                case 'r': malloc_realloc = 0; break;
+                case 'R': malloc_realloc = 1; break;
+                case 'j': malloc_junk    = 0; break;
+                case 'J': malloc_junk    = 1; break;
+                case 'n': malloc_silent  = 0; break;
+                case 'N': malloc_silent  = 1; break;
+#ifdef __FreeBSD__
+                case 'u': malloc_utrace  = 0; break;
+                case 'U': malloc_utrace  = 1; break;
+#endif /* __FreeBSD__ */
+                case 'x': malloc_xmalloc = 0; break;
+                case 'X': malloc_xmalloc = 1; break;
+                case 'z': malloc_zero    = 0; break;
+                case 'Z': malloc_zero    = 1; break;
+                default:
+                    j = malloc_abort;
+                    malloc_abort = 0;
+                    wrtwarning("unknown char in MALLOC_OPTIONS\n");
+                    malloc_abort = j;
+                    break;
+            }
+        }
+    }
+
+    UTRACE(0, 0, 0);
+
+    /*
+     * We want junk in the entire allocation, and zero only in the part
+     * the user asked for.
+     */
+    if (malloc_zero)
+        malloc_junk=1;
+
+#ifdef MALLOC_STATS
+    if (malloc_stats)
+        atexit(malloc_exit);
+#endif /* MALLOC_STATS */
+
+    /* Allocate one page for the page directory */
+    page_dir = (struct pginfo **) MMAP(malloc_pagesize);
+
+    if (page_dir == (struct pginfo **) -1)
+        wrterror("mmap(2) failed, check limits.\n");
+
+    /*
+     * We need a maximum of malloc_pageshift buckets, steal these from the
+     * front of the page_directory;
+     */
+    malloc_origo = ((u_long)pageround((u_long)sbrk(0))) >> malloc_pageshift;
+    malloc_origo -= malloc_pageshift;
+
+    malloc_ninfo = malloc_pagesize / sizeof *page_dir;
+
+    /* Been here, done that */
+    malloc_started++;
+
+    /* Recalculate the cache size in bytes, and make sure it's nonzero */
+
+    if (!malloc_cache)
+        malloc_cache++;
+
+    malloc_cache <<= malloc_pageshift;
+
+    /*
+     * This is a nice hack from Kaleb Keithly (kaleb@x.org).
+     * We can sbrk(2) further back when we keep this on a low address.
+     */
+    px = (struct pgfree *) imalloc (sizeof *px);
+    errno = save_errno;
+}
+
+/*
+ * Allocate a number of complete pages
+ */
+static void *
+malloc_pages(size)
+    size_t size;
+{
+    void *p, *delay_free = 0;
+    int i;
+    struct pgfree *pf;
+    u_long index;
+
+    size = pageround(size);
+
+    p = 0;
+    /* Look for free pages before asking for more */
+    for(pf = free_list.next; pf; pf = pf->next) {
+
+#ifdef MALLOC_EXTRA_SANITY
+        if (pf->size & malloc_pagemask)
+            wrterror("(ES): junk length entry on free_list\n");
+        if (!pf->size)
+            wrterror("(ES): zero length entry on free_list\n");
+        if (pf->page == pf->end)
+            wrterror("(ES): zero entry on free_list\n");
+        if (pf->page > pf->end) 
+            wrterror("(ES): sick entry on free_list\n");
+        if ((void*)pf->page >= (void*)sbrk(0))
+            wrterror("(ES): entry on free_list past brk\n");
+        if (page_dir[ptr2index(pf->page)] != MALLOC_FREE) 
+            wrterror("(ES): non-free first page on free-list\n");
+        if (page_dir[ptr2index(pf->end)-1] != MALLOC_FREE)
+            wrterror("(ES): non-free last page on free-list\n");
+#endif /* MALLOC_EXTRA_SANITY */
+
+        if (pf->size < size)
+            continue;
+
+        if (pf->size == size) {
+            p = pf->page;
+            if (pf->next)
+                    pf->next->prev = pf->prev;
+            pf->prev->next = pf->next;
+            delay_free = pf;
+            break;
+        } 
+
+        p = pf->page;
+        pf->page = (char *)pf->page + size;
+        pf->size -= size;
+        break;
+    }
+
+#ifdef MALLOC_EXTRA_SANITY
+    if (p && page_dir[ptr2index(p)] != MALLOC_FREE)
+        wrterror("(ES): allocated non-free page on free-list\n");
+#endif /* MALLOC_EXTRA_SANITY */
+
+    size >>= malloc_pageshift;
+
+    /* Map new pages */
+    if (!p)
+        p = map_pages(size);
+
+    if (p) {
+
+        index = ptr2index(p);
+        page_dir[index] = MALLOC_FIRST;
+        for (i=1;i<size;i++)
+            page_dir[index+i] = MALLOC_FOLLOW;
+
+        if (malloc_junk)
+            memset(p, SOME_JUNK, size << malloc_pageshift);
+    }
+
+    if (delay_free) {
+        if (!px)
+            px = delay_free;
+        else
+            ifree(delay_free);
+    }
+
+    return p;
+}
+
+/*
+ * Allocate a page of fragments
+ */
+
+static __inline__ int
+malloc_make_chunks(bits)
+    int bits;
+{
+    struct  pginfo *bp;
+    void *pp;
+    int i, k, l;
+
+    /* Allocate a new bucket */
+    pp = malloc_pages((size_t)malloc_pagesize);
+    if (!pp)
+        return 0;
+
+    /* Find length of admin structure */
+    l = sizeof *bp - sizeof(u_long);
+    l += sizeof(u_long) *
+        (((malloc_pagesize >> bits)+MALLOC_BITS-1) / MALLOC_BITS);
+
+    /* Don't waste more than two chunks on this */
+    if ((1UL<<(bits)) <= l+l) {
+        bp = (struct  pginfo *)pp;
+    } else {
+        bp = (struct  pginfo *)imalloc(l);
+        if (!bp) {
+            ifree(pp);
+            return 0;
+        }
+    }
+
+    bp->size = (1UL<<bits);
+    bp->shift = bits;
+    bp->total = bp->free = malloc_pagesize >> bits;
+    bp->page = pp;
+
+    /* set all valid bits in the bitmap */
+    k = bp->total;
+    i = 0;
+
+    /* Do a bunch at a time */
+    for(;k-i >= MALLOC_BITS; i += MALLOC_BITS)
+        bp->bits[i / MALLOC_BITS] = ~0UL;
+
+    for(; i < k; i++)
+        bp->bits[i/MALLOC_BITS] |= 1UL<<(i%MALLOC_BITS);
+
+    if (bp == bp->page) {
+        /* Mark the ones we stole for ourselves */
+        for(i=0;l > 0;i++) {
+            bp->bits[i/MALLOC_BITS] &= ~(1UL<<(i%MALLOC_BITS));
+            bp->free--;
+            bp->total--;
+            l -= (1 << bits);
+        }
+    }
+
+    /* MALLOC_LOCK */
+
+    page_dir[ptr2index(pp)] = bp;
+
+    bp->next = page_dir[bits];
+    page_dir[bits] = bp;
+
+    /* MALLOC_UNLOCK */
+
+    return 1;
+}
+
+/*
+ * Allocate a fragment
+ */
+static void *
+malloc_bytes(size)
+    size_t size;
+{
+    int i,j;
+    u_long u;
+    struct  pginfo *bp;
+    int k;
+    u_long *lp;
+
+    /* Don't bother with anything less than this */
+    if (size < malloc_minsize)
+        size = malloc_minsize;
+
+    /* Find the right bucket */
+    j = 1;
+    i = size-1;
+    while (i >>= 1)
+        j++;
+
+    /* If it's empty, make a page more of that size chunks */
+    if (!page_dir[j] && !malloc_make_chunks(j))
+        return 0;
+
+    bp = page_dir[j];
+
+    /* Find first word of bitmap which isn't empty */
+    for (lp = bp->bits; !*lp; lp++)
+        ;
+
+    /* Find that bit, and tweak it */
+    u = 1;
+    k = 0;
+    while (!(*lp & u)) {
+        u += u;
+        k++;
+    }
+    *lp ^= u;
+
+    /* If there are no more free, remove from free-list */
+    if (!--bp->free) {
+        page_dir[j] = bp->next;
+        bp->next = 0;
+    }
+
+    /* Adjust to the real offset of that chunk */
+    k += (lp-bp->bits)*MALLOC_BITS;
+    k <<= bp->shift;
+
+    if (malloc_junk)
+        memset((char *)bp->page + k, SOME_JUNK, bp->size);
+
+    return (u_char *)bp->page + k;
+}
+
+/*
+ * Allocate a piece of memory
+ */
+static void *
+imalloc(size)
+    size_t size;
+{
+    void *result;
+
+    if (!malloc_started)
+        malloc_init();
+
+    if (suicide)
+        abort();
+
+    if ((size + malloc_pagesize) < size)       /* Check for overflow */
+        result = 0;
+    else if (size <= malloc_maxsize)
+        result =  malloc_bytes(size);
+    else
+        result =  malloc_pages(size);
+
+    if (malloc_abort && !result)
+        wrterror("allocation failed.\n");
+
+    if (malloc_zero && result)
+        memset(result, 0, size);
+
+    return result;
+}
+
+/*
+ * Change the size of an allocation.
+ */
+static void *
+irealloc(ptr, size)
+    void *ptr;
+    size_t size;
+{
+    void *p;
+    u_long osize, index;
+    struct pginfo **mp;
+    int i;
+
+    if (suicide)
+        abort();
+
+    if (!malloc_started) {
+        wrtwarning("malloc() has never been called.\n");
+        return 0;
+    }
+
+    index = ptr2index(ptr);
+
+    if (index < malloc_pageshift) {
+        wrtwarning("junk pointer, too low to make sense.\n");
+        return 0;
+    }
+
+    if (index > last_index) {
+        wrtwarning("junk pointer, too high to make sense.\n");
+        return 0;
+    }
+
+    mp = &page_dir[index];
+
+    if (*mp == MALLOC_FIRST) {                  /* Page allocation */
+
+        /* Check the pointer */
+        if ((u_long)ptr & malloc_pagemask) {
+            wrtwarning("modified (page-) pointer.\n");
+            return 0;
+        }
+
+        /* Find the size in bytes */
+        for (osize = malloc_pagesize; *++mp == MALLOC_FOLLOW;)
+            osize += malloc_pagesize;
+
+        if (!malloc_realloc &&                  /* unless we have to, */
+          size <= osize &&                      /* .. or are too small, */
+          size > (osize - malloc_pagesize)) {   /* .. or can free a page, */
+            return ptr;                         /* don't do anything. */
+        }
+
+    } else if (*mp >= MALLOC_MAGIC) {           /* Chunk allocation */
+
+        /* Check the pointer for sane values */
+        if (((u_long)ptr & ((*mp)->size-1))) {
+            wrtwarning("modified (chunk-) pointer.\n");
+            return 0;
+        }
+
+        /* Find the chunk index in the page */
+        i = ((u_long)ptr & malloc_pagemask) >> (*mp)->shift;
+
+        /* Verify that it isn't a free chunk already */
+        if ((*mp)->bits[i/MALLOC_BITS] & (1UL<<(i%MALLOC_BITS))) {
+            wrtwarning("chunk is already free.\n");
+            return 0;
+        }
+
+        osize = (*mp)->size;
+
+        if (!malloc_realloc &&          /* Unless we have to, */
+          size < osize &&               /* ..or are too small, */
+          (size > osize/2 ||            /* ..or could use a smaller size, */
+          osize == malloc_minsize)) {   /* ..(if there is one) */
+            return ptr;                 /* ..Don't do anything */
+        }
+
+    } else {
+        wrtwarning("pointer to wrong page.\n");
+        return 0;
+    }
+
+    p = imalloc(size);
+
+    if (p) {
+        /* copy the lesser of the two sizes, and free the old one */
+        if (osize < size)
+            memcpy(p, ptr, osize);
+        else
+            memcpy(p, ptr, size);
+        ifree(ptr);
+    } 
+    return p;
+}
+
+/*
+ * Free a sequence of pages
+ */
+
+static __inline__ void
+free_pages(ptr, index, info)
+    void *ptr;
+    int index;
+    struct pginfo *info;
+{
+    int i;
+    struct pgfree *pf, *pt=0;
+    u_long l;
+    void *tail;
+
+    if (info == MALLOC_FREE) {
+        wrtwarning("page is already free.\n");
+        return;
+    }
+
+    if (info != MALLOC_FIRST) {
+        wrtwarning("pointer to wrong page.\n");
+        return;
+    }
+
+    if ((u_long)ptr & malloc_pagemask) {
+        wrtwarning("modified (page-) pointer.\n");
+        return;
+    }
+
+    /* Count how many pages and mark them free at the same time */
+    page_dir[index] = MALLOC_FREE;
+    for (i = 1; page_dir[index+i] == MALLOC_FOLLOW; i++)
+        page_dir[index + i] = MALLOC_FREE;
+
+    l = i << malloc_pageshift;
+
+    if (malloc_junk)
+        memset(ptr, SOME_JUNK, l);
+
+#ifdef __FreeBSD__
+    if (malloc_hint)
+        madvise(ptr, l, MADV_FREE);
+#endif
+
+    tail = (char *)ptr+l;
+
+    /* add to free-list */
+    if (!px)
+        px = imalloc(sizeof *px);       /* This cannot fail... */
+    px->page = ptr;
+    px->end =  tail;
+    px->size = l;
+    if (!free_list.next) {
+
+        /* Nothing on free list, put this at head */
+        px->next = free_list.next;
+        px->prev = &free_list;
+        free_list.next = px;
+        pf = px;
+        px = 0;
+
+    } else {
+
+        /* Find the right spot, leave pf pointing to the modified entry. */
+        tail = (char *)ptr+l;
+
+        for(pf = free_list.next; pf->end < ptr && pf->next; pf = pf->next)
+            ; /* Race ahead here */
+
+        if (pf->page > tail) {
+            /* Insert before entry */
+            px->next = pf;
+            px->prev = pf->prev;
+            pf->prev = px;
+            px->prev->next = px;
+            pf = px;
+            px = 0;
+        } else if (pf->end == ptr ) {
+            /* Append to the previous entry */
+            pf->end = (char *)pf->end + l;
+            pf->size += l;
+            if (pf->next && pf->end == pf->next->page ) {
+                /* And collapse the next too. */
+                pt = pf->next;
+                pf->end = pt->end;
+                pf->size += pt->size;
+                pf->next = pt->next;
+                if (pf->next)
+                    pf->next->prev = pf;
+            }
+        } else if (pf->page == tail) {
+            /* Prepend to entry */
+            pf->size += l;
+            pf->page = ptr;
+        } else if (!pf->next) {
+            /* Append at tail of chain */
+            px->next = 0;
+            px->prev = pf;
+            pf->next = px;
+            pf = px;
+            px = 0;
+        } else {
+            wrterror("freelist is destroyed.\n");
+        }
+    }
+    
+    /* Return something to OS ? */
+    if (!pf->next &&                            /* If we're the last one, */
+      pf->size > malloc_cache &&                /* ..and the cache is full, */
+      pf->end == malloc_brk &&                  /* ..and none behind us, */
+      malloc_brk == sbrk(0)) {                  /* ..and it's OK to do... */
+
+        /*
+         * Keep the cache intact.  Notice that the '>' above guarantees that
+         * the pf will always have at least one page afterwards.
+         */
+        pf->end = (char *)pf->page + malloc_cache;
+        pf->size = malloc_cache;
+
+        brk(pf->end);
+        malloc_brk = pf->end;
+
+        index = ptr2index(pf->end);
+        last_index = index - 1;
+
+        for(i=index;i <= last_index;)
+            page_dir[i++] = MALLOC_NOT_MINE;
+
+        /* XXX: We could realloc/shrink the pagedir here I guess. */
+    }
+    if (pt)
+        ifree(pt);
+}
+
+/*
+ * Free a chunk, and possibly the page it's on, if the page becomes empty.
+ */
+
+/* ARGSUSED */
+static __inline__ void
+free_bytes(ptr, index, info)
+    void *ptr;
+    int index;
+    struct pginfo *info;
+{
+    int i;
+    struct pginfo **mp;
+    void *vp;
+
+    /* Find the chunk number on the page */
+    i = ((u_long)ptr & malloc_pagemask) >> info->shift;
+
+    if (((u_long)ptr & (info->size-1))) {
+        wrtwarning("modified (chunk-) pointer.\n");
+        return;
+    }
+
+    if (info->bits[i/MALLOC_BITS] & (1UL<<(i%MALLOC_BITS))) {
+        wrtwarning("chunk is already free.\n");
+        return;
+    }
+
+    if (malloc_junk)
+        memset(ptr, SOME_JUNK, info->size);
+
+    info->bits[i/MALLOC_BITS] |= 1UL<<(i%MALLOC_BITS);
+    info->free++;
+
+    mp = page_dir + info->shift;
+
+    if (info->free == 1) {
+
+        /* Page became non-full */
+
+        mp = page_dir + info->shift;
+        /* Insert in address order */
+        while (*mp && (*mp)->next && (*mp)->next->page < info->page)
+            mp = &(*mp)->next;
+        info->next = *mp;
+        *mp = info;
+        return;
+    }
+
+    if (info->free != info->total)
+        return;
+
+    /* Find & remove this page in the queue */
+    while (*mp != info) {
+        mp = &((*mp)->next);
+#ifdef MALLOC_EXTRA_SANITY
+        if (!*mp)
+                wrterror("(ES): Not on queue\n");
+#endif /* MALLOC_EXTRA_SANITY */
+    }
+    *mp = info->next;
+
+    /* Free the page & the info structure if need be */
+    page_dir[ptr2index(info->page)] = MALLOC_FIRST;
+    vp = info->page;            /* Order is important ! */
+    if(vp != (void*)info) 
+        ifree(info);
+    ifree(vp);
+}
+
+static void
+ifree(ptr)
+    void *ptr;
+{
+    struct pginfo *info;
+    int index;
+
+    /* This is legal */
+    if (!ptr)
+        return;
+
+    if (!malloc_started) {
+        wrtwarning("malloc() has never been called.\n");
+        return;
+    }
+
+    /* If we're already sinking, don't make matters any worse. */
+    if (suicide)
+        return;
+
+    index = ptr2index(ptr);
+
+    if (index < malloc_pageshift) {
+        wrtwarning("junk pointer, too low to make sense.\n");
+        return;
+    }
+
+    if (index > last_index) {
+        wrtwarning("junk pointer, too high to make sense.\n");
+        return;
+    }
+
+    info = page_dir[index];
+
+    if (info < MALLOC_MAGIC)
+        free_pages(ptr, index, info);
+    else
+        free_bytes(ptr, index, info);
+    return;
+}
+
+/*
+ * These are the public exported interface routines.
+ */
+
+static int malloc_active;
+
+void *
+malloc(size_t size)
+{
+    register void *r;
+
+    malloc_func = " in malloc():";
+    THREAD_LOCK();
+    if (malloc_active++) {
+        wrtwarning("recursive call.\n");
+        malloc_active--;
+        return (0);
+    }
+    r = imalloc(size);
+    UTRACE(0, size, r);
+    malloc_active--;
+    THREAD_UNLOCK();
+    if (malloc_xmalloc && !r)
+        wrterror("out of memory.\n");
+    return (r);
+}
+
+void
+free(void *ptr)
+{
+    malloc_func = " in free():";
+    THREAD_LOCK();
+    if (malloc_active++) {
+        wrtwarning("recursive call.\n");
+        malloc_active--;
+        return;
+    }
+    ifree(ptr);
+    UTRACE(ptr, 0, 0);
+    malloc_active--;
+    THREAD_UNLOCK();
+    return;
+}
+
+void *
+realloc(void *ptr, size_t size)
+{
+    register void *r;
+
+    malloc_func = " in realloc():";
+    THREAD_LOCK();
+    if (malloc_active++) {
+        wrtwarning("recursive call.\n");
+        malloc_active--;
+        return (0);
+    }
+    if (!ptr) {
+        r = imalloc(size);
+    } else {
+        r = irealloc(ptr, size);
+    }
+    UTRACE(ptr, size, r);
+    malloc_active--;
+    THREAD_UNLOCK();
+    if (malloc_xmalloc && !r)
+        wrterror("out of memory.\n");
+    return (r);
+}
diff --git a/src/lib/libc/stdlib/memory.3 b/src/lib/libc/stdlib/memory.3
new file mode 100644
index 0000000000..712c7c45d2
--- /dev/null
+++ b/src/lib/libc/stdlib/memory.3
@@ -0,0 +1,70 @@
+.\" Copyright (c) 1991 Regents of the University of California.
+.\" 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: memory.3,v 1.2 1996/08/19 08:33:37 tholo Exp $
+.\"
+.Dd May 2, 1991
+.Dt MEMORY 3
+.Os BSD 4
+.Sh NAME
+.Nm malloc ,
+.Nm free ,
+.Nm realloc ,
+.Nm calloc ,
+.Nm alloca
+.Nd general memory allocation operations
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void *
+.Fn malloc "size_t size"
+.Ft void
+.Fn free "void *ptr"
+.Ft void *
+.Fn realloc "void *ptr" "size_t size"
+.Ft void *
+.Fn calloc "size_t nelem" "size_t elsize"
+.Ft void *
+.Fn alloca "size_t size"
+.Sh DESCRIPTION
+These functions allocate and free memory for the calling process.
+They are described in the
+individual manual pages.
+.Sh SEE ALSO
+.Xr calloc 3 ,
+.Xr free 3 ,
+.Xr malloc 3 ,
+.Xr realloc 3 ,
+.Xr alloca 3 ,
+.Sh STANDARDS
+These functions, with the exception of
+.Fn alloca
+conform to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c
new file mode 100644
index 0000000000..0a1015ad9d
--- /dev/null
+++ b/src/lib/libc/stdlib/merge.c
@@ -0,0 +1,347 @@
+/*-
+ * Copyright (c) 1992, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Peter McIlroy.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Hybrid exponential search/linear search merge sort with hybrid
+ * natural/pairwise first pass.  Requires about .3% more comparisons
+ * for random data than LSMS with pairwise first pass alone.
+ * It works for objects as small as two bytes.
+ */
+
+#define NATURAL
+#define THRESHOLD 16    /* Best choice for natural merge cut-off. */
+
+/* #define NATURAL to get hybrid natural merge.
+ * (The default is pairwise merging.)
+ */
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
+static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+
+#define ISIZE sizeof(int)
+#define PSIZE sizeof(u_char *)
+#define ICOPY_LIST(src, dst, last)                              \
+        do                                                      \
+        *(int*)dst = *(int*)src, src += ISIZE, dst += ISIZE;    \
+        while(src < last)
+#define ICOPY_ELT(src, dst, i)                                  \
+        do                                                      \
+        *(int*) dst = *(int*) src, src += ISIZE, dst += ISIZE;  \
+        while (i -= ISIZE)
+
+#define CCOPY_LIST(src, dst, last)              \
+        do                                      \
+                *dst++ = *src++;                \
+        while (src < last)
+#define CCOPY_ELT(src, dst, i)                  \
+        do                                      \
+                *dst++ = *src++;                \
+        while (i -= 1)
+                
+/*
+ * Find the next possible pointer head.  (Trickery for forcing an array
+ * to do double duty as a linked list when objects do not align with word
+ * boundaries.
+ */
+/* Assumption: PSIZE is a power of 2. */
+#define EVAL(p) (u_char **)                                             \
+        ((u_char *)0 +                                                  \
+            (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1)))
+
+/*
+ * Arguments are as for qsort.
+ */
+int
+mergesort(base, nmemb, size, cmp)
+        void *base;
+        size_t nmemb;
+        register size_t size;
+        int (*cmp) __P((const void *, const void *));
+{
+        register int i, sense;
+        int big, iflag;
+        register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
+        u_char *list2, *list1, *p2, *p, *last, **p1;
+
+        if (size < PSIZE / 2) {         /* Pointers must fit into 2 * size. */
+                errno = EINVAL;
+                return (-1);
+        }
+
+        /*
+         * XXX
+         * Stupid subtraction for the Cray.
+         */
+        iflag = 0;
+        if (!(size % ISIZE) && !(((char *)base - (char *)0) % ISIZE))
+                iflag = 1;
+
+        if ((list2 = malloc(nmemb * size + PSIZE)) == NULL)
+                return (-1);
+
+        list1 = base;
+        setup(list1, list2, nmemb, size, cmp);
+        last = list2 + nmemb * size;
+        i = big = 0;
+        while (*EVAL(list2) != last) {
+            l2 = list1;
+            p1 = EVAL(list1);
+            for (tp2 = p2 = list2; p2 != last; p1 = EVAL(l2)) {
+                p2 = *EVAL(p2);
+                f1 = l2;
+                f2 = l1 = list1 + (p2 - list2);
+                if (p2 != last)
+                        p2 = *EVAL(p2);
+                l2 = list1 + (p2 - list2);
+                while (f1 < l1 && f2 < l2) {
+                        if ((*cmp)(f1, f2) <= 0) {
+                                q = f2;
+                                b = f1, t = l1;
+                                sense = -1;
+                        } else {
+                                q = f1;
+                                b = f2, t = l2;
+                                sense = 0;
+                        }
+                        if (!big) {     /* here i = 0 */
+                                while ((b += size) < t && cmp(q, b) >sense)
+                                        if (++i == 6) {
+                                                big = 1;
+                                                goto EXPONENTIAL;
+                                        }
+                        } else {
+EXPONENTIAL:                    for (i = size; ; i <<= 1)
+                                        if ((p = (b + i)) >= t) {
+                                                if ((p = t - size) > b &&
+                                                    (*cmp)(q, p) <= sense)
+                                                        t = p;
+                                                else
+                                                        b = p;
+                                                break;
+                                        } else if ((*cmp)(q, p) <= sense) {
+                                                t = p;
+                                                if (i == size)
+                                                        big = 0; 
+                                                goto FASTCASE;
+                                        } else
+                                                b = p;
+                                while (t > b+size) {
+                                        i = (((t - b) / size) >> 1) * size;
+                                        if ((*cmp)(q, p = b + i) <= sense)
+                                                t = p;
+                                        else
+                                                b = p;
+                                }
+                                goto COPY;
+FASTCASE:                       while (i > size)
+                                        if ((*cmp)(q,
+                                                p = b + (i >>= 1)) <= sense)
+                                                t = p;
+                                        else
+                                                b = p;
+COPY:                           b = t;
+                        }
+                        i = size;
+                        if (q == f1) {
+                                if (iflag) {
+                                        ICOPY_LIST(f2, tp2, b);
+                                        ICOPY_ELT(f1, tp2, i);
+                                } else {
+                                        CCOPY_LIST(f2, tp2, b);
+                                        CCOPY_ELT(f1, tp2, i);
+                                }
+                        } else {
+                                if (iflag) {
+                                        ICOPY_LIST(f1, tp2, b);
+                                        ICOPY_ELT(f2, tp2, i);
+                                } else {
+                                        CCOPY_LIST(f1, tp2, b);
+                                        CCOPY_ELT(f2, tp2, i);
+                                }
+                        }
+                }
+                if (f2 < l2) {
+                        if (iflag)
+                                ICOPY_LIST(f2, tp2, l2);
+                        else
+                                CCOPY_LIST(f2, tp2, l2);
+                } else if (f1 < l1) {
+                        if (iflag)
+                                ICOPY_LIST(f1, tp2, l1);
+                        else
+                                CCOPY_LIST(f1, tp2, l1);
+                }
+                *p1 = l2;
+            }
+            tp2 = list1;        /* swap list1, list2 */
+            list1 = list2;
+            list2 = tp2;
+            last = list2 + nmemb*size;
+        }
+        if (base == list2) {
+                memmove(list2, list1, nmemb*size);
+                list2 = list1;
+        }
+        free(list2);
+        return (0);
+}
+
+#define swap(a, b) {                                    \
+                s = b;                                  \
+                i = size;                               \
+                do {                                    \
+                        tmp = *a; *a++ = *s; *s++ = tmp; \
+                } while (--i);                          \
+                a -= size;                              \
+        }
+#define reverse(bot, top) {                             \
+        s = top;                                        \
+        do {                                            \
+                i = size;                               \
+                do {                                    \
+                        tmp = *bot; *bot++ = *s; *s++ = tmp; \
+                } while (--i);                          \
+                s -= size2;                             \
+        } while(bot < s);                               \
+}
+
+/*
+ * Optional hybrid natural/pairwise first pass.  Eats up list1 in runs of
+ * increasing order, list2 in a corresponding linked list.  Checks for runs
+ * when THRESHOLD/2 pairs compare with same sense.  (Only used when NATURAL
+ * is defined.  Otherwise simple pairwise merging is used.)
+ */
+void
+setup(list1, list2, n, size, cmp)
+        size_t n, size;
+        int (*cmp) __P((const void *, const void *));
+        u_char *list1, *list2;
+{
+        int i, length, size2, tmp, sense;
+        u_char *f1, *f2, *s, *l2, *last, *p2;
+
+        size2 = size*2;
+        if (n <= 5) {
+                insertionsort(list1, n, size, cmp);
+                *EVAL(list2) = (u_char*) list2 + n*size;
+                return;
+        }
+        /*
+         * Avoid running pointers out of bounds; limit n to evens
+         * for simplicity.
+         */
+        i = 4 + (n & 1);
+        insertionsort(list1 + (n - i) * size, i, size, cmp);
+        last = list1 + size * (n - i);
+        *EVAL(list2 + (last - list1)) = list2 + n * size;
+
+#ifdef NATURAL
+        p2 = list2;
+        f1 = list1;
+        sense = (cmp(f1, f1 + size) > 0);
+        for (; f1 < last; sense = !sense) {
+                length = 2;
+                                        /* Find pairs with same sense. */
+                for (f2 = f1 + size2; f2 < last; f2 += size2) {
+                        if ((cmp(f2, f2+ size) > 0) != sense)
+                                break;
+                        length += 2;
+                }
+                if (length < THRESHOLD) {               /* Pairwise merge */
+                        do {
+                                p2 = *EVAL(p2) = f1 + size2 - list1 + list2;
+                                if (sense > 0)
+                                        swap (f1, f1 + size);
+                        } while ((f1 += size2) < f2);
+                } else {                                /* Natural merge */
+                        l2 = f2;
+                        for (f2 = f1 + size2; f2 < l2; f2 += size2) {
+                                if ((cmp(f2-size, f2) > 0) != sense) {
+                                        p2 = *EVAL(p2) = f2 - list1 + list2;
+                                        if (sense > 0)
+                                                reverse(f1, f2-size);
+                                        f1 = f2;
+                                }
+                        }
+                        if (sense > 0)
+                                reverse (f1, f2-size);
+                        f1 = f2;
+                        if (f2 < last || cmp(f2 - size, f2) > 0)
+                                p2 = *EVAL(p2) = f2 - list1 + list2;
+                        else
+                                p2 = *EVAL(p2) = list2 + n*size;
+                }
+        }
+#else           /* pairwise merge only. */
+        for (f1 = list1, p2 = list2; f1 < last; f1 += size2) {
+                p2 = *EVAL(p2) = p2 + size2;
+                if (cmp (f1, f1 + size) > 0)
+                        swap(f1, f1 + size);
+        }
+#endif /* NATURAL */
+}
+
+/*
+ * This is to avoid out-of-bounds addresses in sorting the
+ * last 4 elements.
+ */
+static void
+insertionsort(a, n, size, cmp)
+        u_char *a;
+        size_t n, size;
+        int (*cmp) __P((const void *, const void *));
+{
+        u_char *ai, *s, *t, *u, tmp;
+        int i;
+
+        for (ai = a+size; --n >= 1; ai += size)
+                for (t = ai; t > a; t -= size) {
+                        u = t - size;
+                        if (cmp(u, t) <= 0)
+                                break;
+                        swap(u, t);
+                }
+}
diff --git a/src/lib/libc/stdlib/mrand48.c b/src/lib/libc/stdlib/mrand48.c
new file mode 100644
index 0000000000..cd34260b5c
--- /dev/null
+++ b/src/lib/libc/stdlib/mrand48.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: mrand48.c,v 1.2 1996/08/19 08:33:39 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+extern unsigned short __rand48_seed[3];
+
+long
+mrand48(void)
+{
+        __dorand48(__rand48_seed);
+        return ((long) __rand48_seed[2] << 16) + (long) __rand48_seed[1];
+}
diff --git a/src/lib/libc/stdlib/multibyte.c b/src/lib/libc/stdlib/multibyte.c
new file mode 100644
index 0000000000..12e70c4a2c
--- /dev/null
+++ b/src/lib/libc/stdlib/multibyte.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 1991 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: multibyte.c,v 1.2 1996/08/19 08:33:39 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+/*
+ * Stub multibyte character functions.
+ * This cheezy implementation is fixed to the native single-byte
+ * character set.
+ */
+
+int
+mblen(s, n)
+        const char *s;
+        size_t n;
+{
+        if (s == NULL || *s == '\0')
+                return 0;
+        if (n == 0)
+                return -1;
+        return 1;
+}
+
+/*ARGSUSED*/
+int
+mbtowc(pwc, s, n)
+        wchar_t *pwc;
+        const char *s;
+        size_t n;
+{
+        if (s == NULL)
+                return 0;
+        if (n == 0)
+                return -1;
+        if (pwc)
+                *pwc = (wchar_t) *s;
+        return (*s != '\0');
+}
+
+/*ARGSUSED*/
+int
+#ifdef __STDC__
+wctomb(char *s, wchar_t wchar)
+#else
+wctomb(s, wchar)
+        char *s;
+        wchar_t wchar;
+#endif
+{
+        if (s == NULL)
+                return 0;
+
+        *s = (char) wchar;
+        return 1;
+}
+
+/*ARGSUSED*/
+size_t
+mbstowcs(pwcs, s, n)
+        wchar_t *pwcs;
+        const char *s;
+        size_t n;
+{
+        int count = 0;
+
+        if (n != 0) {
+                do {
+                        if ((*pwcs++ = (wchar_t) *s++) == 0)
+                                break;
+                        count++;
+                } while (--n != 0);
+        }
+        
+        return count;
+}
+
+/*ARGSUSED*/
+size_t
+wcstombs(s, pwcs, n)
+        char *s;
+        const wchar_t *pwcs;
+        size_t n;
+{
+        int count = 0;
+
+        if (n != 0) {
+                do {
+                        if ((*s++ = (char) *pwcs++) == 0)
+                                break;
+                        count++;
+                } while (--n != 0);
+        }
+
+        return count;
+}
+
diff --git a/src/lib/libc/stdlib/nrand48.c b/src/lib/libc/stdlib/nrand48.c
new file mode 100644
index 0000000000..b1ec2cebb1
--- /dev/null
+++ b/src/lib/libc/stdlib/nrand48.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: nrand48.c,v 1.2 1996/08/19 08:33:40 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+long
+nrand48(unsigned short xseed[3])
+{
+        __dorand48(xseed);
+        return ((long) xseed[2] << 15) + ((long) xseed[1] >> 1);
+}
diff --git a/src/lib/libc/stdlib/putenv.c b/src/lib/libc/stdlib/putenv.c
new file mode 100644
index 0000000000..d8c4886d4b
--- /dev/null
+++ b/src/lib/libc/stdlib/putenv.c
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: putenv.c,v 1.2 1996/08/10 05:03:00 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include <string.h>
+
+int
+putenv(str)
+        const char *str;
+{
+        char *p, *equal;
+        int rval;
+
+        if ((p = strdup(str)) == NULL)
+                return (-1);
+        if ((equal = strchr(p, '=')) == NULL) {
+                (void)free(p);
+                return (-1);
+        }
+        *equal = '\0';
+        rval = setenv(p, equal + 1, 1);
+        (void)free(p);
+        return (rval);
+}
diff --git a/src/lib/libc/stdlib/qabs.3 b/src/lib/libc/stdlib/qabs.3
new file mode 100644
index 0000000000..92a8bdc4b9
--- /dev/null
+++ b/src/lib/libc/stdlib/qabs.3
@@ -0,0 +1,61 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: qabs.3,v 1.2 1996/08/19 08:33:40 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt QABS 3
+.Os
+.Sh NAME
+.Nm qabs
+.Nd return the absolute value of a quad integer
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft quad_t
+.Fn qabs "quad_t j"
+.Sh DESCRIPTION
+The
+.Fn qabs
+function
+returns the absolute value of the quad integer
+.Ar j .
+.Sh SEE ALSO
+.Xr abs 3 ,
+.Xr labs 3 ,
+.Xr floor 3 ,
+.Xr cabs 3 ,
+.Xr math 3
+.Sh BUGS
+The absolute value of the most negative integer remains negative.
diff --git a/src/lib/libc/stdlib/qabs.c b/src/lib/libc/stdlib/qabs.c
new file mode 100644
index 0000000000..ccc42cbec6
--- /dev/null
+++ b/src/lib/libc/stdlib/qabs.c
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: qabs.c,v 1.2 1996/08/19 08:33:40 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+
+quad_t
+qabs(j)
+        quad_t j;
+{
+        return(j < 0 ? -j : j);
+}
diff --git a/src/lib/libc/stdlib/qdiv.3 b/src/lib/libc/stdlib/qdiv.3
new file mode 100644
index 0000000000..12aca0b1ea
--- /dev/null
+++ b/src/lib/libc/stdlib/qdiv.3
@@ -0,0 +1,65 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: qdiv.3,v 1.2 1996/08/19 08:33:41 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt QDIV 3
+.Os
+.Sh NAME
+.Nm qdiv
+.Nd return quotient and remainder from division
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft qdiv_t
+.Fn qdiv "quad_t num" "quad_t denom"
+.Sh DESCRIPTION
+The
+.Fn qdiv
+function
+computes the value
+.Ar num/denom
+and returns the quotient and remainder in a structure named
+.Ar qdiv_t
+that contains two
+.Em quad integer
+members named
+.Ar quot
+and
+.Ar rem .
+.Sh SEE ALSO
+.Xr div 3 ,
+.Xr ldiv 3 ,
+.Xr math 3
diff --git a/src/lib/libc/stdlib/qdiv.c b/src/lib/libc/stdlib/qdiv.c
new file mode 100644
index 0000000000..07e84cd649
--- /dev/null
+++ b/src/lib/libc/stdlib/qdiv.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: qdiv.c,v 1.2 1996/08/19 08:33:41 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>             /* qdiv_t */
+
+qdiv_t
+qdiv(num, denom)
+        quad_t num, denom;
+{
+        qdiv_t r;
+
+        /* see div.c for comments */
+
+        r.quot = num / denom;
+        r.rem = num % denom;
+        if (num >= 0 && r.rem < 0) {
+                r.quot++;
+                r.rem -= denom;
+        }
+        return (r);
+}
diff --git a/src/lib/libc/stdlib/qsort.3 b/src/lib/libc/stdlib/qsort.3
new file mode 100644
index 0000000000..0a71824450
--- /dev/null
+++ b/src/lib/libc/stdlib/qsort.3
@@ -0,0 +1,233 @@
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: qsort.3,v 1.3 1999/02/27 21:56:00 deraadt Exp $
+.\"
+.Dd June 4, 1993
+.Dt QSORT 3
+.Os
+.Sh NAME
+.Nm qsort, heapsort, mergesort
+.Nd sort functions
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void
+.Fn qsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
+.Ft int
+.Fn heapsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
+.Ft int
+.Fn mergesort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
+.Sh DESCRIPTION
+The
+.Fn qsort
+function is a modified partition-exchange sort, or quicksort.
+The
+.Fn heapsort
+function is a modified selection sort.
+The
+.Fn mergesort
+function is a modified merge sort with exponential search
+intended for sorting data with pre-existing order.
+.Pp
+The
+.Fn qsort
+and
+.Fn heapsort
+functions sort an array of
+.Fa nmemb
+objects, the initial member of which is pointed to by
+.Fa base .
+The size of each object is specified by
+.Fa size .
+.Fn mergesort
+behaves similarly, but
+.Em requires
+that
+.Fa size
+be greater than
+.Dq "sizeof(void *) / 2" .
+.Pp
+The contents of the array
+.Fa base
+are sorted in ascending order according to
+a comparison function pointed to by
+.Fa compar ,
+which requires two arguments pointing to the objects being
+compared.
+.Pp
+The comparison function must return an integer less than, equal to, or
+greater than zero if the first argument is considered to be respectively
+less than, equal to, or greater than the second.
+.Pp
+The functions
+.Fn qsort
+and
+.Fn heapsort
+are
+.Em not
+stable, that is, if two members compare as equal, their order in
+the sorted array is undefined.
+The function
+.Fn mergesort
+is stable.
+.Pp
+The
+.Fn qsort
+function is an implementation of C.A.R. Hoare's ``quicksort'' algorithm,
+a variant of partition-exchange sorting; in particular, see D.E. Knuth's
+Algorithm Q.
+.Fn qsort
+takes O N lg N average time.
+This implementation uses median selection to avoid its
+O N**2 worst-case behavior.
+.Pp
+The
+.Fn heapsort
+function is an implementation of J.W.J. William's ``heapsort'' algorithm,
+a variant of selection sorting; in particular, see D.E. Knuth's Algorithm H.
+.Fn heapsort
+takes O N lg N worst-case time.
+Its
+.Em only
+advantage over
+.Fn qsort
+is that it uses almost no additional memory; while
+.Fn qsort
+does not allocate memory, it is implemented using recursion.
+.Pp
+The function
+.Fn mergesort
+requires additional memory of size
+.Fa nmemb *
+.Fa size 
+bytes; it should be used only when space is not at a premium.
+.Fn mergesort
+is optimized for data with pre-existing order; its worst case
+time is O N lg N; its best case is O N.
+.Pp
+Normally,
+.Fn qsort
+is faster than
+.Fn mergesort
+is faster than
+.Fn heapsort .
+Memory availability and pre-existing order in the data can make this
+untrue.
+.Sh RETURN VALUES
+The
+.Fn qsort
+function
+returns no value.
+.Pp
+Upon successful completion,
+.Fn heapsort
+and
+.Fn mergesort
+return 0.
+Otherwise, they return \-1 and the global variable
+.Va errno
+is set to indicate the error.
+.Sh ERRORS
+The
+.Fn heapsort
+function succeeds unless:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The
+.Fa size
+argument is zero, or,
+the
+.Fa size
+argument to
+.Fn mergesort
+is less than
+.Dq "sizeof(void *) / 2" .
+.It Bq Er ENOMEM
+.Fn heapsort
+or
+.Fn mergesort
+were unable to allocate memory.
+.El
+.Sh COMPATIBILITY
+Previous versions of
+.Fn qsort
+did not permit the comparison routine itself to call
+.Fn qsort 3 .
+This is no longer true.
+.Sh SEE ALSO
+.Xr sort 1 ,
+.Xr radixsort 3
+.Rs
+.%A Hoare, C.A.R.
+.%D 1962
+.%T "Quicksort"
+.%J "The Computer Journal"
+.%V 5:1
+.%P pp. 10-15
+.Re
+.Rs
+.%A Williams, J.W.J
+.%D 1964
+.%T "Heapsort"
+.%J "Communications of the ACM"
+.%V 7:1
+.%P pp. 347-348
+.Re
+.Rs
+.%A Knuth, D.E.
+.%D 1968
+.%B "The Art of Computer Programming"
+.%V Vol. 3
+.%T "Sorting and Searching"
+.%P pp. 114-123, 145-149
+.Re
+.Rs
+.%A Mcilroy, P.M.
+.%T "Optimistic Sorting and Information Theoretic Complexity"
+.%J "Fourth Annual ACM-SIAM Symposium on Discrete Algorithms"
+.%V January 1992
+.Re
+.Rs
+.%A Bentley, J.L.
+.%T "Engineering a Sort Function"
+.%J "bentley@research.att.com"
+.%V January 1992
+.Re
+.Sh STANDARDS
+The
+.Fn qsort
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/qsort.c b/src/lib/libc/stdlib/qsort.c
new file mode 100644
index 0000000000..1c3020b595
--- /dev/null
+++ b/src/lib/libc/stdlib/qsort.c
@@ -0,0 +1,175 @@
+/*-
+ * Copyright (c) 1992, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: qsort.c,v 1.5 1997/06/20 11:19:38 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <stdlib.h>
+
+static __inline char    *med3 __P((char *, char *, char *, int (*)()));
+static __inline void     swapfunc __P((char *, char *, int, int));
+
+#define min(a, b)       (a) < (b) ? a : b
+
+/*
+ * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
+ */
+#define swapcode(TYPE, parmi, parmj, n) {               \
+        long i = (n) / sizeof (TYPE);                   \
+        register TYPE *pi = (TYPE *) (parmi);           \
+        register TYPE *pj = (TYPE *) (parmj);           \
+        do {                                            \
+                register TYPE   t = *pi;                \
+                *pi++ = *pj;                            \
+                *pj++ = t;                              \
+        } while (--i > 0);                              \
+}
+
+#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
+        es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
+
+static __inline void
+swapfunc(a, b, n, swaptype)
+        char *a, *b;
+        int n, swaptype;
+{
+        if (swaptype <= 1) 
+                swapcode(long, a, b, n)
+        else
+                swapcode(char, a, b, n)
+}
+
+#define swap(a, b)                                      \
+        if (swaptype == 0) {                            \
+                long t = *(long *)(a);                  \
+                *(long *)(a) = *(long *)(b);            \
+                *(long *)(b) = t;                       \
+        } else                                          \
+                swapfunc(a, b, es, swaptype)
+
+#define vecswap(a, b, n)        if ((n) > 0) swapfunc(a, b, n, swaptype)
+
+static __inline char *
+med3(a, b, c, cmp)
+        char *a, *b, *c;
+        int (*cmp)();
+{
+        return cmp(a, b) < 0 ?
+               (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
+              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
+}
+
+void
+qsort(aa, n, es, cmp)
+        void *aa;
+        size_t n, es;
+        int (*cmp)();
+{
+        char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
+        int d, r, swaptype, swap_cnt;
+        register char *a = aa;
+
+loop:   SWAPINIT(a, es);
+        swap_cnt = 0;
+        if (n < 7) {
+                for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
+                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
+                             pl -= es)
+                                swap(pl, pl - es);
+                return;
+        }
+        pm = (char *)a + (n / 2) * es;
+        if (n > 7) {
+                pl = (char *)a;
+                pn = (char *)a + (n - 1) * es;
+                if (n > 40) {
+                        d = (n / 8) * es;
+                        pl = med3(pl, pl + d, pl + 2 * d, cmp);
+                        pm = med3(pm - d, pm, pm + d, cmp);
+                        pn = med3(pn - 2 * d, pn - d, pn, cmp);
+                }
+                pm = med3(pl, pm, pn, cmp);
+        }
+        swap(a, pm);
+        pa = pb = (char *)a + es;
+
+        pc = pd = (char *)a + (n - 1) * es;
+        for (;;) {
+                while (pb <= pc && (r = cmp(pb, a)) <= 0) {
+                        if (r == 0) {
+                                swap_cnt = 1;
+                                swap(pa, pb);
+                                pa += es;
+                        }
+                        pb += es;
+                }
+                while (pb <= pc && (r = cmp(pc, a)) >= 0) {
+                        if (r == 0) {
+                                swap_cnt = 1;
+                                swap(pc, pd);
+                                pd -= es;
+                        }
+                        pc -= es;
+                }
+                if (pb > pc)
+                        break;
+                swap(pb, pc);
+                swap_cnt = 1;
+                pb += es;
+                pc -= es;
+        }
+        if (swap_cnt == 0) {  /* Switch to insertion sort */
+                for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
+                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0; 
+                             pl -= es)
+                                swap(pl, pl - es);
+                return;
+        }
+
+        pn = (char *)a + n * es;
+        r = min(pa - (char *)a, pb - pa);
+        vecswap(a, pb - r, r);
+        r = min(pd - pc, pn - pd - es);
+        vecswap(pb, pn - r, r);
+        if ((r = pb - pa) > es)
+                qsort(a, r / es, es, cmp);
+        if ((r = pd - pc) > es) { 
+                /* Iterate rather than recurse to save stack space */
+                a = pn - r;
+                n = r / es;
+                goto loop;
+        }
+/*              qsort(pn - r, r / es, es, cmp);*/
+}
diff --git a/src/lib/libc/stdlib/radixsort.3 b/src/lib/libc/stdlib/radixsort.3
new file mode 100644
index 0000000000..8b0ea89a0f
--- /dev/null
+++ b/src/lib/libc/stdlib/radixsort.3
@@ -0,0 +1,161 @@
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: radixsort.3,v 1.4 1998/06/15 17:55:08 mickey Exp $
+.\"
+.Dd January 27, 1994
+.Dt RADIXSORT 3
+.Os
+.Sh NAME
+.Nm radixsort
+.Nd radix sort
+.Sh SYNOPSIS
+.Fd #include <limits.h>
+.Fd #include <stdlib.h>
+.Ft int
+.Fn radixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
+.Ft int
+.Fn sradixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
+.Sh DESCRIPTION
+The
+.Fn radixsort
+and
+.Fn sradixsort
+functions
+are implementations of radix sort.
+.Pp
+These functions sort an array of pointers to byte strings, the initial
+member of which is referenced by
+.Fa base .
+The byte strings may contain any values; the end of each string
+is denoted by the user-specified value
+.Fa endbyte .
+.Pp
+Applications may specify a sort order by providing the
+.Fa table
+argument.
+If
+.Pf non- Dv NULL , 
+.Fa table
+must reference an array of
+.Dv UCHAR_MAX
++ 1 bytes which contains the sort
+weight of each possible byte value.
+The end-of-string byte must have a sort weight of 0 or 255
+(for sorting in reverse order).
+More than one byte may have the same sort weight.
+The
+.Fa table
+argument
+is useful for applications which wish to sort different characters
+equally, for example, providing a table with the same weights
+for A-Z as for a-z will result in a case-insensitive sort.
+If
+.Fa table
+is NULL, the contents of the array are sorted in ascending order
+according to the
+.Tn ASCII
+order of the byte strings they reference and
+.Fa endbyte
+has a sorting weight of 0.
+.Pp
+The
+.Fn sradixsort
+function is stable, that is, if two elements compare as equal, their
+order in the sorted array is unchanged.
+The
+.Fn sradixsort
+function uses additional memory sufficient to hold
+.Fa nmemb
+pointers.
+.Pp
+The
+.Fn radixsort
+function is not stable, but uses no additional memory.
+.Pp
+These functions are variants of most-significant-byte radix sorting; in
+particular, see D.E. Knuth's Algorithm R and section 5.2.5, exercise 10.
+They take linear time relative to the number of bytes in the strings.
+.Sh RETURN VALUES
+Upon successful completion 0 is returned.
+Otherwise, \-1 is returned and the global variable 
+.Va errno
+is set to indicate the error.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value of the
+.Fa endbyte
+element of
+.Fa table
+is not 0 or 255.
+.El
+.Pp
+Additionally, the
+.Fn sradixsort
+function
+may fail and set
+.Va errno
+for any of the errors specified for the library routine
+.Xr malloc 3 .
+.Sh SEE ALSO
+.Xr sort 1 ,
+.Xr qsort 3
+.Pp
+.Rs
+.%A Knuth, D.E.
+.%D 1968
+.%B "The Art of Computer Programming"
+.%T "Sorting and Searching"
+.%V Vol. 3
+.%P pp. 170-178
+.Re
+.Rs
+.%A Paige, R.
+.%D 1987
+.%T "Three Partition Refinement Algorithms"
+.%J "SIAM J. Comput."
+.%V Vol. 16
+.%N No. 6
+.Re
+.Rs
+.%A McIlroy, P.
+.%D 1993
+.%B "Engineering Radix Sort"
+.%T "Computing Systems"
+.%V Vol. 6:1
+.%P pp. 5-27
+.Re
+.Sh HISTORY
+The
+.Fn radixsort
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/radixsort.c b/src/lib/libc/stdlib/radixsort.c
new file mode 100644
index 0000000000..41ed962466
--- /dev/null
+++ b/src/lib/libc/stdlib/radixsort.c
@@ -0,0 +1,317 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Peter McIlroy and by Dan Bernstein at New York University, 
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: radixsort.c,v 1.3 1996/08/19 08:33:44 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Radixsort routines.
+ * 
+ * Program r_sort_a() is unstable but uses O(logN) extra memory for a stack.
+ * Use radixsort(a, n, trace, endchar) for this case.
+ * 
+ * For stable sorting (using N extra pointers) use sradixsort(), which calls
+ * r_sort_b().
+ * 
+ * For a description of this code, see D. McIlroy, P. McIlroy, K. Bostic,
+ * "Engineering Radix Sort".
+ */
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <errno.h>
+
+typedef struct {
+        const u_char **sa;
+        int sn, si;
+} stack;
+
+static __inline void simplesort
+            __P((const u_char **, int, int, const u_char *, u_int));
+static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
+static void r_sort_b __P((const u_char **,
+            const u_char **, int, int, const u_char *, u_int));
+
+#define THRESHOLD       20              /* Divert to simplesort(). */
+#define SIZE            512             /* Default stack size. */
+
+#define SETUP {                                                         \
+        if (tab == NULL) {                                              \
+                tr = tr0;                                               \
+                for (c = 0; c < endch; c++)                             \
+                        tr0[c] = c + 1;                                 \
+                tr0[c] = 0;                                             \
+                for (c++; c < 256; c++)                                 \
+                        tr0[c] = c;                                     \
+                endch = 0;                                              \
+        } else {                                                        \
+                endch = tab[endch];                                     \
+                tr = tab;                                               \
+                if (endch != 0 && endch != 255) {                       \
+                        errno = EINVAL;                                 \
+                        return (-1);                                    \
+                }                                                       \
+        }                                                               \
+}
+
+int
+radixsort(a, n, tab, endch)
+        const u_char **a, *tab;
+        int n;
+        u_int endch;
+{
+        const u_char *tr;
+        int c;
+        u_char tr0[256];
+
+        SETUP;
+        r_sort_a(a, n, 0, tr, endch);
+        return (0);
+}
+
+int
+sradixsort(a, n, tab, endch)
+        const u_char **a, *tab;
+        int n;
+        u_int endch;
+{
+        const u_char *tr, **ta;
+        int c;
+        u_char tr0[256];
+
+        SETUP;
+        if (n < THRESHOLD)
+                simplesort(a, n, 0, tr, endch);
+        else {
+                if ((ta = malloc(n * sizeof(a))) == NULL)
+                        return (-1);
+                r_sort_b(a, ta, n, 0, tr, endch);
+                free(ta);
+        }
+        return (0);
+}
+
+#define empty(s)        (s >= sp)
+#define pop(a, n, i)    a = (--sp)->sa, n = sp->sn, i = sp->si
+#define push(a, n, i)   sp->sa = a, sp->sn = n, (sp++)->si = i
+#define swap(a, b, t)   t = a, a = b, b = t
+
+/* Unstable, in-place sort. */
+void
+r_sort_a(a, n, i, tr, endch)
+        const u_char **a;
+        int n, i;
+        const u_char *tr;
+        u_int endch;
+{
+        static int count[256], nc, bmin;
+        register int c;
+        register const u_char **ak, *r;
+        stack s[SIZE], *sp, *sp0, *sp1, temp;
+        int *cp, bigc;
+        const u_char **an, *t, **aj, **top[256];
+
+        /* Set up stack. */
+        sp = s;
+        push(a, n, i);
+        while (!empty(s)) {
+                pop(a, n, i);
+                if (n < THRESHOLD) {
+                        simplesort(a, n, i, tr, endch);
+                        continue;
+                }
+                an = a + n;
+
+                /* Make character histogram. */
+                if (nc == 0) {
+                        bmin = 255;     /* First occupied bin, excluding eos. */
+                        for (ak = a; ak < an;) {
+                                c = tr[(*ak++)[i]];
+                                if (++count[c] == 1 && c != endch) {
+                                        if (c < bmin)
+                                                bmin = c;
+                                        nc++;
+                                }
+                        }
+                        if (sp + nc > s + SIZE) {       /* Get more stack. */
+                                r_sort_a(a, n, i, tr, endch);
+                                continue;
+                        }
+                }
+
+                /*
+                 * Set top[]; push incompletely sorted bins onto stack.
+                 * top[] = pointers to last out-of-place element in bins.
+                 * count[] = counts of elements in bins.
+                 * Before permuting: top[c-1] + count[c] = top[c];
+                 * during deal: top[c] counts down to top[c-1].
+                 */
+                sp0 = sp1 = sp;         /* Stack position of biggest bin. */
+                bigc = 2;               /* Size of biggest bin. */
+                if (endch == 0)         /* Special case: set top[eos]. */
+                        top[0] = ak = a + count[0];
+                else {
+                        ak = a;
+                        top[255] = an;
+                }
+                for (cp = count + bmin; nc > 0; cp++) {
+                        while (*cp == 0)        /* Find next non-empty pile. */
+                                cp++;
+                        if (*cp > 1) {
+                                if (*cp > bigc) {
+                                        bigc = *cp;
+                                        sp1 = sp;
+                                }
+                                push(ak, *cp, i+1);
+                        }
+                        top[cp-count] = ak += *cp;
+                        nc--;
+                }
+                swap(*sp0, *sp1, temp); /* Play it safe -- biggest bin last. */
+
+                /*
+                 * Permute misplacements home.  Already home: everything
+                 * before aj, and in bin[c], items from top[c] on.
+                 * Inner loop:
+                 *      r = next element to put in place;
+                 *      ak = top[r[i]] = location to put the next element.
+                 *      aj = bottom of 1st disordered bin.
+                 * Outer loop:
+                 *      Once the 1st disordered bin is done, ie. aj >= ak,
+                 *      aj<-aj + count[c] connects the bins in a linked list;
+                 *      reset count[c].
+                 */
+                for (aj = a; aj < an;  *aj = r, aj += count[c], count[c] = 0)
+                        for (r = *aj;  aj < (ak = --top[c = tr[r[i]]]);)
+                                swap(*ak, r, t);
+        }
+}
+
+/* Stable sort, requiring additional memory. */
+void
+r_sort_b(a, ta, n, i, tr, endch)
+        const u_char **a, **ta;
+        int n, i;
+        const u_char *tr;
+        u_int endch;
+{
+        static int count[256], nc, bmin;
+        register int c;
+        register const u_char **ak, **ai;
+        stack s[512], *sp, *sp0, *sp1, temp;
+        const u_char **top[256];
+        int *cp, bigc;
+
+        sp = s;
+        push(a, n, i);
+        while (!empty(s)) {
+                pop(a, n, i);
+                if (n < THRESHOLD) {
+                        simplesort(a, n, i, tr, endch);
+                        continue;
+                }
+
+                if (nc == 0) {
+                        bmin = 255;
+                        for (ak = a + n; --ak >= a;) {
+                                c = tr[(*ak)[i]];
+                                if (++count[c] == 1 && c != endch) {
+                                        if (c < bmin)
+                                                bmin = c;
+                                        nc++;
+                                }
+                        }
+                        if (sp + nc > s + SIZE) {
+                                r_sort_b(a, ta, n, i, tr, endch);
+                                continue;
+                        }
+                }
+
+                sp0 = sp1 = sp;
+                bigc = 2;
+                if (endch == 0) {
+                        top[0] = ak = a + count[0];
+                        count[0] = 0;
+                } else {
+                        ak = a;
+                        top[255] = a + n;
+                        count[255] = 0;
+                }
+                for (cp = count + bmin; nc > 0; cp++) {
+                        while (*cp == 0)
+                                cp++;
+                        if ((c = *cp) > 1) {
+                                if (c > bigc) {
+                                        bigc = c;
+                                        sp1 = sp;
+                                }
+                                push(ak, c, i+1);
+                        }
+                        top[cp-count] = ak += c;
+                        *cp = 0;                        /* Reset count[]. */
+                        nc--;
+                }
+                swap(*sp0, *sp1, temp);
+
+                for (ak = ta + n, ai = a+n; ak > ta;)   /* Copy to temp. */
+                        *--ak = *--ai;
+                for (ak = ta+n; --ak >= ta;)            /* Deal to piles. */
+                        *--top[tr[(*ak)[i]]] = *ak;
+        }
+}
+                
+static __inline void
+simplesort(a, n, b, tr, endch)  /* insertion sort */
+        register const u_char **a;
+        int n, b;
+        register const u_char *tr;
+        u_int endch;
+{
+        register u_char ch;
+        const u_char  **ak, **ai, *s, *t;
+
+        for (ak = a+1; --n >= 1; ak++)
+                for (ai = ak; ai > a; ai--) {
+                        for (s = ai[0] + b, t = ai[-1] + b;
+                            (ch = tr[*s]) != endch; s++, t++)
+                                if (ch != tr[*t])
+                                        break;
+                        if (ch >= tr[*t])
+                                break;
+                        swap(ai[0], ai[-1], s);
+                }
+}
diff --git a/src/lib/libc/stdlib/rand.3 b/src/lib/libc/stdlib/rand.3
new file mode 100644
index 0000000000..28496ec12a
--- /dev/null
+++ b/src/lib/libc/stdlib/rand.3
@@ -0,0 +1,104 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: rand.3,v 1.5 1998/11/20 11:18:50 d Exp $
+.\"
+.Dd June 29, 1991
+.Dt RAND 3
+.Os
+.Sh NAME
+.Nm rand ,
+.Nm srand
+.Nd bad random number generator
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft void
+.Fn srand "unsigned seed"
+.Ft int
+.Fn rand void
+.Ft int
+.Fn rand_r "unsigned int *seed"
+.Sh DESCRIPTION
+.Bf -symbolic
+These interfaces are obsoleted by
+.Xr random 3 .
+.Ef
+.Pp
+The
+.Fn rand
+function computes a sequence of pseudo-random integers in the range
+of 0 to
+.Dv RAND_MAX
+(as defined by the header file
+.Aq Pa stdlib.h ) .
+.Pp
+The
+.Fn srand
+function sets its argument as the seed for a new sequence of
+pseudo-random numbers to be returned by
+.Fn rand .
+These sequences are repeatable by calling
+.Fn srand
+with the same seed value.
+.Pp
+If no seed value is provided, the functions are automatically
+seeded with a value of 1.
+.Pp
+The
+.Fn rand_r
+is a thread-safe version of
+.Fn rand .
+Storage for the seed must be provided through the
+.Ar seed
+argument, and needs to have been initialized by the caller.
+.Sh SEE ALSO
+.Xr arc4random 3 ,
+.Xr rand48 3 ,
+.Xr random 3
+.Sh STANDARDS
+The
+.Fn rand
+and
+.Fn srand
+functions
+conform to
+.St -ansiC .
+.Pp
+The
+.Fn rand_r
+function
+conforms to ISO/IEC 9945-1 ANSI/IEEE
+.Pq Dq Tn POSIX
+Std 1003.1c Draft 10.
diff --git a/src/lib/libc/stdlib/rand.c b/src/lib/libc/stdlib/rand.c
new file mode 100644
index 0000000000..bb180886c0
--- /dev/null
+++ b/src/lib/libc/stdlib/rand.c
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: rand.c,v 1.6 1998/12/07 21:47:22 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <stdlib.h>
+
+static u_int next = 1;
+
+int
+rand_r(seed)
+u_int *seed;
+{
+
+        *seed = *seed * 1103515245 + 12345;
+        return (*seed % ((u_int)RAND_MAX + 1));
+}
+
+int
+rand()
+{
+
+        return (rand_r(&next));
+}
+
+void
+srand(seed)
+u_int seed;
+{
+
+        next = seed;
+}
diff --git a/src/lib/libc/stdlib/rand48.3 b/src/lib/libc/stdlib/rand48.3
new file mode 100644
index 0000000000..efd6477364
--- /dev/null
+++ b/src/lib/libc/stdlib/rand48.3
@@ -0,0 +1,161 @@
+\" Copyright (c) 1993 Martin Birgmeier
+.\" All rights reserved.
+.\"
+.\" You may redistribute unmodified or modified versions of this source
+.\" code provided that the above copyright notice and this and the
+.\" following conditions are retained.
+.\"
+.\" This software is provided ``as is'', and comes with no warranties
+.\" of any kind. I shall in no event be liable for anything that happens
+.\" to anyone/anything when using this software.
+.\"
+.\"     $OpenBSD: rand48.3,v 1.4 1999/03/11 01:35:01 pjanzen Exp $
+.\"
+.Dd October 8, 1993
+.Dt RAND48 3
+.Os
+.Sh NAME
+.Nm drand48 ,
+.Nm erand48 ,
+.Nm lrand48 ,
+.Nm nrand48 ,
+.Nm mrand48 ,
+.Nm jrand48 ,
+.Nm srand48 ,
+.Nm seed48 ,
+.Nm lcong48
+.Nd pseudo random number generators and initialization routines
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft double 
+.Fn drand48 void
+.Ft double
+.Fn erand48 "unsigned short xseed[3]"
+.Ft long
+.Fn lrand48 void
+.Ft long
+.Fn nrand48 "unsigned short xseed[3]"
+.Ft long
+.Fn mrand48 void
+.Ft long
+.Fn jrand48 "unsigned short xseed[3]"
+.Ft void
+.Fn srand48 "long seed"
+.Ft "unsigned short *"
+.Fn seed48 "unsigned short xseed[3]"
+.Ft void
+.Fn lcong48 "unsigned short p[7]"
+.Sh DESCRIPTION
+The
+.Fn rand48
+family of functions generates pseudo-random numbers using a linear
+congruential algorithm working on integers 48 bits in size. The
+particular formula employed is
+r(n+1) = (a * r(n) + c) mod m
+where the default values are
+for the multiplicand a = 0xfdeece66d = 25214903917 and
+the addend c = 0xb = 11. The modulus is always fixed at m = 2 ** 48.
+r(n) is called the seed of the random number generator.
+.Pp
+For all the six generator routines described next, the first
+computational step is to perform a single iteration of the algorithm.
+.Pp
+.Fn drand48
+and
+.Fn erand48
+return values of type double. The full 48 bits of r(n+1) are
+loaded into the mantissa of the returned value, with the exponent set
+such that the values produced lie in the interval [0.0, 1.0).
+.Pp
+.Fn lrand48
+and
+.Fn nrand48
+return values of type long in the range
+[0, 2**31-1]. The high-order (31) bits of
+r(n+1) are loaded into the lower bits of the returned value, with
+the topmost (sign) bit set to zero.
+.Pp
+.Fn mrand48
+and
+.Fn jrand48
+return values of type long in the range
+[-2**31, 2**31-1]. The high-order (32) bits of
+r(n+1) are loaded into the returned value.
+.Pp
+.Fn drand48 ,
+.Fn lrand48 ,
+and
+.Fn mrand48
+use an internal buffer to store r(n). For these functions
+the initial value of r(0) = 0x1234abcd330e = 20017429951246.
+.Pp
+On the other hand,
+.Fn erand48 ,
+.Fn nrand48 ,
+and
+.Fn jrand48
+use a user-supplied buffer to store the seed r(n),
+which consists of an array of 3 shorts, where the zeroth member
+holds the least significant bits.
+.Pp
+All functions share the same multiplicand and addend.
+.Pp
+.Fn srand48
+is used to initialize the internal buffer r(n) of
+.Fn drand48 ,
+.Fn lrand48 ,
+and
+.Fn mrand48
+such that the 32 bits of the seed value are copied into the upper 32 bits
+of r(n), with the lower 16 bits of r(n) arbitrarily being set to 0x330e.
+Additionally, the constant multiplicand and addend of the algorithm are
+reset to the default values given above.
+.Pp
+.Fn seed48
+also initializes the internal buffer r(n) of
+.Fn drand48 ,
+.Fn lrand48 ,
+and
+.Fn mrand48 ,
+but here all 48 bits of the seed can be specified in an array of 3 shorts,
+where the zeroth member specifies the lowest bits. Again,
+the constant multiplicand and addend of the algorithm are
+reset to the default values given above.
+.Fn seed48
+returns a pointer to an array of 3 shorts which contains the old seed.
+This array is statically allocated, so its contents are lost after
+each new call to
+.Fn seed48 .
+.Pp
+Finally,
+.Fn lcong48
+allows full control over the multiplicand and addend used in
+.Fn drand48 ,
+.Fn erand48 ,
+.Fn lrand48 ,
+.Fn nrand48 ,
+.Fn mrand48 ,
+and
+.Fn jrand48 ,
+and the seed used in
+.Fn drand48 ,
+.Fn lrand48 ,
+and
+.Fn mrand48 .
+An array of 7 shorts is passed as parameter; the first three shorts are
+used to initialize the seed; the second three are used to initialize the
+multiplicand; and the last short is used to initialize the addend.
+It is thus not possible to use values greater than 0xffff as the addend.
+.Pp
+Note that all three methods of seeding the random number generator
+always also set the multiplicand and addend for any of the six
+generator calls.
+.Pp
+For a more powerful random number generator, see
+.Xr random 3
+.Sh AUTHOR
+Martin Birgmeier
+.Sh SEE ALSO
+.Xr arc4random 3 ,
+.Xr rand 3 ,
+.Xr random 3 .
diff --git a/src/lib/libc/stdlib/rand48.h b/src/lib/libc/stdlib/rand48.h
new file mode 100644
index 0000000000..e7cb3e0333
--- /dev/null
+++ b/src/lib/libc/stdlib/rand48.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ *
+ *      $OpenBSD: rand48.h,v 1.2 1996/08/19 08:33:45 tholo Exp $
+ */
+
+#ifndef _RAND48_H_
+#define _RAND48_H_
+
+#include <math.h>
+#include <stdlib.h>
+
+void            __dorand48 __P((unsigned short[3]));
+
+#define RAND48_SEED_0   (0x330e)
+#define RAND48_SEED_1   (0xabcd)
+#define RAND48_SEED_2   (0x1234)
+#define RAND48_MULT_0   (0xe66d)
+#define RAND48_MULT_1   (0xdeec)
+#define RAND48_MULT_2   (0x0005)
+#define RAND48_ADD      (0x000b)
+
+#endif /* _RAND48_H_ */
diff --git a/src/lib/libc/stdlib/random.3 b/src/lib/libc/stdlib/random.3
new file mode 100644
index 0000000000..acfbd8cdeb
--- /dev/null
+++ b/src/lib/libc/stdlib/random.3
@@ -0,0 +1,183 @@
+.\" Copyright (c) 1983, 1991 The Regents of the University of California.
+.\" 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: random.3,v 1.6 1998/07/05 19:54:25 millert Exp $
+.\"
+.Dd April 19, 1991
+.Dt RANDOM 3
+.Os BSD 4.2
+.Sh NAME
+.Nm random ,
+.Nm srandom ,
+.Nm initstate ,
+.Nm setstate
+.Nd better random number generator; routines for changing generators
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft long 
+.Fn random void
+.Ft void
+.Fn srandom "unsigned int seed"
+.Ft char *
+.Fn initstate "unsigned int seed" "char *state" "size_t n"
+.Ft char *
+.Fn setstate "const char *state"
+.Sh DESCRIPTION
+The
+.Fn random
+function
+uses a non-linear additive feedback random number generator employing a
+default table of size 31 long integers to return successive pseudo-random
+numbers in the range from 0 to
+.if t 2\u\s731\s10\d\(mi1.
+.if n (2**31)\(mi1.
+The maximum value returned by
+.Fn random
+is
+.Dv LONG_MAX
+(as defined by the header file
+.Aq Pa limits.h ) .
+The period of this random number generator is very large, approximately
+.if t 16\(mu(2\u\s731\s10\d\(mi1).
+.if n 16*((2**31)\(mi1).
+.Pp
+The
+.Fn random Ns / Fn srandom
+have (almost) the same calling sequence and initialization properties as
+.Xr rand 3 Ns / Xr srand 3 .
+The difference is that
+.Xr rand
+produces a much less random sequence \(em in fact, the low dozen bits
+generated by rand go through a cyclic pattern.  All the bits generated by
+.Fn random
+are usable.  For example,
+.Sq Li random()&01
+will produce a random binary
+value.
+.Pp
+Unlike
+.Xr srand ,
+.Fn srandom
+does not return the old seed; the reason for this is that the amount of
+state information used is much more than a single word.  (Two other
+routines are provided to deal with restarting/changing random
+number generators).  Like
+.Xr rand 3 ,
+however,
+.Fn random
+will by default produce a sequence of numbers that can be duplicated
+by calling
+.Fn srandom
+with 
+.Ql 1
+as the seed.
+.Pp
+The
+.Fn initstate
+routine allows a state array, passed in as an argument, to be initialized
+for future use.  The size of the state array (in bytes) is used by
+.Fn initstate
+to decide how sophisticated a random number generator it should use \(em the
+more state, the better the random numbers will be.
+(Current "optimal" values for the amount of state information are
+8, 32, 64, 128, and 256 bytes; other amounts will be rounded down to
+the nearest known amount.  Using less than 8 bytes will cause an error.)
+The seed for the initialization (which specifies a starting point for
+the random number sequence, and provides for restarting at the same
+point) is also an argument.
+The
+.Fn initstate
+function
+returns a pointer to the previous state information array.
+.Pp
+Once a state has been initialized, the
+.Fn setstate
+routine provides for rapid switching between states.
+The
+.Fn setstate
+function
+returns a pointer to the previous state array; its
+argument state array is used for further random number generation
+until the next call to
+.Fn initstate
+or
+.Fn setstate .
+.Pp
+Once a state array has been initialized, it may be restarted at a
+different point either by calling
+.Fn initstate
+(with the desired seed, the state array, and its size) or by calling
+both
+.Fn setstate
+(with the state array) and
+.Fn srandom
+(with the desired seed).
+The advantage of calling both
+.Fn setstate
+and
+.Fn srandom
+is that the size of the state array does not have to be remembered after
+it is initialized.
+.Pp
+With 256 bytes of state information, the period of the random number
+generator is greater than
+.if t 2\u\s769\s10\d,
+.if n 2**69
+which should be sufficient for most purposes.
+.Sh AUTHOR
+Earl T. Cohen
+.Sh DIAGNOSTICS
+If
+.Fn initstate
+is called with less than 8 bytes of state information, or if
+.Fn setstate
+detects that the state information has been garbled, error
+messages are printed on the standard error output.
+.Sh SEE ALSO
+.Xr arc4random 3 ,
+.Xr drand48 3 ,
+.Xr rand 3
+.Sh STANDARDS
+The
+.Fn random ,                                                           
+.Fn srandom ,                                                           
+.Fn initstate ,                                                           
+and
+.Fn setstate
+functions conform to
+.St -xpg4.2 .
+.Sh HISTORY
+These
+functions appeared in 
+.Bx 4.2 .
+.Sh BUGS
+About 2/3 the speed of
+.Xr rand 3 .
diff --git a/src/lib/libc/stdlib/random.c b/src/lib/libc/stdlib/random.c
new file mode 100644
index 0000000000..79344f30f1
--- /dev/null
+++ b/src/lib/libc/stdlib/random.c
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: random.c,v 1.6 1998/02/07 02:16:25 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+ * random.c:
+ *
+ * An improved random number generation package.  In addition to the standard
+ * rand()/srand() like interface, this package also has a special state info
+ * interface.  The initstate() routine is called with a seed, an array of
+ * bytes, and a count of how many bytes are being passed in; this array is
+ * then initialized to contain information for random number generation with
+ * that much state information.  Good sizes for the amount of state
+ * information are 32, 64, 128, and 256 bytes.  The state can be switched by
+ * calling the setstate() routine with the same array as was initiallized
+ * with initstate().  By default, the package runs with 128 bytes of state
+ * information and generates far better random numbers than a linear
+ * congruential generator.  If the amount of state information is less than
+ * 32 bytes, a simple linear congruential R.N.G. is used.
+ *
+ * Internally, the state information is treated as an array of longs; the
+ * zeroeth element of the array is the type of R.N.G. being used (small
+ * integer); the remainder of the array is the state information for the
+ * R.N.G.  Thus, 32 bytes of state information will give 7 longs worth of
+ * state information, which will allow a degree seven polynomial.  (Note:
+ * the zeroeth word of state information also has some other information
+ * stored in it -- see setstate() for details).
+ * 
+ * The random number generation technique is a linear feedback shift register
+ * approach, employing trinomials (since there are fewer terms to sum up that
+ * way).  In this approach, the least significant bit of all the numbers in
+ * the state table will act as a linear feedback shift register, and will
+ * have period 2^deg - 1 (where deg is the degree of the polynomial being
+ * used, assuming that the polynomial is irreducible and primitive).  The
+ * higher order bits will have longer periods, since their values are also
+ * influenced by pseudo-random carries out of the lower bits.  The total
+ * period of the generator is approximately deg*(2**deg - 1); thus doubling
+ * the amount of state information has a vast influence on the period of the
+ * generator.  Note: the deg*(2**deg - 1) is an approximation only good for
+ * large deg, when the period of the shift register is the dominant factor.
+ * With deg equal to seven, the period is actually much longer than the
+ * 7*(2**7 - 1) predicted by this formula.
+ */
+
+/*
+ * For each of the currently supported random number generators, we have a
+ * break value on the amount of state information (you need at least this
+ * many bytes of state info to support this random number generator), a degree
+ * for the polynomial (actually a trinomial) that the R.N.G. is based on, and
+ * the separation between the two lower order coefficients of the trinomial.
+ */
+#define TYPE_0          0               /* linear congruential */
+#define BREAK_0         8
+#define DEG_0           0
+#define SEP_0           0
+
+#define TYPE_1          1               /* x**7 + x**3 + 1 */
+#define BREAK_1         32
+#define DEG_1           7
+#define SEP_1           3
+
+#define TYPE_2          2               /* x**15 + x + 1 */
+#define BREAK_2         64
+#define DEG_2           15
+#define SEP_2           1
+
+#define TYPE_3          3               /* x**31 + x**3 + 1 */
+#define BREAK_3         128
+#define DEG_3           31
+#define SEP_3           3
+
+#define TYPE_4          4               /* x**63 + x + 1 */
+#define BREAK_4         256
+#define DEG_4           63
+#define SEP_4           1
+
+/*
+ * Array versions of the above information to make code run faster --
+ * relies on fact that TYPE_i == i.
+ */
+#define MAX_TYPES       5               /* max number of types above */
+
+static int degrees[MAX_TYPES] = { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
+static int seps [MAX_TYPES] =   { SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
+
+/*
+ * Initially, everything is set up as if from:
+ *
+ *      initstate(1, &randtbl, 128);
+ *
+ * Note that this initialization takes advantage of the fact that srandom()
+ * advances the front and rear pointers 10*rand_deg times, and hence the
+ * rear pointer which starts at 0 will also end up at zero; thus the zeroeth
+ * element of the state information, which contains info about the current
+ * position of the rear pointer is just
+ *
+ *      MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
+ */
+
+static long randtbl[DEG_3 + 1] = {
+        TYPE_3,
+        0x991539b1, 0x16a5bce3, 0x6774a4cd, 0x3e01511e, 0x4e508aaa, 0x61048c05, 
+        0xf5500617, 0x846b7115, 0x6a19892c, 0x896a97af, 0xdb48f936, 0x14898454, 
+        0x37ffd106, 0xb58bff9c, 0x59e17104, 0xcf918a49, 0x09378c83, 0x52c7a471, 
+        0x8d293ea9, 0x1f4fc301, 0xc3db71be, 0x39b44e1c, 0xf8a44ef9, 0x4c8b80b1, 
+        0x19edc328, 0x87bf4bdd, 0xc9b240e5, 0xe9ee4b1b, 0x4382aee7, 0x535b6b41, 
+        0xf3bec5da,
+};
+
+/*
+ * fptr and rptr are two pointers into the state info, a front and a rear
+ * pointer.  These two pointers are always rand_sep places aparts, as they
+ * cycle cyclically through the state information.  (Yes, this does mean we
+ * could get away with just one pointer, but the code for random() is more
+ * efficient this way).  The pointers are left positioned as they would be
+ * from the call
+ *
+ *      initstate(1, randtbl, 128);
+ *
+ * (The position of the rear pointer, rptr, is really 0 (as explained above
+ * in the initialization of randtbl) because the state table pointer is set
+ * to point to randtbl[1] (as explained below).
+ */
+static long *fptr = &randtbl[SEP_3 + 1];
+static long *rptr = &randtbl[1];
+
+/*
+ * The following things are the pointer to the state information table, the
+ * type of the current generator, the degree of the current polynomial being
+ * used, and the separation between the two pointers.  Note that for efficiency
+ * of random(), we remember the first location of the state information, not
+ * the zeroeth.  Hence it is valid to access state[-1], which is used to
+ * store the type of the R.N.G.  Also, we remember the last location, since
+ * this is more efficient than indexing every time to find the address of
+ * the last element to see if the front and rear pointers have wrapped.
+ */
+static long *state = &randtbl[1];
+static int rand_type = TYPE_3;
+static int rand_deg = DEG_3;
+static int rand_sep = SEP_3;
+static long *end_ptr = &randtbl[DEG_3 + 1];
+
+/*
+ * srandom:
+ *
+ * Initialize the random number generator based on the given seed.  If the
+ * type is the trivial no-state-information type, just remember the seed.
+ * Otherwise, initializes state[] based on the given "seed" via a linear
+ * congruential generator.  Then, the pointers are set to known locations
+ * that are exactly rand_sep places apart.  Lastly, it cycles the state
+ * information a given number of times to get rid of any initial dependencies
+ * introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
+ * for default usage relies on values produced by this routine.
+ */
+void
+srandom(x)
+        u_int x;
+{
+        register long int test;
+        register int i;
+        ldiv_t val;
+
+        if (rand_type == TYPE_0)
+                state[0] = x;
+        else {
+                state[0] = x;
+                for (i = 1; i < rand_deg; i++) {
+                        /*
+                         * Implement the following, without overflowing 31 bits:
+                         *
+                         *      state[i] = (16807 * state[i - 1]) % 2147483647;
+                         *
+                         *      2^31-1 (prime) = 2147483647 = 127773*16807+2836
+                         */
+                        val = ldiv(state[i-1], 127773);
+                        test = 16807 * val.rem - 2836 * val.quot;
+                        state[i] = test + (test < 0 ? 2147483647 : 0);
+                }
+                fptr = &state[rand_sep];
+                rptr = &state[0];
+                for (i = 0; i < 10 * rand_deg; i++)
+                        (void)random();
+        }
+}
+
+/*
+ * initstate:
+ *
+ * Initialize the state information in the given array of n bytes for future
+ * random number generation.  Based on the number of bytes we are given, and
+ * the break values for the different R.N.G.'s, we choose the best (largest)
+ * one we can and set things up for it.  srandom() is then called to
+ * initialize the state information.
+ * 
+ * Note that on return from srandom(), we set state[-1] to be the type
+ * multiplexed with the current value of the rear pointer; this is so
+ * successive calls to initstate() won't lose this information and will be
+ * able to restart with setstate().
+ * 
+ * Note: the first thing we do is save the current state, if any, just like
+ * setstate() so that it doesn't matter when initstate is called.
+ *
+ * Returns a pointer to the old state.
+ */
+char *
+initstate(seed, arg_state, n)
+        u_int seed;                     /* seed for R.N.G. */
+        char *arg_state;                /* pointer to state array */
+        size_t n;                       /* # bytes of state info */
+{
+        register char *ostate = (char *)(&state[-1]);
+
+        if (rand_type == TYPE_0)
+                state[-1] = rand_type;
+        else
+                state[-1] = MAX_TYPES * (rptr - state) + rand_type;
+        if (n < BREAK_0)
+                return(NULL);
+        if (n < BREAK_1) {
+                rand_type = TYPE_0;
+                rand_deg = DEG_0;
+                rand_sep = SEP_0;
+        } else if (n < BREAK_2) {
+                rand_type = TYPE_1;
+                rand_deg = DEG_1;
+                rand_sep = SEP_1;
+        } else if (n < BREAK_3) {
+                rand_type = TYPE_2;
+                rand_deg = DEG_2;
+                rand_sep = SEP_2;
+        } else if (n < BREAK_4) {
+                rand_type = TYPE_3;
+                rand_deg = DEG_3;
+                rand_sep = SEP_3;
+        } else {
+                rand_type = TYPE_4;
+                rand_deg = DEG_4;
+                rand_sep = SEP_4;
+        }
+        state = &(((long *)arg_state)[1]);      /* first location */
+        end_ptr = &state[rand_deg];     /* must set end_ptr before srandom */
+        srandom(seed);
+        if (rand_type == TYPE_0)
+                state[-1] = rand_type;
+        else
+                state[-1] = MAX_TYPES*(rptr - state) + rand_type;
+        return(ostate);
+}
+
+/*
+ * setstate:
+ *
+ * Restore the state from the given state array.
+ *
+ * Note: it is important that we also remember the locations of the pointers
+ * in the current state information, and restore the locations of the pointers
+ * from the old state information.  This is done by multiplexing the pointer
+ * location into the zeroeth word of the state information.
+ *
+ * Note that due to the order in which things are done, it is OK to call
+ * setstate() with the same state as the current state.
+ *
+ * Returns a pointer to the old state information.
+ */
+char *
+setstate(arg_state)
+        const char *arg_state;
+{
+        register long *new_state = (long *)arg_state;
+        register int type = new_state[0] % MAX_TYPES;
+        register int rear = new_state[0] / MAX_TYPES;
+        char *ostate = (char *)(&state[-1]);
+
+        if (rand_type == TYPE_0)
+                state[-1] = rand_type;
+        else
+                state[-1] = MAX_TYPES * (rptr - state) + rand_type;
+        switch(type) {
+        case TYPE_0:
+        case TYPE_1:
+        case TYPE_2:
+        case TYPE_3:
+        case TYPE_4:
+                rand_type = type;
+                rand_deg = degrees[type];
+                rand_sep = seps[type];
+                break;
+        default:
+                return(NULL);
+        }
+        state = &new_state[1];
+        if (rand_type != TYPE_0) {
+                rptr = &state[rear];
+                fptr = &state[(rear + rand_sep) % rand_deg];
+        }
+        end_ptr = &state[rand_deg];             /* set end_ptr too */
+        return(ostate);
+}
+
+/*
+ * random:
+ *
+ * If we are using the trivial TYPE_0 R.N.G., just do the old linear
+ * congruential bit.  Otherwise, we do our fancy trinomial stuff, which is
+ * the same in all the other cases due to all the global variables that have
+ * been set up.  The basic operation is to add the number at the rear pointer
+ * into the one at the front pointer.  Then both pointers are advanced to
+ * the next location cyclically in the table.  The value returned is the sum
+ * generated, reduced to 31 bits by throwing away the "least random" low bit.
+ *
+ * Note: the code takes advantage of the fact that both the front and
+ * rear pointers can't wrap on the same call by not testing the rear
+ * pointer if the front one has wrapped.
+ *
+ * Returns a 31-bit random number.
+ */
+long
+random()
+{
+        long i;
+
+        if (rand_type == TYPE_0)
+                i = state[0] = (state[0] * 1103515245 + 12345) & 0x7fffffff;
+        else {
+                *fptr += *rptr;
+                i = (*fptr >> 1) & 0x7fffffff;  /* chucking least random bit */
+                if (++fptr >= end_ptr) {
+                        fptr = state;
+                        ++rptr;
+                } else if (++rptr >= end_ptr)
+                        rptr = state;
+        }
+        return(i);
+}
diff --git a/src/lib/libc/stdlib/realpath.3 b/src/lib/libc/stdlib/realpath.3
new file mode 100644
index 0000000000..cc140029e4
--- /dev/null
+++ b/src/lib/libc/stdlib/realpath.3
@@ -0,0 +1,125 @@
+.\" Copyright (c) 1994
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Jan-Simon Pendry.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: realpath.3,v 1.3 1997/05/30 07:48:30 deraadt Exp $
+.\"
+.Dd February, 16, 1994
+.Dt REALPATH 3
+.Os
+.Sh NAME
+.Nm realpath
+.Nd returns the canonicalized absolute pathname
+.Sh SYNOPSIS
+.Fd #include <sys/param.h>
+.Fd #include <stdlib.h>
+.Ft "char *"
+.Fn realpath "const char *pathname" "char resolvedname[MAXPATHLEN]"
+.Sh DESCRIPTION
+The
+.Fn realpath
+function resolves all symbolic links, extra
+.Dq /
+characters and references to
+.Pa /./
+and
+.Pa /../
+in
+.Fa pathname ,
+and copies the resulting absolute pathname into
+the memory referenced by
+.Fa resolvedname .
+The
+.Fa resolvedname
+argument
+.Em must
+refer to a buffer capable of storing at least
+.Dv MAXPATHLEN
+characters.
+.Pp
+The 
+.Fn realpath
+function will resolve both absolute and relative paths
+and return the absolute pathname corresponding to
+.Fa pathname .
+All but the last component of
+.Fa pathname
+must exist when
+.Fn realpath
+is called.
+.Sh "RETURN VALUES"
+The
+.Fn realpath
+function returns
+.Fa resolved_name
+on success.
+If an error occurs,
+.Fn realpath
+returns
+.Dv NULL ,
+and
+.Fa resolved_name
+contains the pathname which caused the problem.
+.Sh ERRORS
+The function
+.Fn realpath
+may fail and set the external variable
+.Va errno
+for any of the errors specified for the library functions
+.Xr chdir 2 ,
+.Xr close 2 ,
+.Xr fchdir 2 ,
+.Xr lstat 2 ,
+.Xr open 2 ,
+.Xr readlink 2
+and
+.Xr getcwd 3 .
+.Sh CAVEATS
+This implementation of
+.Fn realpath
+differs slightly from the Solaris implementation.
+The
+.Bx 4.4
+version always returns absolute pathnames,
+whereas the Solaris implementation will,
+under certain circumstances, return a relative
+.Fa resolved_path
+when given a relative
+.Fa pathname .
+.Sh "SEE ALSO"
+.Xr getcwd 3
+.Sh HISTORY
+The
+.Fn realpath
+function call first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/realpath.c b/src/lib/libc/stdlib/realpath.c
new file mode 100644
index 0000000000..0288601464
--- /dev/null
+++ b/src/lib/libc/stdlib/realpath.c
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: realpath.c,v 1.4 1998/05/18 09:55:19 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/*
+ * char *realpath(const char *path, char resolved_path[MAXPATHLEN]);
+ *
+ * Find the real name of path, by removing all ".", ".." and symlink
+ * components.  Returns (resolved) on success, or (NULL) on failure,
+ * in which case the path which caused trouble is left in (resolved).
+ */
+char *
+realpath(path, resolved)
+        const char *path;
+        char *resolved;
+{
+        struct stat sb;
+        int fd, n, rootd, serrno;
+        char *p, *q, wbuf[MAXPATHLEN];
+        int symlinks = 0;
+
+        /* Save the starting point. */
+        if ((fd = open(".", O_RDONLY)) < 0) {
+                (void)strcpy(resolved, ".");
+                return (NULL);
+        }
+
+        /*
+         * Find the dirname and basename from the path to be resolved.
+         * Change directory to the dirname component.
+         * lstat the basename part.
+         *     if it is a symlink, read in the value and loop.
+         *     if it is a directory, then change to that directory.
+         * get the current directory name and append the basename.
+         */
+        (void)strncpy(resolved, path, MAXPATHLEN - 1);
+        resolved[MAXPATHLEN - 1] = '\0';
+loop:
+        q = strrchr(resolved, '/');
+        if (q != NULL) {
+                p = q + 1;
+                if (q == resolved)
+                        q = "/";
+                else {
+                        do {
+                                --q;
+                        } while (q > resolved && *q == '/');
+                        q[1] = '\0';
+                        q = resolved;
+                }
+                if (chdir(q) < 0)
+                        goto err1;
+        } else
+                p = resolved;
+
+        /* Deal with the last component. */
+        if (lstat(p, &sb) == 0) {
+                if (S_ISLNK(sb.st_mode)) {
+                        if (++symlinks > MAXSYMLINKS) {
+                                errno = ELOOP;
+                                goto err1;
+                        }
+                        n = readlink(p, resolved, MAXPATHLEN-1);
+                        if (n < 0)
+                                goto err1;
+                        resolved[n] = '\0';
+                        goto loop;
+                }
+                if (S_ISDIR(sb.st_mode)) {
+                        if (chdir(p) < 0)
+                                goto err1;
+                        p = "";
+                }
+        }
+
+        /*
+         * Save the last component name and get the full pathname of
+         * the current directory.
+         */
+        (void)strcpy(wbuf, p);
+        if (getcwd(resolved, MAXPATHLEN) == 0)
+                goto err1;
+
+        /*
+         * Join the two strings together, ensuring that the right thing
+         * happens if the last component is empty, or the dirname is root.
+         */
+        if (resolved[0] == '/' && resolved[1] == '\0')
+                rootd = 1;
+        else
+                rootd = 0;
+
+        if (*wbuf) {
+                if (strlen(resolved) + strlen(wbuf) + rootd + 1 > MAXPATHLEN) {
+                        errno = ENAMETOOLONG;
+                        goto err1;
+                }
+                if (rootd == 0)
+                        (void)strcat(resolved, "/");
+                (void)strcat(resolved, wbuf);
+        }
+
+        /* Go back to where we came from. */
+        if (fchdir(fd) < 0) {
+                serrno = errno;
+                goto err2;
+        }
+
+        /* It's okay if the close fails, what's an fd more or less? */
+        (void)close(fd);
+        return (resolved);
+
+err1:   serrno = errno;
+        (void)fchdir(fd);
+err2:   (void)close(fd);
+        errno = serrno;
+        return (NULL);
+}
diff --git a/src/lib/libc/stdlib/seed48.c b/src/lib/libc/stdlib/seed48.c
new file mode 100644
index 0000000000..c4dcd0ead8
--- /dev/null
+++ b/src/lib/libc/stdlib/seed48.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: seed48.c,v 1.2 1996/08/19 08:33:48 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+extern unsigned short __rand48_seed[3];
+extern unsigned short __rand48_mult[3];
+extern unsigned short __rand48_add;
+
+unsigned short *
+seed48(unsigned short xseed[3])
+{
+        static unsigned short sseed[3];
+
+        sseed[0] = __rand48_seed[0];
+        sseed[1] = __rand48_seed[1];
+        sseed[2] = __rand48_seed[2];
+        __rand48_seed[0] = xseed[0];
+        __rand48_seed[1] = xseed[1];
+        __rand48_seed[2] = xseed[2];
+        __rand48_mult[0] = RAND48_MULT_0;
+        __rand48_mult[1] = RAND48_MULT_1;
+        __rand48_mult[2] = RAND48_MULT_2;
+        __rand48_add = RAND48_ADD;
+        return sseed;
+}
diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c
new file mode 100644
index 0000000000..b6f261e61c
--- /dev/null
+++ b/src/lib/libc/stdlib/setenv.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: setenv.c,v 1.3 1998/02/02 22:44:53 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ * setenv --
+ *      Set the value of the environmental variable "name" to be
+ *      "value".  If rewrite is set, replace any current value.
+ */
+int
+setenv(name, value, rewrite)
+        register const char *name;
+        register const char *value;
+        int rewrite;
+{
+        extern char **environ;
+        static int alloced;                     /* if allocated space before */
+        register char *C;
+        int l_value, offset;
+        char *__findenv();
+
+        if (*value == '=')                      /* no `=' in value */
+                ++value;
+        l_value = strlen(value);
+        if ((C = __findenv(name, &offset))) {   /* find if already exists */
+                if (!rewrite)
+                        return (0);
+                if (strlen(C) >= l_value) {     /* old larger; copy over */
+                        while (*C++ = *value++);
+                        return (0);
+                }
+        } else {                                        /* create new slot */
+                register int    cnt;
+                register char   **P;
+
+                for (P = environ, cnt = 0; *P; ++P, ++cnt);
+                if (alloced) {                  /* just increase size */
+                        P = (char **)realloc((void *)environ,
+                            (size_t)(sizeof(char *) * (cnt + 2)));
+                        if (!P)
+                                return (-1);
+                        environ = P;
+                }
+                else {                          /* get new space */
+                        alloced = 1;            /* copy old entries into it */
+                        P = (char **)malloc((size_t)(sizeof(char *) *
+                            (cnt + 2)));
+                        if (!P)
+                                return (-1);
+                        bcopy(environ, P, cnt * sizeof(char *));
+                        environ = P;
+                }
+                environ[cnt + 1] = NULL;
+                offset = cnt;
+        }
+        for (C = (char *)name; *C && *C != '='; ++C);   /* no `=' in name */
+        if (!(environ[offset] =                 /* name + `=' + value */
+            malloc((size_t)((int)(C - name) + l_value + 2))))
+                return (-1);
+        for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
+                ;
+        for (*C++ = '='; *C++ = *value++; )
+                ;
+        return (0);
+}
+
+/*
+ * unsetenv(name) --
+ *      Delete environmental variable "name".
+ */
+void
+unsetenv(name)
+        const char      *name;
+{
+        extern char **environ;
+        register char **P;
+        int offset;
+        char *__findenv();
+
+        while (__findenv(name, &offset))                /* if set multiple times */
+                for (P = &environ[offset];; ++P)
+                        if (!(*P = *(P + 1)))
+                                break;
+}
diff --git a/src/lib/libc/stdlib/srand48.c b/src/lib/libc/stdlib/srand48.c
new file mode 100644
index 0000000000..fcff8a172e
--- /dev/null
+++ b/src/lib/libc/stdlib/srand48.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 1993 Martin Birgmeier
+ * All rights reserved.
+ *
+ * You may redistribute unmodified or modified versions of this source
+ * code provided that the above copyright notice and this and the
+ * following conditions are retained.
+ *
+ * This software is provided ``as is'', and comes with no warranties
+ * of any kind. I shall in no event be liable for anything that happens
+ * to anyone/anything when using this software.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: srand48.c,v 1.2 1996/08/19 08:33:49 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "rand48.h"
+
+extern unsigned short __rand48_seed[3];
+extern unsigned short __rand48_mult[3];
+extern unsigned short __rand48_add;
+
+void
+srand48(long seed)
+{
+        __rand48_seed[0] = RAND48_SEED_0;
+        __rand48_seed[1] = (unsigned short) seed;
+        __rand48_seed[2] = (unsigned short) (seed >> 16);
+        __rand48_mult[0] = RAND48_MULT_0;
+        __rand48_mult[1] = RAND48_MULT_1;
+        __rand48_mult[2] = RAND48_MULT_2;
+        __rand48_add = RAND48_ADD;
+}
diff --git a/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3
new file mode 100644
index 0000000000..3476fa41d6
--- /dev/null
+++ b/src/lib/libc/stdlib/strtod.3
@@ -0,0 +1,113 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strtod.3,v 1.2 1996/08/19 08:33:49 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRTOD 3
+.Os
+.Sh NAME
+.Nm strtod
+.Nd convert
+.Tn ASCII
+string to double
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft double
+.Fn strtod "const char *nptr" "char **endptr"
+.Sh DESCRIPTION
+The
+.Fn strtod
+function converts the initial portion of the string 
+pointed to by
+.Fa nptr
+to
+.Em double
+representation.
+.Pp
+The expected form of the string is an optional plus (``+'') or minus
+sign (``-'') followed by a sequence of digits optionally containing
+a decimal-point character, optionally followed by an exponent.
+An exponent consists of an ``E'' or ``e'', followed by an optional plus
+or minus sign, followed by a sequence of digits.
+.Pp
+Leading white-space characters in the string (as defined by the
+.Xr isspace 3
+function) are skipped.
+.Sh RETURN VALUES
+The
+.Fn strtod
+function returns the converted value, if any.
+.Pp
+If
+.Fa endptr
+is not
+.Dv NULL ,
+a pointer to the character after the last character used
+in the conversion is stored in the location referenced by
+.Fa endptr .
+.Pp
+If no conversion is performed, zero is returned and the value of
+.Fa nptr
+is stored in the location referenced by
+.Fa endptr .
+.Pp
+If the correct value would cause overflow, plus or minus
+.Dv HUGE_VAL
+is returned (according to the sign of the value), and
+.Dv ERANGE
+is stored in
+.Va errno .
+If the correct value would cause underflow, zero is
+returned and
+.Dv ERANGE
+is stored in 
+.Va errno .
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er ERANGE
+Overflow or underflow occurred.
+.Sh SEE ALSO
+.Xr atof 3 ,
+.Xr atoi 3 ,
+.Xr atol 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
+.Sh STANDARDS
+The
+.Fn strtod
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/stdlib/strtod.c b/src/lib/libc/stdlib/strtod.c
new file mode 100644
index 0000000000..55d9e91224
--- /dev/null
+++ b/src/lib/libc/stdlib/strtod.c
@@ -0,0 +1,2529 @@
+/****************************************************************
+ *
+ * The author of this software is David M. Gay.
+ *
+ * Copyright (c) 1991 by AT&T.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ ***************************************************************/
+
+/* Please send bug reports to
+        David M. Gay
+        AT&T Bell Laboratories, Room 2C-463
+        600 Mountain Avenue
+        Murray Hill, NJ 07974-2070
+        U.S.A.
+        dmg@research.att.com or research!dmg
+ */
+
+/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.
+ *
+ * This strtod returns a nearest machine number to the input decimal
+ * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are
+ * broken by the IEEE round-even rule.  Otherwise ties are broken by
+ * biased rounding (add half and chop).
+ *
+ * Inspired loosely by William D. Clinger's paper "How to Read Floating
+ * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
+ *
+ * Modifications:
+ *
+ *      1. We only require IEEE, IBM, or VAX double-precision
+ *              arithmetic (not IEEE double-extended).
+ *      2. We get by with floating-point arithmetic in a case that
+ *              Clinger missed -- when we're computing d * 10^n
+ *              for a small integer d and the integer n is not too
+ *              much larger than 22 (the maximum integer k for which
+ *              we can represent 10^k exactly), we may be able to
+ *              compute (d*10^k) * 10^(e-k) with just one roundoff.
+ *      3. Rather than a bit-at-a-time adjustment of the binary
+ *              result in the hard case, we use floating-point
+ *              arithmetic to determine the adjustment to within
+ *              one bit; only in really hard cases do we need to
+ *              compute a second residual.
+ *      4. Because of 3., we don't need a large table of powers of 10
+ *              for ten-to-e (just some small tables, e.g. of 10^k
+ *              for 0 <= k <= 22).
+ */
+
+/*
+ * #define IEEE_LITTLE_ENDIAN for IEEE-arithmetic machines where the least
+ *      significant byte has the lowest address.
+ * #define IEEE_BIG_ENDIAN for IEEE-arithmetic machines where the most
+ *      significant byte has the lowest address.
+ * #define Long int on machines with 32-bit ints and 64-bit longs.
+ * #define Sudden_Underflow for IEEE-format machines without gradual
+ *      underflow (i.e., that flush to zero on underflow).
+ * #define IBM for IBM mainframe-style floating-point arithmetic.
+ * #define VAX for VAX-style floating-point arithmetic.
+ * #define Unsigned_Shifts if >> does treats its left operand as unsigned.
+ * #define No_leftright to omit left-right logic in fast floating-point
+ *      computation of dtoa.
+ * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.
+ * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
+ *      that use extended-precision instructions to compute rounded
+ *      products and quotients) with IBM.
+ * #define ROUND_BIASED for IEEE-format with biased rounding.
+ * #define Inaccurate_Divide for IEEE-format with correctly rounded
+ *      products but inaccurate quotients, e.g., for Intel i860.
+ * #define Just_16 to store 16 bits per 32-bit Long when doing high-precision
+ *      integer arithmetic.  Whether this speeds things up or slows things
+ *      down depends on the machine and the number being converted.
+ * #define KR_headers for old-style C function headers.
+ * #define Bad_float_h if your system lacks a float.h or if it does not
+ *      define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
+ *      FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
+ * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
+ *      if memory is available and otherwise does something you deem
+ *      appropriate.  If MALLOC is undefined, malloc will be invoked
+ *      directly -- and assumed always to succeed.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strtod.c,v 1.12 1998/08/28 20:49:24 mickey Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
+    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
+    defined(__powerpc__) || defined(__m88k__) || defined(__hppa__)
+#include <sys/types.h>
+#if BYTE_ORDER == BIG_ENDIAN
+#define IEEE_BIG_ENDIAN
+#else
+#define IEEE_LITTLE_ENDIAN
+#endif
+#endif
+
+#ifdef __arm32__
+/*
+ * Although the CPU is little endian the FP has different
+ * byte and word endianness. The byte order is still little endian
+ * but the word order is big endian.
+ */
+#define IEEE_BIG_ENDIAN
+#endif
+
+#ifdef vax
+#define VAX
+#endif
+
+#define Long    int32_t
+#define ULong   u_int32_t
+
+#ifdef DEBUG
+#include "stdio.h"
+#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
+#endif
+
+#ifdef __cplusplus
+#include "malloc.h"
+#include "memory.h"
+#else
+#ifndef KR_headers
+#include "stdlib.h"
+#include "string.h"
+#include "locale.h"
+#else
+#include "malloc.h"
+#include "memory.h"
+#endif
+#endif
+
+#ifdef MALLOC
+#ifdef KR_headers
+extern char *MALLOC();
+#else
+extern void *MALLOC(size_t);
+#endif
+#else
+#define MALLOC malloc
+#endif
+
+#include "ctype.h"
+#include "errno.h"
+
+#ifdef Bad_float_h
+#undef __STDC__
+#ifdef IEEE_BIG_ENDIAN
+#define IEEE_ARITHMETIC
+#endif
+#ifdef IEEE_LITTLE_ENDIAN
+#define IEEE_ARITHMETIC
+#endif
+
+#ifdef IEEE_ARITHMETIC
+#define DBL_DIG 15
+#define DBL_MAX_10_EXP 308
+#define DBL_MAX_EXP 1024
+#define FLT_RADIX 2
+#define FLT_ROUNDS 1
+#define DBL_MAX 1.7976931348623157e+308
+#endif
+
+#ifdef IBM
+#define DBL_DIG 16
+#define DBL_MAX_10_EXP 75
+#define DBL_MAX_EXP 63
+#define FLT_RADIX 16
+#define FLT_ROUNDS 0
+#define DBL_MAX 7.2370055773322621e+75
+#endif
+
+#ifdef VAX
+#define DBL_DIG 16
+#define DBL_MAX_10_EXP 38
+#define DBL_MAX_EXP 127
+#define FLT_RADIX 2
+#define FLT_ROUNDS 1
+#define DBL_MAX 1.7014118346046923e+38
+#endif
+
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647
+#endif
+#else
+#include "float.h"
+#endif
+#ifndef __MATH_H__
+#include "math.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef CONST
+#ifdef KR_headers
+#define CONST /* blank */
+#else
+#define CONST const
+#endif
+#endif
+
+#ifdef Unsigned_Shifts
+#define Sign_Extend(a,b) if (b < 0) a |= 0xffff0000;
+#else
+#define Sign_Extend(a,b) /*no-op*/
+#endif
+
+#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
+    defined(IBM) != 1
+Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or
+IBM should be defined.
+#endif
+
+typedef union {
+        double d;
+        ULong ul[2];
+} _double;
+#define value(x) ((x).d)
+#ifdef IEEE_LITTLE_ENDIAN
+#define word0(x) ((x).ul[1])
+#define word1(x) ((x).ul[0])
+#else
+#define word0(x) ((x).ul[0])
+#define word1(x) ((x).ul[1])
+#endif
+
+/* The following definition of Storeinc is appropriate for MIPS processors.
+ * An alternative that might be better on some machines is
+ * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+ */
+#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(__arm32__)
+#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
+((unsigned short *)a)[0] = (unsigned short)c, a++)
+#else
+#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
+((unsigned short *)a)[1] = (unsigned short)c, a++)
+#endif
+
+/* #define P DBL_MANT_DIG */
+/* Ten_pmax = floor(P*log(2)/log(5)) */
+/* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
+/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
+/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */
+
+#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN)
+#define Exp_shift  20
+#define Exp_shift1 20
+#define Exp_msk1    0x100000
+#define Exp_msk11   0x100000
+#define Exp_mask  0x7ff00000
+#define P 53
+#define Bias 1023
+#define IEEE_Arith
+#define Emin (-1022)
+#define Exp_1  0x3ff00000
+#define Exp_11 0x3ff00000
+#define Ebits 11
+#define Frac_mask  0xfffff
+#define Frac_mask1 0xfffff
+#define Ten_pmax 22
+#define Bletch 0x10
+#define Bndry_mask  0xfffff
+#define Bndry_mask1 0xfffff
+#define LSB 1
+#define Sign_bit 0x80000000
+#define Log2P 1
+#define Tiny0 0
+#define Tiny1 1
+#define Quick_max 14
+#define Int_max 14
+#define Infinite(x) (word0(x) == 0x7ff00000) /* sufficient test for here */
+#else
+#undef  Sudden_Underflow
+#define Sudden_Underflow
+#ifdef IBM
+#define Exp_shift  24
+#define Exp_shift1 24
+#define Exp_msk1   0x1000000
+#define Exp_msk11  0x1000000
+#define Exp_mask  0x7f000000
+#define P 14
+#define Bias 65
+#define Exp_1  0x41000000
+#define Exp_11 0x41000000
+#define Ebits 8 /* exponent has 7 bits, but 8 is the right value in b2d */
+#define Frac_mask  0xffffff
+#define Frac_mask1 0xffffff
+#define Bletch 4
+#define Ten_pmax 22
+#define Bndry_mask  0xefffff
+#define Bndry_mask1 0xffffff
+#define LSB 1
+#define Sign_bit 0x80000000
+#define Log2P 4
+#define Tiny0 0x100000
+#define Tiny1 0
+#define Quick_max 14
+#define Int_max 15
+#else /* VAX */
+#define Exp_shift  23
+#define Exp_shift1 7
+#define Exp_msk1    0x80
+#define Exp_msk11   0x800000
+#define Exp_mask  0x7f80
+#define P 56
+#define Bias 129
+#define Exp_1  0x40800000
+#define Exp_11 0x4080
+#define Ebits 8
+#define Frac_mask  0x7fffff
+#define Frac_mask1 0xffff007f
+#define Ten_pmax 24
+#define Bletch 2
+#define Bndry_mask  0xffff007f
+#define Bndry_mask1 0xffff007f
+#define LSB 0x10000
+#define Sign_bit 0x8000
+#define Log2P 1
+#define Tiny0 0x80
+#define Tiny1 0
+#define Quick_max 15
+#define Int_max 15
+#endif
+#endif
+
+#ifndef IEEE_Arith
+#define ROUND_BIASED
+#endif
+
+#ifdef RND_PRODQUOT
+#define rounded_product(a,b) a = rnd_prod(a, b)
+#define rounded_quotient(a,b) a = rnd_quot(a, b)
+#ifdef KR_headers
+extern double rnd_prod(), rnd_quot();
+#else
+extern double rnd_prod(double, double), rnd_quot(double, double);
+#endif
+#else
+#define rounded_product(a,b) a *= b
+#define rounded_quotient(a,b) a /= b
+#endif
+
+#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
+#define Big1 0xffffffff
+
+#ifndef Just_16
+/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.
+ * This makes some inner loops simpler and sometimes saves work
+ * during multiplications, but it often seems to make things slightly
+ * slower.  Hence the default is now to store 32 bits per Long.
+ */
+#ifndef Pack_32
+#define Pack_32
+#endif
+#endif
+
+#define Kmax 15
+
+#ifdef __cplusplus
+extern "C" double strtod(const char *s00, char **se);
+extern "C" char *__dtoa(double d, int mode, int ndigits,
+                        int *decpt, int *sign, char **rve);
+#endif
+
+ struct
+Bigint {
+        struct Bigint *next;
+        int k, maxwds, sign, wds;
+        ULong x[1];
+        };
+
+ typedef struct Bigint Bigint;
+
+ static Bigint *freelist[Kmax+1];
+
+ static Bigint *
+Balloc
+#ifdef KR_headers
+        (k) int k;
+#else
+        (int k)
+#endif
+{
+        int x;
+        Bigint *rv;
+
+        if (rv = freelist[k]) {
+                freelist[k] = rv->next;
+                }
+        else {
+                x = 1 << k;
+                rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(Long));
+                rv->k = k;
+                rv->maxwds = x;
+                }
+        rv->sign = rv->wds = 0;
+        return rv;
+        }
+
+ static void
+Bfree
+#ifdef KR_headers
+        (v) Bigint *v;
+#else
+        (Bigint *v)
+#endif
+{
+        if (v) {
+                v->next = freelist[v->k];
+                freelist[v->k] = v;
+                }
+        }
+
+#define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
+y->wds*sizeof(Long) + 2*sizeof(int))
+
+ static Bigint *
+multadd
+#ifdef KR_headers
+        (b, m, a) Bigint *b; int m, a;
+#else
+        (Bigint *b, int m, int a)       /* multiply by m and add a */
+#endif
+{
+        int i, wds;
+        ULong *x, y;
+#ifdef Pack_32
+        ULong xi, z;
+#endif
+        Bigint *b1;
+
+        wds = b->wds;
+        x = b->x;
+        i = 0;
+        do {
+#ifdef Pack_32
+                xi = *x;
+                y = (xi & 0xffff) * m + a;
+                z = (xi >> 16) * m + (y >> 16);
+                a = (int)(z >> 16);
+                *x++ = (z << 16) + (y & 0xffff);
+#else
+                y = *x * m + a;
+                a = (int)(y >> 16);
+                *x++ = y & 0xffff;
+#endif
+                }
+                while(++i < wds);
+        if (a) {
+                if (wds >= b->maxwds) {
+                        b1 = Balloc(b->k+1);
+                        Bcopy(b1, b);
+                        Bfree(b);
+                        b = b1;
+                        }
+                b->x[wds++] = a;
+                b->wds = wds;
+                }
+        return b;
+        }
+
+ static Bigint *
+s2b
+#ifdef KR_headers
+        (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
+#else
+        (CONST char *s, int nd0, int nd, ULong y9)
+#endif
+{
+        Bigint *b;
+        int i, k;
+        Long x, y;
+
+        x = (nd + 8) / 9;
+        for(k = 0, y = 1; x > y; y <<= 1, k++) ;
+#ifdef Pack_32
+        b = Balloc(k);
+        b->x[0] = y9;
+        b->wds = 1;
+#else
+        b = Balloc(k+1);
+        b->x[0] = y9 & 0xffff;
+        b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
+#endif
+
+        i = 9;
+        if (9 < nd0) {
+                s += 9;
+                do b = multadd(b, 10, *s++ - '0');
+                        while(++i < nd0);
+                s++;
+                }
+        else
+                s += 10;
+        for(; i < nd; i++)
+                b = multadd(b, 10, *s++ - '0');
+        return b;
+        }
+
+ static int
+hi0bits
+#ifdef KR_headers
+        (x) register ULong x;
+#else
+        (register ULong x)
+#endif
+{
+        register int k = 0;
+
+        if (!(x & 0xffff0000)) {
+                k = 16;
+                x <<= 16;
+                }
+        if (!(x & 0xff000000)) {
+                k += 8;
+                x <<= 8;
+                }
+        if (!(x & 0xf0000000)) {
+                k += 4;
+                x <<= 4;
+                }
+        if (!(x & 0xc0000000)) {
+                k += 2;
+                x <<= 2;
+                }
+        if (!(x & 0x80000000)) {
+                k++;
+                if (!(x & 0x40000000))
+                        return 32;
+                }
+        return k;
+        }
+
+ static int
+lo0bits
+#ifdef KR_headers
+        (y) ULong *y;
+#else
+        (ULong *y)
+#endif
+{
+        register int k;
+        register ULong x = *y;
+
+        if (x & 7) {
+                if (x & 1)
+                        return 0;
+                if (x & 2) {
+                        *y = x >> 1;
+                        return 1;
+                        }
+                *y = x >> 2;
+                return 2;
+                }
+        k = 0;
+        if (!(x & 0xffff)) {
+                k = 16;
+                x >>= 16;
+                }
+        if (!(x & 0xff)) {
+                k += 8;
+                x >>= 8;
+                }
+        if (!(x & 0xf)) {
+                k += 4;
+                x >>= 4;
+                }
+        if (!(x & 0x3)) {
+                k += 2;
+                x >>= 2;
+                }
+        if (!(x & 1)) {
+                k++;
+                x >>= 1;
+                if (!x & 1)
+                        return 32;
+                }
+        *y = x;
+        return k;
+        }
+
+ static Bigint *
+i2b
+#ifdef KR_headers
+        (i) int i;
+#else
+        (int i)
+#endif
+{
+        Bigint *b;
+
+        b = Balloc(1);
+        b->x[0] = i;
+        b->wds = 1;
+        return b;
+        }
+
+ static Bigint *
+mult
+#ifdef KR_headers
+        (a, b) Bigint *a, *b;
+#else
+        (Bigint *a, Bigint *b)
+#endif
+{
+        Bigint *c;
+        int k, wa, wb, wc;
+        ULong carry, y, z;
+        ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
+#ifdef Pack_32
+        ULong z2;
+#endif
+
+        if (a->wds < b->wds) {
+                c = a;
+                a = b;
+                b = c;
+                }
+        k = a->k;
+        wa = a->wds;
+        wb = b->wds;
+        wc = wa + wb;
+        if (wc > a->maxwds)
+                k++;
+        c = Balloc(k);
+        for(x = c->x, xa = x + wc; x < xa; x++)
+                *x = 0;
+        xa = a->x;
+        xae = xa + wa;
+        xb = b->x;
+        xbe = xb + wb;
+        xc0 = c->x;
+#ifdef Pack_32
+        for(; xb < xbe; xb++, xc0++) {
+                if (y = *xb & 0xffff) {
+                        x = xa;
+                        xc = xc0;
+                        carry = 0;
+                        do {
+                                z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
+                                carry = z >> 16;
+                                z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
+                                carry = z2 >> 16;
+                                Storeinc(xc, z2, z);
+                                }
+                                while(x < xae);
+                        *xc = carry;
+                        }
+                if (y = *xb >> 16) {
+                        x = xa;
+                        xc = xc0;
+                        carry = 0;
+                        z2 = *xc;
+                        do {
+                                z = (*x & 0xffff) * y + (*xc >> 16) + carry;
+                                carry = z >> 16;
+                                Storeinc(xc, z, z2);
+                                z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
+                                carry = z2 >> 16;
+                                }
+                                while(x < xae);
+                        *xc = z2;
+                        }
+                }
+#else
+        for(; xb < xbe; xc0++) {
+                if (y = *xb++) {
+                        x = xa;
+                        xc = xc0;
+                        carry = 0;
+                        do {
+                                z = *x++ * y + *xc + carry;
+                                carry = z >> 16;
+                                *xc++ = z & 0xffff;
+                                }
+                                while(x < xae);
+                        *xc = carry;
+                        }
+                }
+#endif
+        for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
+        c->wds = wc;
+        return c;
+        }
+
+ static Bigint *p5s;
+
+ static Bigint *
+pow5mult
+#ifdef KR_headers
+        (b, k) Bigint *b; int k;
+#else
+        (Bigint *b, int k)
+#endif
+{
+        Bigint *b1, *p5, *p51;
+        int i;
+        static int p05[3] = { 5, 25, 125 };
+
+        if (i = k & 3)
+                b = multadd(b, p05[i-1], 0);
+
+        if (!(k >>= 2))
+                return b;
+        if (!(p5 = p5s)) {
+                /* first time */
+                p5 = p5s = i2b(625);
+                p5->next = 0;
+                }
+        for(;;) {
+                if (k & 1) {
+                        b1 = mult(b, p5);
+                        Bfree(b);
+                        b = b1;
+                        }
+                if (!(k >>= 1))
+                        break;
+                if (!(p51 = p5->next)) {
+                        p51 = p5->next = mult(p5,p5);
+                        p51->next = 0;
+                        }
+                p5 = p51;
+                }
+        return b;
+        }
+
+ static Bigint *
+lshift
+#ifdef KR_headers
+        (b, k) Bigint *b; int k;
+#else
+        (Bigint *b, int k)
+#endif
+{
+        int i, k1, n, n1;
+        Bigint *b1;
+        ULong *x, *x1, *xe, z;
+
+#ifdef Pack_32
+        n = k >> 5;
+#else
+        n = k >> 4;
+#endif
+        k1 = b->k;
+        n1 = n + b->wds + 1;
+        for(i = b->maxwds; n1 > i; i <<= 1)
+                k1++;
+        b1 = Balloc(k1);
+        x1 = b1->x;
+        for(i = 0; i < n; i++)
+                *x1++ = 0;
+        x = b->x;
+        xe = x + b->wds;
+#ifdef Pack_32
+        if (k &= 0x1f) {
+                k1 = 32 - k;
+                z = 0;
+                do {
+                        *x1++ = *x << k | z;
+                        z = *x++ >> k1;
+                        }
+                        while(x < xe);
+                if (*x1 = z)
+                        ++n1;
+                }
+#else
+        if (k &= 0xf) {
+                k1 = 16 - k;
+                z = 0;
+                do {
+                        *x1++ = *x << k  & 0xffff | z;
+                        z = *x++ >> k1;
+                        }
+                        while(x < xe);
+                if (*x1 = z)
+                        ++n1;
+                }
+#endif
+        else do
+                *x1++ = *x++;
+                while(x < xe);
+        b1->wds = n1 - 1;
+        Bfree(b);
+        return b1;
+        }
+
+ static int
+cmp
+#ifdef KR_headers
+        (a, b) Bigint *a, *b;
+#else
+        (Bigint *a, Bigint *b)
+#endif
+{
+        ULong *xa, *xa0, *xb, *xb0;
+        int i, j;
+
+        i = a->wds;
+        j = b->wds;
+#ifdef DEBUG
+        if (i > 1 && !a->x[i-1])
+                Bug("cmp called with a->x[a->wds-1] == 0");
+        if (j > 1 && !b->x[j-1])
+                Bug("cmp called with b->x[b->wds-1] == 0");
+#endif
+        if (i -= j)
+                return i;
+        xa0 = a->x;
+        xa = xa0 + j;
+        xb0 = b->x;
+        xb = xb0 + j;
+        for(;;) {
+                if (*--xa != *--xb)
+                        return *xa < *xb ? -1 : 1;
+                if (xa <= xa0)
+                        break;
+                }
+        return 0;
+        }
+
+ static Bigint *
+diff
+#ifdef KR_headers
+        (a, b) Bigint *a, *b;
+#else
+        (Bigint *a, Bigint *b)
+#endif
+{
+        Bigint *c;
+        int i, wa, wb;
+        Long borrow, y; /* We need signed shifts here. */
+        ULong *xa, *xae, *xb, *xbe, *xc;
+#ifdef Pack_32
+        Long z;
+#endif
+
+        i = cmp(a,b);
+        if (!i) {
+                c = Balloc(0);
+                c->wds = 1;
+                c->x[0] = 0;
+                return c;
+                }
+        if (i < 0) {
+                c = a;
+                a = b;
+                b = c;
+                i = 1;
+                }
+        else
+                i = 0;
+        c = Balloc(a->k);
+        c->sign = i;
+        wa = a->wds;
+        xa = a->x;
+        xae = xa + wa;
+        wb = b->wds;
+        xb = b->x;
+        xbe = xb + wb;
+        xc = c->x;
+        borrow = 0;
+#ifdef Pack_32
+        do {
+                y = (*xa & 0xffff) - (*xb & 0xffff) + borrow;
+                borrow = y >> 16;
+                Sign_Extend(borrow, y);
+                z = (*xa++ >> 16) - (*xb++ >> 16) + borrow;
+                borrow = z >> 16;
+                Sign_Extend(borrow, z);
+                Storeinc(xc, z, y);
+                }
+                while(xb < xbe);
+        while(xa < xae) {
+                y = (*xa & 0xffff) + borrow;
+                borrow = y >> 16;
+                Sign_Extend(borrow, y);
+                z = (*xa++ >> 16) + borrow;
+                borrow = z >> 16;
+                Sign_Extend(borrow, z);
+                Storeinc(xc, z, y);
+                }
+#else
+        do {
+                y = *xa++ - *xb++ + borrow;
+                borrow = y >> 16;
+                Sign_Extend(borrow, y);
+                *xc++ = y & 0xffff;
+                }
+                while(xb < xbe);
+        while(xa < xae) {
+                y = *xa++ + borrow;
+                borrow = y >> 16;
+                Sign_Extend(borrow, y);
+                *xc++ = y & 0xffff;
+                }
+#endif
+        while(!*--xc)
+                wa--;
+        c->wds = wa;
+        return c;
+        }
+
+ static double
+ulp
+#ifdef KR_headers
+        (_x) double _x;
+#else
+        (double _x)
+#endif
+{
+        _double x;
+        register Long L;
+        _double a;
+
+        value(x) = _x;
+        L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
+#ifndef Sudden_Underflow
+        if (L > 0) {
+#endif
+#ifdef IBM
+                L |= Exp_msk1 >> 4;
+#endif
+                word0(a) = L;
+                word1(a) = 0;
+#ifndef Sudden_Underflow
+                }
+        else {
+                L = -L >> Exp_shift;
+                if (L < Exp_shift) {
+                        word0(a) = 0x80000 >> L;
+                        word1(a) = 0;
+                        }
+                else {
+                        word0(a) = 0;
+                        L -= Exp_shift;
+                        word1(a) = L >= 31 ? 1 : 1 << 31 - L;
+                        }
+                }
+#endif
+        return value(a);
+        }
+
+ static double
+b2d
+#ifdef KR_headers
+        (a, e) Bigint *a; int *e;
+#else
+        (Bigint *a, int *e)
+#endif
+{
+        ULong *xa, *xa0, w, y, z;
+        int k;
+        _double d;
+#ifdef VAX
+        ULong d0, d1;
+#else
+#define d0 word0(d)
+#define d1 word1(d)
+#endif
+
+        xa0 = a->x;
+        xa = xa0 + a->wds;
+        y = *--xa;
+#ifdef DEBUG
+        if (!y) Bug("zero y in b2d");
+#endif
+        k = hi0bits(y);
+        *e = 32 - k;
+#ifdef Pack_32
+        if (k < Ebits) {
+                d0 = Exp_1 | y >> Ebits - k;
+                w = xa > xa0 ? *--xa : 0;
+                d1 = y << (32-Ebits) + k | w >> Ebits - k;
+                goto ret_d;
+                }
+        z = xa > xa0 ? *--xa : 0;
+        if (k -= Ebits) {
+                d0 = Exp_1 | y << k | z >> 32 - k;
+                y = xa > xa0 ? *--xa : 0;
+                d1 = z << k | y >> 32 - k;
+                }
+        else {
+                d0 = Exp_1 | y;
+                d1 = z;
+                }
+#else
+        if (k < Ebits + 16) {
+                z = xa > xa0 ? *--xa : 0;
+                d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
+                w = xa > xa0 ? *--xa : 0;
+                y = xa > xa0 ? *--xa : 0;
+                d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
+                goto ret_d;
+                }
+        z = xa > xa0 ? *--xa : 0;
+        w = xa > xa0 ? *--xa : 0;
+        k -= Ebits + 16;
+        d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
+        y = xa > xa0 ? *--xa : 0;
+        d1 = w << k + 16 | y << k;
+#endif
+ ret_d:
+#ifdef VAX
+        word0(d) = d0 >> 16 | d0 << 16;
+        word1(d) = d1 >> 16 | d1 << 16;
+#else
+#undef d0
+#undef d1
+#endif
+        return value(d);
+        }
+
+ static Bigint *
+d2b
+#ifdef KR_headers
+        (_d, e, bits) double d; int *e, *bits;
+#else
+        (double _d, int *e, int *bits)
+#endif
+{
+        Bigint *b;
+        int de, i, k;
+        ULong *x, y, z;
+        _double d;
+#ifdef VAX
+        ULong d0, d1;
+#endif
+
+        value(d) = _d;
+#ifdef VAX
+        d0 = word0(d) >> 16 | word0(d) << 16;
+        d1 = word1(d) >> 16 | word1(d) << 16;
+#else
+#define d0 word0(d)
+#define d1 word1(d)
+#endif
+
+#ifdef Pack_32
+        b = Balloc(1);
+#else
+        b = Balloc(2);
+#endif
+        x = b->x;
+
+        z = d0 & Frac_mask;
+        d0 &= 0x7fffffff;       /* clear sign bit, which we ignore */
+#ifdef Sudden_Underflow
+        de = (int)(d0 >> Exp_shift);
+#ifndef IBM
+        z |= Exp_msk11;
+#endif
+#else
+        if (de = (int)(d0 >> Exp_shift))
+                z |= Exp_msk1;
+#endif
+#ifdef Pack_32
+        if (y = d1) {
+                if (k = lo0bits(&y)) {
+                        x[0] = y | z << 32 - k;
+                        z >>= k;
+                        }
+                else
+                        x[0] = y;
+                i = b->wds = (x[1] = z) ? 2 : 1;
+                }
+        else {
+#ifdef DEBUG
+                if (!z)
+                        Bug("Zero passed to d2b");
+#endif
+                k = lo0bits(&z);
+                x[0] = z;
+                i = b->wds = 1;
+                k += 32;
+                }
+#else
+        if (y = d1) {
+                if (k = lo0bits(&y))
+                        if (k >= 16) {
+                                x[0] = y | z << 32 - k & 0xffff;
+                                x[1] = z >> k - 16 & 0xffff;
+                                x[2] = z >> k;
+                                i = 2;
+                                }
+                        else {
+                                x[0] = y & 0xffff;
+                                x[1] = y >> 16 | z << 16 - k & 0xffff;
+                                x[2] = z >> k & 0xffff;
+                                x[3] = z >> k+16;
+                                i = 3;
+                                }
+                else {
+                        x[0] = y & 0xffff;
+                        x[1] = y >> 16;
+                        x[2] = z & 0xffff;
+                        x[3] = z >> 16;
+                        i = 3;
+                        }
+                }
+        else {
+#ifdef DEBUG
+                if (!z)
+                        Bug("Zero passed to d2b");
+#endif
+                k = lo0bits(&z);
+                if (k >= 16) {
+                        x[0] = z;
+                        i = 0;
+                        }
+                else {
+                        x[0] = z & 0xffff;
+                        x[1] = z >> 16;
+                        i = 1;
+                        }
+                k += 32;
+                }
+        while(!x[i])
+                --i;
+        b->wds = i + 1;
+#endif
+#ifndef Sudden_Underflow
+        if (de) {
+#endif
+#ifdef IBM
+                *e = (de - Bias - (P-1) << 2) + k;
+                *bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_mask);
+#else
+                *e = de - Bias - (P-1) + k;
+                *bits = P - k;
+#endif
+#ifndef Sudden_Underflow
+                }
+        else {
+                *e = de - Bias - (P-1) + 1 + k;
+#ifdef Pack_32
+                *bits = 32*i - hi0bits(x[i-1]);
+#else
+                *bits = (i+2)*16 - hi0bits(x[i]);
+#endif
+                }
+#endif
+        return b;
+        }
+#undef d0
+#undef d1
+
+ static double
+ratio
+#ifdef KR_headers
+        (a, b) Bigint *a, *b;
+#else
+        (Bigint *a, Bigint *b)
+#endif
+{
+        _double da, db;
+        int k, ka, kb;
+
+        value(da) = b2d(a, &ka);
+        value(db) = b2d(b, &kb);
+#ifdef Pack_32
+        k = ka - kb + 32*(a->wds - b->wds);
+#else
+        k = ka - kb + 16*(a->wds - b->wds);
+#endif
+#ifdef IBM
+        if (k > 0) {
+                word0(da) += (k >> 2)*Exp_msk1;
+                if (k &= 3)
+                        da *= 1 << k;
+                }
+        else {
+                k = -k;
+                word0(db) += (k >> 2)*Exp_msk1;
+                if (k &= 3)
+                        db *= 1 << k;
+                }
+#else
+        if (k > 0)
+                word0(da) += k*Exp_msk1;
+        else {
+                k = -k;
+                word0(db) += k*Exp_msk1;
+                }
+#endif
+        return value(da) / value(db);
+        }
+
+static CONST double
+tens[] = {
+                1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
+                1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
+                1e20, 1e21, 1e22
+#ifdef VAX
+                , 1e23, 1e24
+#endif
+                };
+
+#ifdef IEEE_Arith
+static CONST double bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
+static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 };
+#define n_bigtens 5
+#else
+#ifdef IBM
+static CONST double bigtens[] = { 1e16, 1e32, 1e64 };
+static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64 };
+#define n_bigtens 3
+#else
+static CONST double bigtens[] = { 1e16, 1e32 };
+static CONST double tinytens[] = { 1e-16, 1e-32 };
+#define n_bigtens 2
+#endif
+#endif
+
+ double
+strtod
+#ifdef KR_headers
+        (s00, se) CONST char *s00; char **se;
+#else
+        (CONST char *s00, char **se)
+#endif
+{
+        int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
+                 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
+        CONST char *s, *s0, *s1;
+        double aadj, aadj1, adj;
+        _double rv, rv0;
+        Long L;
+        ULong y, z;
+        Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
+
+#ifndef KR_headers
+        CONST char decimal_point = localeconv()->decimal_point[0];
+#else
+        CONST char decimal_point = '.';
+#endif
+
+        sign = nz0 = nz = 0;
+        value(rv) = 0.;
+
+
+        for(s = s00; isspace((unsigned char) *s); s++)
+                ;
+
+        if (*s == '-') {
+                sign = 1;
+                s++;
+        } else if (*s == '+') {
+                s++;
+        }
+
+        if (*s == '\0') {
+                s = s00;
+                goto ret;
+        }
+
+        if (*s == '0') {
+                nz0 = 1;
+                while(*++s == '0') ;
+                if (!*s)
+                        goto ret;
+                }
+        s0 = s;
+        y = z = 0;
+        for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
+                if (nd < 9)
+                        y = 10*y + c - '0';
+                else if (nd < 16)
+                        z = 10*z + c - '0';
+        nd0 = nd;
+        if (c == decimal_point) {
+                c = *++s;
+                if (!nd) {
+                        for(; c == '0'; c = *++s)
+                                nz++;
+                        if (c > '0' && c <= '9') {
+                                s0 = s;
+                                nf += nz;
+                                nz = 0;
+                                goto have_dig;
+                                }
+                        goto dig_done;
+                        }
+                for(; c >= '0' && c <= '9'; c = *++s) {
+ have_dig:
+                        nz++;
+                        if (c -= '0') {
+                                nf += nz;
+                                for(i = 1; i < nz; i++)
+                                        if (nd++ < 9)
+                                                y *= 10;
+                                        else if (nd <= DBL_DIG + 1)
+                                                z *= 10;
+                                if (nd++ < 9)
+                                        y = 10*y + c;
+                                else if (nd <= DBL_DIG + 1)
+                                        z = 10*z + c;
+                                nz = 0;
+                                }
+                        }
+                }
+ dig_done:
+        e = 0;
+        if (c == 'e' || c == 'E') {
+                if (!nd && !nz && !nz0) {
+                        s = s00;
+                        goto ret;
+                        }
+                s00 = s;
+                esign = 0;
+                switch(c = *++s) {
+                        case '-':
+                                esign = 1;
+                        case '+':
+                                c = *++s;
+                        }
+                if (c >= '0' && c <= '9') {
+                        while(c == '0')
+                                c = *++s;
+                        if (c > '0' && c <= '9') {
+                                L = c - '0';
+                                s1 = s;
+                                while((c = *++s) >= '0' && c <= '9')
+                                        L = 10*L + c - '0';
+                                if (s - s1 > 8 || L > 19999)
+                                        /* Avoid confusion from exponents
+                                         * so large that e might overflow.
+                                         */
+                                        e = 19999; /* safe for 16 bit ints */
+                                else
+                                        e = (int)L;
+                                if (esign)
+                                        e = -e;
+                                }
+                        else
+                                e = 0;
+                        }
+                else
+                        s = s00;
+                }
+        if (!nd) {
+                if (!nz && !nz0)
+                        s = s00;
+                goto ret;
+                }
+        e1 = e -= nf;
+
+        /* Now we have nd0 digits, starting at s0, followed by a
+         * decimal point, followed by nd-nd0 digits.  The number we're
+         * after is the integer represented by those digits times
+         * 10**e */
+
+        if (!nd0)
+                nd0 = nd;
+        k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
+        value(rv) = y;
+        if (k > 9)
+                value(rv) = tens[k - 9] * value(rv) + z;
+        bd0 = 0;
+        if (nd <= DBL_DIG
+#ifndef RND_PRODQUOT
+                && FLT_ROUNDS == 1
+#endif
+                        ) {
+                if (!e)
+                        goto ret;
+                if (e > 0) {
+                        if (e <= Ten_pmax) {
+#ifdef VAX
+                                goto vax_ovfl_check;
+#else
+                                /* value(rv) = */ rounded_product(value(rv),
+                                    tens[e]);
+                                goto ret;
+#endif
+                                }
+                        i = DBL_DIG - nd;
+                        if (e <= Ten_pmax + i) {
+                                /* A fancier test would sometimes let us do
+                                 * this for larger i values.
+                                 */
+                                e -= i;
+                                value(rv) *= tens[i];
+#ifdef VAX
+                                /* VAX exponent range is so narrow we must
+                                 * worry about overflow here...
+                                 */
+ vax_ovfl_check:
+                                word0(rv) -= P*Exp_msk1;
+                                /* value(rv) = */ rounded_product(value(rv),
+                                    tens[e]);
+                                if ((word0(rv) & Exp_mask)
+                                 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
+                                        goto ovfl;
+                                word0(rv) += P*Exp_msk1;
+#else
+                                /* value(rv) = */ rounded_product(value(rv),
+                                    tens[e]);
+#endif
+                                goto ret;
+                                }
+                        }
+#ifndef Inaccurate_Divide
+                else if (e >= -Ten_pmax) {
+                        /* value(rv) = */ rounded_quotient(value(rv),
+                            tens[-e]);
+                        goto ret;
+                        }
+#endif
+                }
+        e1 += nd - k;
+
+        /* Get starting approximation = rv * 10**e1 */
+
+        if (e1 > 0) {
+                if (i = e1 & 15)
+                        value(rv) *= tens[i];
+                if (e1 &= ~15) {
+                        if (e1 > DBL_MAX_10_EXP) {
+ ovfl:
+                                errno = ERANGE;
+#ifdef __STDC__
+                                value(rv) = HUGE_VAL;
+#else
+                                /* Can't trust HUGE_VAL */
+#ifdef IEEE_Arith
+                                word0(rv) = Exp_mask;
+                                word1(rv) = 0;
+#else
+                                word0(rv) = Big0;
+                                word1(rv) = Big1;
+#endif
+#endif
+                                if (bd0)
+                                        goto retfree;
+                                goto ret;
+                                }
+                        if (e1 >>= 4) {
+                                for(j = 0; e1 > 1; j++, e1 >>= 1)
+                                        if (e1 & 1)
+                                                value(rv) *= bigtens[j];
+                        /* The last multiplication could overflow. */
+                                word0(rv) -= P*Exp_msk1;
+                                value(rv) *= bigtens[j];
+                                if ((z = word0(rv) & Exp_mask)
+                                 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
+                                        goto ovfl;
+                                if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
+                                        /* set to largest number */
+                                        /* (Can't trust DBL_MAX) */
+                                        word0(rv) = Big0;
+                                        word1(rv) = Big1;
+                                        }
+                                else
+                                        word0(rv) += P*Exp_msk1;
+                                }
+
+                        }
+                }
+        else if (e1 < 0) {
+                e1 = -e1;
+                if (i = e1 & 15)
+                        value(rv) /= tens[i];
+                if (e1 &= ~15) {
+                        e1 >>= 4;
+                        if (e1 >= 1 << n_bigtens)
+                                goto undfl;
+                        for(j = 0; e1 > 1; j++, e1 >>= 1)
+                                if (e1 & 1)
+                                        value(rv) *= tinytens[j];
+                        /* The last multiplication could underflow. */
+                        value(rv0) = value(rv);
+                        value(rv) *= tinytens[j];
+                        if (!value(rv)) {
+                                value(rv) = 2.*value(rv0);
+                                value(rv) *= tinytens[j];
+                                if (!value(rv)) {
+ undfl:
+                                        value(rv) = 0.;
+                                        errno = ERANGE;
+                                        if (bd0)
+                                                goto retfree;
+                                        goto ret;
+                                        }
+                                word0(rv) = Tiny0;
+                                word1(rv) = Tiny1;
+                                /* The refinement below will clean
+                                 * this approximation up.
+                                 */
+                                }
+                        }
+                }
+
+        /* Now the hard part -- adjusting rv to the correct value.*/
+
+        /* Put digits into bd: true value = bd * 10^e */
+
+        bd0 = s2b(s0, nd0, nd, y);
+
+        for(;;) {
+                bd = Balloc(bd0->k);
+                Bcopy(bd, bd0);
+                bb = d2b(value(rv), &bbe, &bbbits);     /* rv = bb * 2^bbe */
+                bs = i2b(1);
+
+                if (e >= 0) {
+                        bb2 = bb5 = 0;
+                        bd2 = bd5 = e;
+                        }
+                else {
+                        bb2 = bb5 = -e;
+                        bd2 = bd5 = 0;
+                        }
+                if (bbe >= 0)
+                        bb2 += bbe;
+                else
+                        bd2 -= bbe;
+                bs2 = bb2;
+#ifdef Sudden_Underflow
+#ifdef IBM
+                j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) & 3);
+#else
+                j = P + 1 - bbbits;
+#endif
+#else
+                i = bbe + bbbits - 1;   /* logb(rv) */
+                if (i < Emin)   /* denormal */
+                        j = bbe + (P-Emin);
+                else
+                        j = P + 1 - bbbits;
+#endif
+                bb2 += j;
+                bd2 += j;
+                i = bb2 < bd2 ? bb2 : bd2;
+                if (i > bs2)
+                        i = bs2;
+                if (i > 0) {
+                        bb2 -= i;
+                        bd2 -= i;
+                        bs2 -= i;
+                        }
+                if (bb5 > 0) {
+                        bs = pow5mult(bs, bb5);
+                        bb1 = mult(bs, bb);
+                        Bfree(bb);
+                        bb = bb1;
+                        }
+                if (bb2 > 0)
+                        bb = lshift(bb, bb2);
+                if (bd5 > 0)
+                        bd = pow5mult(bd, bd5);
+                if (bd2 > 0)
+                        bd = lshift(bd, bd2);
+                if (bs2 > 0)
+                        bs = lshift(bs, bs2);
+                delta = diff(bb, bd);
+                dsign = delta->sign;
+                delta->sign = 0;
+                i = cmp(delta, bs);
+                if (i < 0) {
+                        /* Error is less than half an ulp -- check for
+                         * special case of mantissa a power of two.
+                         */
+                        if (dsign || word1(rv) || word0(rv) & Bndry_mask)
+                                break;
+                        delta = lshift(delta,Log2P);
+                        if (cmp(delta, bs) > 0)
+                                goto drop_down;
+                        break;
+                        }
+                if (i == 0) {
+                        /* exactly half-way between */
+                        if (dsign) {
+                                if ((word0(rv) & Bndry_mask1) == Bndry_mask1
+                                 &&  word1(rv) == 0xffffffff) {
+                                        /*boundary case -- increment exponent*/
+                                        word0(rv) = (word0(rv) & Exp_mask)
+                                                + Exp_msk1
+#ifdef IBM
+                                                | Exp_msk1 >> 4
+#endif
+                                                ;
+                                        word1(rv) = 0;
+                                        break;
+                                        }
+                                }
+                        else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
+ drop_down:
+                                /* boundary case -- decrement exponent */
+#ifdef Sudden_Underflow
+                                L = word0(rv) & Exp_mask;
+#ifdef IBM
+                                if (L <  Exp_msk1)
+#else
+                                if (L <= Exp_msk1)
+#endif
+                                        goto undfl;
+                                L -= Exp_msk1;
+#else
+                                L = (word0(rv) & Exp_mask) - Exp_msk1;
+#endif
+                                word0(rv) = L | Bndry_mask1;
+                                word1(rv) = 0xffffffff;
+#ifdef IBM
+                                goto cont;
+#else
+                                break;
+#endif
+                                }
+#ifndef ROUND_BIASED
+                        if (!(word1(rv) & LSB))
+                                break;
+#endif
+                        if (dsign)
+                                value(rv) += ulp(value(rv));
+#ifndef ROUND_BIASED
+                        else {
+                                value(rv) -= ulp(value(rv));
+#ifndef Sudden_Underflow
+                                if (!value(rv))
+                                        goto undfl;
+#endif
+                                }
+#endif
+                        break;
+                        }
+                if ((aadj = ratio(delta, bs)) <= 2.) {
+                        if (dsign)
+                                aadj = aadj1 = 1.;
+                        else if (word1(rv) || word0(rv) & Bndry_mask) {
+#ifndef Sudden_Underflow
+                                if (word1(rv) == Tiny1 && !word0(rv))
+                                        goto undfl;
+#endif
+                                aadj = 1.;
+                                aadj1 = -1.;
+                                }
+                        else {
+                                /* special case -- power of FLT_RADIX to be */
+                                /* rounded down... */
+
+                                if (aadj < 2./FLT_RADIX)
+                                        aadj = 1./FLT_RADIX;
+                                else
+                                        aadj *= 0.5;
+                                aadj1 = -aadj;
+                                }
+                        }
+                else {
+                        aadj *= 0.5;
+                        aadj1 = dsign ? aadj : -aadj;
+#ifdef Check_FLT_ROUNDS
+                        switch(FLT_ROUNDS) {
+                                case 2: /* towards +infinity */
+                                        aadj1 -= 0.5;
+                                        break;
+                                case 0: /* towards 0 */
+                                case 3: /* towards -infinity */
+                                        aadj1 += 0.5;
+                                }
+#else
+                        if (FLT_ROUNDS == 0)
+                                aadj1 += 0.5;
+#endif
+                        }
+                y = word0(rv) & Exp_mask;
+
+                /* Check for overflow */
+
+                if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
+                        value(rv0) = value(rv);
+                        word0(rv) -= P*Exp_msk1;
+                        adj = aadj1 * ulp(value(rv));
+                        value(rv) += adj;
+                        if ((word0(rv) & Exp_mask) >=
+                                        Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
+                                if (word0(rv0) == Big0 && word1(rv0) == Big1)
+                                        goto ovfl;
+                                word0(rv) = Big0;
+                                word1(rv) = Big1;
+                                goto cont;
+                                }
+                        else
+                                word0(rv) += P*Exp_msk1;
+                        }
+                else {
+#ifdef Sudden_Underflow
+                        if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
+                                value(rv0) = value(rv);
+                                word0(rv) += P*Exp_msk1;
+                                adj = aadj1 * ulp(value(rv));
+                                value(rv) += adj;
+#ifdef IBM
+                                if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
+#else
+                                if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
+#endif
+                                        {
+                                        if (word0(rv0) == Tiny0
+                                         && word1(rv0) == Tiny1)
+                                                goto undfl;
+                                        word0(rv) = Tiny0;
+                                        word1(rv) = Tiny1;
+                                        goto cont;
+                                        }
+                                else
+                                        word0(rv) -= P*Exp_msk1;
+                                }
+                        else {
+                                adj = aadj1 * ulp(value(rv));
+                                value(rv) += adj;
+                                }
+#else
+                        /* Compute adj so that the IEEE rounding rules will
+                         * correctly round rv + adj in some half-way cases.
+                         * If rv * ulp(rv) is denormalized (i.e.,
+                         * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
+                         * trouble from bits lost to denormalization;
+                         * example: 1.2e-307 .
+                         */
+                        if (y <= (P-1)*Exp_msk1 && aadj >= 1.) {
+                                aadj1 = (double)(int)(aadj + 0.5);
+                                if (!dsign)
+                                        aadj1 = -aadj1;
+                                }
+                        adj = aadj1 * ulp(value(rv));
+                        value(rv) += adj;
+#endif
+                        }
+                z = word0(rv) & Exp_mask;
+                if (y == z) {
+                        /* Can we stop now? */
+                        L = aadj;
+                        aadj -= L;
+                        /* The tolerances below are conservative. */
+                        if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
+                                if (aadj < .4999999 || aadj > .5000001)
+                                        break;
+                                }
+                        else if (aadj < .4999999/FLT_RADIX)
+                                break;
+                        }
+ cont:
+                Bfree(bb);
+                Bfree(bd);
+                Bfree(bs);
+                Bfree(delta);
+                }
+ retfree:
+        Bfree(bb);
+        Bfree(bd);
+        Bfree(bs);
+        Bfree(bd0);
+        Bfree(delta);
+ ret:
+        if (se)
+                *se = (char *)s;
+        return sign ? -value(rv) : value(rv);
+        }
+
+ static int
+quorem
+#ifdef KR_headers
+        (b, S) Bigint *b, *S;
+#else
+        (Bigint *b, Bigint *S)
+#endif
+{
+        int n;
+        Long borrow, y;
+        ULong carry, q, ys;
+        ULong *bx, *bxe, *sx, *sxe;
+#ifdef Pack_32
+        Long z;
+        ULong si, zs;
+#endif
+
+        n = S->wds;
+#ifdef DEBUG
+        /*debug*/ if (b->wds > n)
+        /*debug*/       Bug("oversize b in quorem");
+#endif
+        if (b->wds < n)
+                return 0;
+        sx = S->x;
+        sxe = sx + --n;
+        bx = b->x;
+        bxe = bx + n;
+        q = *bxe / (*sxe + 1);  /* ensure q <= true quotient */
+#ifdef DEBUG
+        /*debug*/ if (q > 9)
+        /*debug*/       Bug("oversized quotient in quorem");
+#endif
+        if (q) {
+                borrow = 0;
+                carry = 0;
+                do {
+#ifdef Pack_32
+                        si = *sx++;
+                        ys = (si & 0xffff) * q + carry;
+                        zs = (si >> 16) * q + (ys >> 16);
+                        carry = zs >> 16;
+                        y = (*bx & 0xffff) - (ys & 0xffff) + borrow;
+                        borrow = y >> 16;
+                        Sign_Extend(borrow, y);
+                        z = (*bx >> 16) - (zs & 0xffff) + borrow;
+                        borrow = z >> 16;
+                        Sign_Extend(borrow, z);
+                        Storeinc(bx, z, y);
+#else
+                        ys = *sx++ * q + carry;
+                        carry = ys >> 16;
+                        y = *bx - (ys & 0xffff) + borrow;
+                        borrow = y >> 16;
+                        Sign_Extend(borrow, y);
+                        *bx++ = y & 0xffff;
+#endif
+                        }
+                        while(sx <= sxe);
+                if (!*bxe) {
+                        bx = b->x;
+                        while(--bxe > bx && !*bxe)
+                                --n;
+                        b->wds = n;
+                        }
+                }
+        if (cmp(b, S) >= 0) {
+                q++;
+                borrow = 0;
+                carry = 0;
+                bx = b->x;
+                sx = S->x;
+                do {
+#ifdef Pack_32
+                        si = *sx++;
+                        ys = (si & 0xffff) + carry;
+                        zs = (si >> 16) + (ys >> 16);
+                        carry = zs >> 16;
+                        y = (*bx & 0xffff) - (ys & 0xffff) + borrow;
+                        borrow = y >> 16;
+                        Sign_Extend(borrow, y);
+                        z = (*bx >> 16) - (zs & 0xffff) + borrow;
+                        borrow = z >> 16;
+                        Sign_Extend(borrow, z);
+                        Storeinc(bx, z, y);
+#else
+                        ys = *sx++ + carry;
+                        carry = ys >> 16;
+                        y = *bx - (ys & 0xffff) + borrow;
+                        borrow = y >> 16;
+                        Sign_Extend(borrow, y);
+                        *bx++ = y & 0xffff;
+#endif
+                        }
+                        while(sx <= sxe);
+                bx = b->x;
+                bxe = bx + n;
+                if (!*bxe) {
+                        while(--bxe > bx && !*bxe)
+                                --n;
+                        b->wds = n;
+                        }
+                }
+        return q;
+        }
+
+/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
+ *
+ * Inspired by "How to Print Floating-Point Numbers Accurately" by
+ * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].
+ *
+ * Modifications:
+ *      1. Rather than iterating, we use a simple numeric overestimate
+ *         to determine k = floor(log10(d)).  We scale relevant
+ *         quantities using O(log2(k)) rather than O(k) multiplications.
+ *      2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
+ *         try to generate digits strictly left to right.  Instead, we
+ *         compute with fewer bits and propagate the carry if necessary
+ *         when rounding the final digit up.  This is often faster.
+ *      3. Under the assumption that input will be rounded nearest,
+ *         mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
+ *         That is, we allow equality in stopping tests when the
+ *         round-nearest rule will give the same floating-point value
+ *         as would satisfaction of the stopping test with strict
+ *         inequality.
+ *      4. We remove common factors of powers of 2 from relevant
+ *         quantities.
+ *      5. When converting floating-point integers less than 1e16,
+ *         we use floating-point arithmetic rather than resorting
+ *         to multiple-precision integers.
+ *      6. When asked to produce fewer than 15 digits, we first try
+ *         to get by with floating-point arithmetic; we resort to
+ *         multiple-precision integer arithmetic only if we cannot
+ *         guarantee that the floating-point calculation has given
+ *         the correctly rounded result.  For k requested digits and
+ *         "uniformly" distributed input, the probability is
+ *         something like 10^(k-15) that we must resort to the Long
+ *         calculation.
+ */
+
+ char *
+__dtoa
+#ifdef KR_headers
+        (_d, mode, ndigits, decpt, sign, rve)
+        double _d; int mode, ndigits, *decpt, *sign; char **rve;
+#else
+        (double _d, int mode, int ndigits, int *decpt, int *sign, char **rve)
+#endif
+{
+ /*     Arguments ndigits, decpt, sign are similar to those
+        of ecvt and fcvt; trailing zeros are suppressed from
+        the returned string.  If not null, *rve is set to point
+        to the end of the return value.  If d is +-Infinity or NaN,
+        then *decpt is set to 9999.
+
+        mode:
+                0 ==> shortest string that yields d when read in
+                        and rounded to nearest.
+                1 ==> like 0, but with Steele & White stopping rule;
+                        e.g. with IEEE P754 arithmetic , mode 0 gives
+                        1e23 whereas mode 1 gives 9.999999999999999e22.
+                2 ==> max(1,ndigits) significant digits.  This gives a
+                        return value similar to that of ecvt, except
+                        that trailing zeros are suppressed.
+                3 ==> through ndigits past the decimal point.  This
+                        gives a return value similar to that from fcvt,
+                        except that trailing zeros are suppressed, and
+                        ndigits can be negative.
+                4-9 should give the same return values as 2-3, i.e.,
+                        4 <= mode <= 9 ==> same return as mode
+                        2 + (mode & 1).  These modes are mainly for
+                        debugging; often they run slower but sometimes
+                        faster than modes 2-3.
+                4,5,8,9 ==> left-to-right digit generation.
+                6-9 ==> don't try fast floating-point estimate
+                        (if applicable).
+
+                Values of mode other than 0-9 are treated as mode 0.
+
+                Sufficient space is allocated to the return value
+                to hold the suppressed trailing zeros.
+        */
+
+        int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
+                j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
+                spec_case, try_quick;
+        Long L;
+#ifndef Sudden_Underflow
+        int denorm;
+        ULong x;
+#endif
+        Bigint *b, *b1, *delta, *mlo, *mhi, *S;
+        double ds;
+        char *s, *s0;
+        static Bigint *result;
+        static int result_k;
+        _double d, d2, eps;
+
+        value(d) = _d;
+        if (result) {
+                result->k = result_k;
+                result->maxwds = 1 << result_k;
+                Bfree(result);
+                result = 0;
+                }
+
+        if (word0(d) & Sign_bit) {
+                /* set sign for everything, including 0's and NaNs */
+                *sign = 1;
+                word0(d) &= ~Sign_bit;  /* clear sign bit */
+                }
+        else
+                *sign = 0;
+
+#if defined(IEEE_Arith) + defined(VAX)
+#ifdef IEEE_Arith
+        if ((word0(d) & Exp_mask) == Exp_mask)
+#else
+        if (word0(d)  == 0x8000)
+#endif
+                {
+                /* Infinity or NaN */
+                *decpt = 9999;
+                s =
+#ifdef IEEE_Arith
+                        !word1(d) && !(word0(d) & 0xfffff) ? "Infinity" :
+#endif
+                                "NaN";
+                if (rve)
+                        *rve =
+#ifdef IEEE_Arith
+                                s[3] ? s + 8 :
+#endif
+                                                s + 3;
+                return s;
+                }
+#endif
+#ifdef IBM
+        value(d) += 0; /* normalize */
+#endif
+        if (!value(d)) {
+                *decpt = 1;
+                s = "0";
+                if (rve)
+                        *rve = s + 1;
+                return s;
+                }
+
+        b = d2b(value(d), &be, &bbits);
+#ifdef Sudden_Underflow
+        i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
+#else
+        if (i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))) {
+#endif
+                value(d2) = value(d);
+                word0(d2) &= Frac_mask1;
+                word0(d2) |= Exp_11;
+#ifdef IBM
+                if (j = 11 - hi0bits(word0(d2) & Frac_mask))
+                        value(d2) /= 1 << j;
+#endif
+
+                /* log(x)       ~=~ log(1.5) + (x-1.5)/1.5
+                 * log10(x)      =  log(x) / log(10)
+                 *              ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
+                 * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
+                 *
+                 * This suggests computing an approximation k to log10(d) by
+                 *
+                 * k = (i - Bias)*0.301029995663981
+                 *      + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
+                 *
+                 * We want k to be too large rather than too small.
+                 * The error in the first-order Taylor series approximation
+                 * is in our favor, so we just round up the constant enough
+                 * to compensate for any error in the multiplication of
+                 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
+                 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
+                 * adding 1e-13 to the constant term more than suffices.
+                 * Hence we adjust the constant term to 0.1760912590558.
+                 * (We could get a more accurate k by invoking log10,
+                 *  but this is probably not worthwhile.)
+                 */
+
+                i -= Bias;
+#ifdef IBM
+                i <<= 2;
+                i += j;
+#endif
+#ifndef Sudden_Underflow
+                denorm = 0;
+                }
+        else {
+                /* d is denormalized */
+
+                i = bbits + be + (Bias + (P-1) - 1);
+                x = i > 32  ? word0(d) << 64 - i | word1(d) >> i - 32
+                            : word1(d) << 32 - i;
+                value(d2) = x;
+                word0(d2) -= 31*Exp_msk1; /* adjust exponent */
+                i -= (Bias + (P-1) - 1) + 1;
+                denorm = 1;
+                }
+#endif
+        ds = (value(d2)-1.5)*0.289529654602168 + 0.1760912590558 +
+            i*0.301029995663981;
+        k = (int)ds;
+        if (ds < 0. && ds != k)
+                k--;    /* want k = floor(ds) */
+        k_check = 1;
+        if (k >= 0 && k <= Ten_pmax) {
+                if (value(d) < tens[k])
+                        k--;
+                k_check = 0;
+                }
+        j = bbits - i - 1;
+        if (j >= 0) {
+                b2 = 0;
+                s2 = j;
+                }
+        else {
+                b2 = -j;
+                s2 = 0;
+                }
+        if (k >= 0) {
+                b5 = 0;
+                s5 = k;
+                s2 += k;
+                }
+        else {
+                b2 -= k;
+                b5 = -k;
+                s5 = 0;
+                }
+        if (mode < 0 || mode > 9)
+                mode = 0;
+        try_quick = 1;
+        if (mode > 5) {
+                mode -= 4;
+                try_quick = 0;
+                }
+        leftright = 1;
+        switch(mode) {
+                case 0:
+                case 1:
+                        ilim = ilim1 = -1;
+                        i = 18;
+                        ndigits = 0;
+                        break;
+                case 2:
+                        leftright = 0;
+                        /* no break */
+                case 4:
+                        if (ndigits <= 0)
+                                ndigits = 1;
+                        ilim = ilim1 = i = ndigits;
+                        break;
+                case 3:
+                        leftright = 0;
+                        /* no break */
+                case 5:
+                        i = ndigits + k + 1;
+                        ilim = i;
+                        ilim1 = i - 1;
+                        if (i <= 0)
+                                i = 1;
+                }
+        j = sizeof(ULong);
+        for(result_k = 0; sizeof(Bigint) - sizeof(ULong) + j <= i;
+                j <<= 1) result_k++;
+        result = Balloc(result_k);
+        s = s0 = (char *)result;
+
+        if (ilim >= 0 && ilim <= Quick_max && try_quick) {
+
+                /* Try to get by with floating-point arithmetic. */
+
+                i = 0;
+                value(d2) = value(d);
+                k0 = k;
+                ilim0 = ilim;
+                ieps = 2; /* conservative */
+                if (k > 0) {
+                        ds = tens[k&0xf];
+                        j = k >> 4;
+                        if (j & Bletch) {
+                                /* prevent overflows */
+                                j &= Bletch - 1;
+                                value(d) /= bigtens[n_bigtens-1];
+                                ieps++;
+                                }
+                        for(; j; j >>= 1, i++)
+                                if (j & 1) {
+                                        ieps++;
+                                        ds *= bigtens[i];
+                                        }
+                        value(d) /= ds;
+                        }
+                else if (j1 = -k) {
+                        value(d) *= tens[j1 & 0xf];
+                        for(j = j1 >> 4; j; j >>= 1, i++)
+                                if (j & 1) {
+                                        ieps++;
+                                        value(d) *= bigtens[i];
+                                        }
+                        }
+                if (k_check && value(d) < 1. && ilim > 0) {
+                        if (ilim1 <= 0)
+                                goto fast_failed;
+                        ilim = ilim1;
+                        k--;
+                        value(d) *= 10.;
+                        ieps++;
+                        }
+                value(eps) = ieps*value(d) + 7.;
+                word0(eps) -= (P-1)*Exp_msk1;
+                if (ilim == 0) {
+                        S = mhi = 0;
+                        value(d) -= 5.;
+                        if (value(d) > value(eps))
+                                goto one_digit;
+                        if (value(d) < -value(eps))
+                                goto no_digits;
+                        goto fast_failed;
+                        }
+#ifndef No_leftright
+                if (leftright) {
+                        /* Use Steele & White method of only
+                         * generating digits needed.
+                         */
+                        value(eps) = 0.5/tens[ilim-1] - value(eps);
+                        for(i = 0;;) {
+                                L = value(d);
+                                value(d) -= L;
+                                *s++ = '0' + (int)L;
+                                if (value(d) < value(eps))
+                                        goto ret1;
+                                if (1. - value(d) < value(eps))
+                                        goto bump_up;
+                                if (++i >= ilim)
+                                        break;
+                                value(eps) *= 10.;
+                                value(d) *= 10.;
+                                }
+                        }
+                else {
+#endif
+                        /* Generate ilim digits, then fix them up. */
+                        value(eps) *= tens[ilim-1];
+                        for(i = 1;; i++, value(d) *= 10.) {
+                                L = value(d);
+                                value(d) -= L;
+                                *s++ = '0' + (int)L;
+                                if (i == ilim) {
+                                        if (value(d) > 0.5 + value(eps))
+                                                goto bump_up;
+                                        else if (value(d) < 0.5 - value(eps)) {
+                                                while(*--s == '0');
+                                                s++;
+                                                goto ret1;
+                                                }
+                                        break;
+                                        }
+                                }
+#ifndef No_leftright
+                        }
+#endif
+ fast_failed:
+                s = s0;
+                value(d) = value(d2);
+                k = k0;
+                ilim = ilim0;
+                }
+
+        /* Do we have a "small" integer? */
+
+        if (be >= 0 && k <= Int_max) {
+                /* Yes. */
+                ds = tens[k];
+                if (ndigits < 0 && ilim <= 0) {
+                        S = mhi = 0;
+                        if (ilim < 0 || value(d) <= 5*ds)
+                                goto no_digits;
+                        goto one_digit;
+                        }
+                for(i = 1;; i++) {
+                        L = value(d) / ds;
+                        value(d) -= L*ds;
+#ifdef Check_FLT_ROUNDS
+                        /* If FLT_ROUNDS == 2, L will usually be high by 1 */
+                        if (value(d) < 0) {
+                                L--;
+                                value(d) += ds;
+                                }
+#endif
+                        *s++ = '0' + (int)L;
+                        if (i == ilim) {
+                                value(d) += value(d);
+                                if (value(d) > ds || value(d) == ds && L & 1) {
+ bump_up:
+                                        while(*--s == '9')
+                                                if (s == s0) {
+                                                        k++;
+                                                        *s = '0';
+                                                        break;
+                                                        }
+                                        ++*s++;
+                                        }
+                                break;
+                                }
+                        if (!(value(d) *= 10.))
+                                break;
+                        }
+                goto ret1;
+                }
+
+        m2 = b2;
+        m5 = b5;
+        mhi = mlo = 0;
+        if (leftright) {
+                if (mode < 2) {
+                        i =
+#ifndef Sudden_Underflow
+                                denorm ? be + (Bias + (P-1) - 1 + 1) :
+#endif
+#ifdef IBM
+                                1 + 4*P - 3 - bbits + ((bbits + be - 1) & 3);
+#else
+                                1 + P - bbits;
+#endif
+                        }
+                else {
+                        j = ilim - 1;
+                        if (m5 >= j)
+                                m5 -= j;
+                        else {
+                                s5 += j -= m5;
+                                b5 += j;
+                                m5 = 0;
+                                }
+                        if ((i = ilim) < 0) {
+                                m2 -= i;
+                                i = 0;
+                                }
+                        }
+                b2 += i;
+                s2 += i;
+                mhi = i2b(1);
+                }
+        if (m2 > 0 && s2 > 0) {
+                i = m2 < s2 ? m2 : s2;
+                b2 -= i;
+                m2 -= i;
+                s2 -= i;
+                }
+        if (b5 > 0) {
+                if (leftright) {
+                        if (m5 > 0) {
+                                mhi = pow5mult(mhi, m5);
+                                b1 = mult(mhi, b);
+                                Bfree(b);
+                                b = b1;
+                                }
+                        if (j = b5 - m5)
+                                b = pow5mult(b, j);
+                        }
+                else
+                        b = pow5mult(b, b5);
+                }
+        S = i2b(1);
+        if (s5 > 0)
+                S = pow5mult(S, s5);
+
+        /* Check for special case that d is a normalized power of 2. */
+
+        if (mode < 2) {
+                if (!word1(d) && !(word0(d) & Bndry_mask)
+#ifndef Sudden_Underflow
+                 && word0(d) & Exp_mask
+#endif
+                                ) {
+                        /* The special case */
+                        b2 += Log2P;
+                        s2 += Log2P;
+                        spec_case = 1;
+                        }
+                else
+                        spec_case = 0;
+                }
+
+        /* Arrange for convenient computation of quotients:
+         * shift left if necessary so divisor has 4 leading 0 bits.
+         *
+         * Perhaps we should just compute leading 28 bits of S once
+         * and for all and pass them and a shift to quorem, so it
+         * can do shifts and ors to compute the numerator for q.
+         */
+#ifdef Pack_32
+        if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f)
+                i = 32 - i;
+#else
+        if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf)
+                i = 16 - i;
+#endif
+        if (i > 4) {
+                i -= 4;
+                b2 += i;
+                m2 += i;
+                s2 += i;
+                }
+        else if (i < 4) {
+                i += 28;
+                b2 += i;
+                m2 += i;
+                s2 += i;
+                }
+        if (b2 > 0)
+                b = lshift(b, b2);
+        if (s2 > 0)
+                S = lshift(S, s2);
+        if (k_check) {
+                if (cmp(b,S) < 0) {
+                        k--;
+                        b = multadd(b, 10, 0);  /* we botched the k estimate */
+                        if (leftright)
+                                mhi = multadd(mhi, 10, 0);
+                        ilim = ilim1;
+                        }
+                }
+        if (ilim <= 0 && mode > 2) {
+                if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
+                        /* no digits, fcvt style */
+ no_digits:
+                        k = -1 - ndigits;
+                        goto ret;
+                        }
+ one_digit:
+                *s++ = '1';
+                k++;
+                goto ret;
+                }
+        if (leftright) {
+                if (m2 > 0)
+                        mhi = lshift(mhi, m2);
+
+                /* Compute mlo -- check for special case
+                 * that d is a normalized power of 2.
+                 */
+
+                mlo = mhi;
+                if (spec_case) {
+                        mhi = Balloc(mhi->k);
+                        Bcopy(mhi, mlo);
+                        mhi = lshift(mhi, Log2P);
+                        }
+
+                for(i = 1;;i++) {
+                        dig = quorem(b,S) + '0';
+                        /* Do we yet have the shortest decimal string
+                         * that will round to d?
+                         */
+                        j = cmp(b, mlo);
+                        delta = diff(S, mhi);
+                        j1 = delta->sign ? 1 : cmp(b, delta);
+                        Bfree(delta);
+#ifndef ROUND_BIASED
+                        if (j1 == 0 && !mode && !(word1(d) & 1)) {
+                                if (dig == '9')
+                                        goto round_9_up;
+                                if (j > 0)
+                                        dig++;
+                                *s++ = dig;
+                                goto ret;
+                                }
+#endif
+                        if (j < 0 || j == 0 && !mode
+#ifndef ROUND_BIASED
+                                                        && !(word1(d) & 1)
+#endif
+                                        ) {
+                                if (j1 > 0) {
+                                        b = lshift(b, 1);
+                                        j1 = cmp(b, S);
+                                        if ((j1 > 0 || j1 == 0 && dig & 1)
+                                        && dig++ == '9')
+                                                goto round_9_up;
+                                        }
+                                *s++ = dig;
+                                goto ret;
+                                }
+                        if (j1 > 0) {
+                                if (dig == '9') { /* possible if i == 1 */
+ round_9_up:
+                                        *s++ = '9';
+                                        goto roundoff;
+                                        }
+                                *s++ = dig + 1;
+                                goto ret;
+                                }
+                        *s++ = dig;
+                        if (i == ilim)
+                                break;
+                        b = multadd(b, 10, 0);
+                        if (mlo == mhi)
+                                mlo = mhi = multadd(mhi, 10, 0);
+                        else {
+                                mlo = multadd(mlo, 10, 0);
+                                mhi = multadd(mhi, 10, 0);
+                                }
+                        }
+                }
+        else
+                for(i = 1;; i++) {
+                        *s++ = dig = quorem(b,S) + '0';
+                        if (i >= ilim)
+                                break;
+                        b = multadd(b, 10, 0);
+                        }
+
+        /* Round off last digit */
+
+        b = lshift(b, 1);
+        j = cmp(b, S);
+        if (j > 0 || j == 0 && dig & 1) {
+ roundoff:
+                while(*--s == '9')
+                        if (s == s0) {
+                                k++;
+                                *s++ = '1';
+                                goto ret;
+                                }
+                ++*s++;
+                }
+        else {
+                while(*--s == '0');
+                s++;
+                }
+ ret:
+        Bfree(S);
+        if (mhi) {
+                if (mlo && mlo != mhi)
+                        Bfree(mlo);
+                Bfree(mhi);
+                }
+ ret1:
+        Bfree(b);
+        if (s == s0) {                          /* don't return empty string */
+                *s++ = '0';
+                k = 0;
+        }
+        *s = 0;
+        *decpt = k + 1;
+        if (rve)
+                *rve = s;
+        return s0;
+        }
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/lib/libc/stdlib/strtol.3 b/src/lib/libc/stdlib/strtol.3
new file mode 100644
index 0000000000..b7d2cd1225
--- /dev/null
+++ b/src/lib/libc/stdlib/strtol.3
@@ -0,0 +1,168 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strtol.3,v 1.3 1996/08/19 08:33:51 tholo Exp $
+.\"
+.Dd June 25, 1992
+.Dt STRTOL 3
+.Os
+.Sh NAME
+.Nm strtol, strtoq
+.Nd convert string value to a long or quad_t integer
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Fd #include <limits.h>
+.Ft long
+.Fn strtol "const char *nptr" "char **endptr" "int base"
+
+.Fd #include <sys/types.h>
+.Fd #include <stdlib.h>
+.Fd #include <limits.h>
+.Ft quad_t
+.Fn strtoq "const char *nptr" "char **endptr" "int base"
+.Sh DESCRIPTION
+The
+.Fn strtol
+function
+converts the string in
+.Fa nptr
+to a
+.Em long
+value.
+The
+.Fn strtoq
+function
+converts the string in
+.Fa nptr
+to a
+.Em quad_t
+value.
+The conversion is done according to the given
+.Fa base ,
+which must be between 2 and 36 inclusive,
+or be the special value 0.
+.Pp
+The string may begin with an arbitrary amount of white space
+(as determined by
+.Xr isspace 3 )
+followed by a single optional
+.Ql +
+or
+.Ql -
+sign.
+If
+.Fa base
+is zero or 16,
+the string may then include a
+.Ql 0x
+prefix,
+and the number will be read in base 16; otherwise, a zero
+.Fa base
+is taken as 10 (decimal) unless the next character is
+.Ql 0 ,
+in which case it is taken as 8 (octal).
+.Pp
+The remainder of the string is converted to a
+.Em long
+value in the obvious manner,
+stopping at the first character which is not a valid digit
+in the given base.
+(In bases above 10, the letter
+.Ql A
+in either upper or lower case
+represents 10,
+.Ql B
+represents 11, and so forth, with
+.Ql Z
+representing 35.)
+.Pp
+If
+.Fa endptr
+is non nil,
+.Fn strtol
+stores the address of the first invalid character in
+.Fa *endptr .
+If there were no digits at all, however,
+.Fn strtol
+stores the original value of
+.Fa nptr
+in
+.Fa *endptr .
+(Thus, if
+.Fa *nptr
+is not
+.Ql \e0
+but
+.Fa **endptr
+is
+.Ql \e0
+on return, the entire string was valid.)
+.Sh RETURN VALUES
+The
+.Fn strtol
+function
+returns the result of the conversion,
+unless the value would underflow or overflow.
+If an underflow occurs,
+.Fn strtol
+returns
+.Dv LONG_MIN .
+If an overflow occurs,
+.Fn strtol
+returns
+.Dv LONG_MAX .
+In both cases,
+.Va errno
+is set to
+.Er ERANGE .
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er ERANGE
+The given string was out of range; the value converted has been clamped.
+.El
+.Sh SEE ALSO
+.Xr atof 3 ,
+.Xr atoi 3 ,
+.Xr atol 3 ,
+.Xr strtod 3 ,
+.Xr strtoul 3
+.Sh STANDARDS
+The
+.Fn strtol
+function
+conforms to
+.St -ansiC .
+.Sh BUGS
+Ignores the current locale.
diff --git a/src/lib/libc/stdlib/strtol.c b/src/lib/libc/stdlib/strtol.c
new file mode 100644
index 0000000000..e4ad557fd5
--- /dev/null
+++ b/src/lib/libc/stdlib/strtol.c
@@ -0,0 +1,150 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strtol.c,v 1.4 1996/08/19 08:33:51 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+
+/*
+ * Convert a string to a long integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+long
+strtol(nptr, endptr, base)
+        const char *nptr;
+        char **endptr;
+        register int base;
+{
+        register const char *s;
+        register long acc, cutoff;
+        register int c;
+        register int neg, any, cutlim;
+
+        /*
+         * Skip white space and pick up leading +/- sign if any.
+         * If base is 0, allow 0x for hex and 0 for octal, else
+         * assume decimal; if base is already 16, allow 0x.
+         */
+        s = nptr;
+        do {
+                c = (unsigned char) *s++;
+        } while (isspace(c));
+        if (c == '-') {
+                neg = 1;
+                c = *s++;
+        } else {
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
+        if ((base == 0 || base == 16) &&
+            c == '0' && (*s == 'x' || *s == 'X')) {
+                c = s[1];
+                s += 2;
+                base = 16;
+        }
+        if (base == 0)
+                base = c == '0' ? 8 : 10;
+
+        /*
+         * Compute the cutoff value between legal numbers and illegal
+         * numbers.  That is the largest legal value, divided by the
+         * base.  An input number that is greater than this value, if
+         * followed by a legal input character, is too big.  One that
+         * is equal to this value may be valid or not; the limit
+         * between valid and invalid numbers is then based on the last
+         * digit.  For instance, if the range for longs is
+         * [-2147483648..2147483647] and the input base is 10,
+         * cutoff will be set to 214748364 and cutlim to either
+         * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
+         * a value > 214748364, or equal but the next digit is > 7 (or 8),
+         * the number is too big, and we will return a range error.
+         *
+         * Set any if any `digits' consumed; make it negative to indicate
+         * overflow.
+         */
+        cutoff = neg ? LONG_MIN : LONG_MAX;
+        cutlim = cutoff % base;
+        cutoff /= base;
+        if (neg) {
+                if (cutlim > 0) {
+                        cutlim -= base;
+                        cutoff += 1;
+                }
+                cutlim = -cutlim;
+        }
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+                if (isdigit(c))
+                        c -= '0';
+                else if (isalpha(c))
+                        c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+                else
+                        break;
+                if (c >= base)
+                        break;
+                if (any < 0)
+                        continue;
+                if (neg) {
+                        if (acc < cutoff || acc == cutoff && c > cutlim) {
+                                any = -1;
+                                acc = LONG_MIN;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc -= c;
+                        }
+                } else {
+                        if (acc > cutoff || acc == cutoff && c > cutlim) {
+                                any = -1;
+                                acc = LONG_MAX;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc += c;
+                        }
+                }
+        }
+        if (endptr != 0)
+                *endptr = (char *) (any ? s - 1 : nptr);
+        return (acc);
+}
diff --git a/src/lib/libc/stdlib/strtoq.c b/src/lib/libc/stdlib/strtoq.c
new file mode 100644
index 0000000000..44aabd73f0
--- /dev/null
+++ b/src/lib/libc/stdlib/strtoq.c
@@ -0,0 +1,152 @@
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: strtoq.c,v 1.4 1996/08/19 08:33:52 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+/*
+ * Convert a string to a quad integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+quad_t
+strtoq(nptr, endptr, base)
+        const char *nptr;
+        char **endptr;
+        register int base;
+{
+        register const char *s;
+        register quad_t acc, cutoff;
+        register int c;
+        register int neg, any, cutlim;
+
+        /*
+         * Skip white space and pick up leading +/- sign if any.
+         * If base is 0, allow 0x for hex and 0 for octal, else
+         * assume decimal; if base is already 16, allow 0x.
+         */
+        s = nptr;
+        do {
+                c = (unsigned char) *s++;
+        } while (isspace(c));
+        if (c == '-') {
+                neg = 1;
+                c = *s++;
+        } else {
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
+        if ((base == 0 || base == 16) &&
+            c == '0' && (*s == 'x' || *s == 'X')) {
+                c = s[1];
+                s += 2;
+                base = 16;
+        }
+        if (base == 0)
+                base = c == '0' ? 8 : 10;
+
+        /*
+         * Compute the cutoff value between legal numbers and illegal
+         * numbers.  That is the largest legal value, divided by the
+         * base.  An input number that is greater than this value, if
+         * followed by a legal input character, is too big.  One that
+         * is equal to this value may be valid or not; the limit
+         * between valid and invalid numbers is then based on the last
+         * digit.  For instance, if the range for quads is
+         * [-9223372036854775808..9223372036854775807] and the input base
+         * is 10, cutoff will be set to 922337203685477580 and cutlim to
+         * either 7 (neg==0) or 8 (neg==1), meaning that if we have
+         * accumulated a value > 922337203685477580, or equal but the
+         * next digit is > 7 (or 8), the number is too big, and we will
+         * return a range error.
+         *
+         * Set any if any `digits' consumed; make it negative to indicate
+         * overflow.
+         */
+        cutoff = neg ? QUAD_MIN : QUAD_MAX;
+        cutlim = cutoff % base;
+        cutoff /= base;
+        if (neg) {
+                if (cutlim > 0) {
+                        cutlim -= base;
+                        cutoff += 1;
+                }
+                cutlim = -cutlim;
+        }
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+                if (isdigit(c))
+                        c -= '0';
+                else if (isalpha(c))
+                        c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+                else
+                        break;
+                if (c >= base)
+                        break;
+                if (any < 0)
+                        continue;
+                if (neg) {
+                        if (acc < cutoff || acc == cutoff && c > cutlim) {
+                                any = -1;
+                                acc = QUAD_MIN;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc -= c;
+                        }
+                } else {
+                        if (acc > cutoff || acc == cutoff && c > cutlim) {
+                                any = -1;
+                                acc = QUAD_MAX;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc += c;
+                        }
+                }
+        }
+        if (endptr != 0)
+                *endptr = (char *) (any ? s - 1 : nptr);
+        return (acc);
+}
diff --git a/src/lib/libc/stdlib/strtoul.3 b/src/lib/libc/stdlib/strtoul.3
new file mode 100644
index 0000000000..b8234122a2
--- /dev/null
+++ b/src/lib/libc/stdlib/strtoul.3
@@ -0,0 +1,163 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strtoul.3,v 1.2 1996/08/19 08:33:52 tholo Exp $
+.\"
+.Dd June 25, 1992
+.Dt STRTOUL 3
+.Os
+.Sh NAME
+.Nm strtoul, strtouq
+.Nd convert a string to an unsigned long or uquad_t integer
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Fd #include <limits.h>
+.Ft unsigned long
+.Fn strtoul "const char *nptr" "char **endptr" "int base"
+
+.Fd #include <sys/types.h>
+.Fd #include <stdlib.h>
+.Fd #include <limits.h>
+.Ft u_quad_t
+.Fn strtouq "const char *nptr" "char **endptr" "int base"
+.Sh DESCRIPTION
+The
+.Fn strtoul
+function
+converts the string in
+.Fa nptr
+to an
+.Em unsigned long
+value.
+The
+.Fn strtouq
+function
+converts the string in
+.Fa nptr
+to a
+.Em u_quad_t
+value.
+The conversion is done according to the given
+.Fa base ,
+which must be between 2 and 36 inclusive,
+or be the special value 0.
+.Pp
+The string may begin with an arbitrary amount of white space
+(as determined by
+.Xr isspace 3 )
+followed by a single optional
+.Ql +
+or
+.Ql -
+sign.
+If
+.Fa base
+is zero or 16,
+the string may then include a
+.Ql 0x
+prefix,
+and the number will be read in base 16; otherwise, a zero
+.Fa base
+is taken as 10 (decimal) unless the next character is
+.Ql 0 ,
+in which case it is taken as 8 (octal).
+.Pp
+The remainder of the string is converted to an
+.Em unsigned long
+value in the obvious manner,
+stopping at the end of the string
+or at the first character that does not produce a valid digit
+in the given base.
+(In bases above 10, the letter
+.Ql A
+in either upper or lower case
+represents 10,
+.Ql B
+represents 11, and so forth, with
+.Ql Z
+representing 35.)
+.Pp
+If
+.Fa endptr
+is non nil,
+.Fn strtoul
+stores the address of the first invalid character in
+.Fa *endptr .
+If there were no digits at all, however,
+.Fn strtoul
+stores the original value of
+.Fa nptr
+in
+.Fa *endptr .
+(Thus, if
+.Fa *nptr
+is not
+.Ql \e0
+but
+.Fa **endptr
+is
+.Ql \e0
+on return, the entire string was valid.)
+.Sh RETURN VALUES
+The
+.Fn strtoul
+function
+returns either the result of the conversion
+or, if there was a leading minus sign,
+the negation of the result of the conversion,
+unless the original (non-negated) value would overflow;
+in the latter case,
+.Fn strtoul
+returns
+.Dv ULONG_MAX
+and sets the global variable
+.Va errno
+to
+.Er ERANGE .
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er ERANGE
+The given string was out of range; the value converted has been clamped.
+.El
+.Sh SEE ALSO
+.Xr strtol 3
+.Sh STANDARDS
+The
+.Fn strtoul
+function
+conforms to
+.St -ansiC .
+.Sh BUGS
+Ignores the current locale.
diff --git a/src/lib/libc/stdlib/strtoul.c b/src/lib/libc/stdlib/strtoul.c
new file mode 100644
index 0000000000..d3b363fa04
--- /dev/null
+++ b/src/lib/libc/stdlib/strtoul.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strtoul.c,v 1.4 1996/08/19 08:33:52 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+/*
+ * Convert a string to an unsigned long integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+unsigned long
+strtoul(nptr, endptr, base)
+        const char *nptr;
+        char **endptr;
+        register int base;
+{
+        register const char *s;
+        register unsigned long acc, cutoff;
+        register int c;
+        register int neg, any, cutlim;
+
+        /*
+         * See strtol for comments as to the logic used.
+         */
+        s = nptr;
+        do {
+                c = (unsigned char) *s++;
+        } while (isspace(c));
+        if (c == '-') {
+                neg = 1;
+                c = *s++;
+        } else {
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
+        if ((base == 0 || base == 16) &&
+            c == '0' && (*s == 'x' || *s == 'X')) {
+                c = s[1];
+                s += 2;
+                base = 16;
+        }
+        if (base == 0)
+                base = c == '0' ? 8 : 10;
+
+        cutoff = ULONG_MAX / (unsigned long)base;
+        cutlim = ULONG_MAX % (unsigned long)base;
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+                if (isdigit(c))
+                        c -= '0';
+                else if (isalpha(c))
+                        c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+                else
+                        break;
+                if (c >= base)
+                        break;
+                if (any < 0)
+                        continue;
+                if (acc > cutoff || acc == cutoff && c > cutlim) {
+                        any = -1;
+                        acc = ULONG_MAX;
+                        errno = ERANGE;
+                } else {
+                        any = 1;
+                        acc *= (unsigned long)base;
+                        acc += c;
+                }
+        }
+        if (neg && any > 0)
+                acc = -acc;
+        if (endptr != 0)
+                *endptr = (char *) (any ? s - 1 : nptr);
+        return (acc);
+}
diff --git a/src/lib/libc/stdlib/strtouq.c b/src/lib/libc/stdlib/strtouq.c
new file mode 100644
index 0000000000..1f29a22f33
--- /dev/null
+++ b/src/lib/libc/stdlib/strtouq.c
@@ -0,0 +1,114 @@
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: strtouq.c,v 1.4 1996/08/19 08:33:53 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+/*
+ * Convert a string to an unsigned quad integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+u_quad_t
+strtouq(nptr, endptr, base)
+        const char *nptr;
+        char **endptr;
+        register int base;
+{
+        register const char *s;
+        register u_quad_t acc, cutoff;
+        register int c;
+        register int neg, any, cutlim;
+
+        /*
+         * See strtoq for comments as to the logic used.
+         */
+        s = nptr;
+        do {
+                c = (unsigned char) *s++;
+        } while (isspace(c));
+        if (c == '-') {
+                neg = 1;
+                c = *s++;
+        } else { 
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
+        if ((base == 0 || base == 16) &&
+            c == '0' && (*s == 'x' || *s == 'X')) {
+                c = s[1];
+                s += 2;
+                base = 16;
+        }
+        if (base == 0)
+                base = c == '0' ? 8 : 10;
+
+        cutoff = UQUAD_MAX / (u_quad_t)base;
+        cutlim = UQUAD_MAX % (u_quad_t)base;
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+                if (isdigit(c))
+                        c -= '0';
+                else if (isalpha(c))
+                        c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+                else
+                        break;
+                if (c >= base)
+                        break;
+                if (any < 0)
+                        continue;
+                if (acc > cutoff || acc == cutoff && c > cutlim) {
+                        any = -1;
+                        acc = UQUAD_MAX;
+                        errno = ERANGE;
+                } else {
+                        any = 1;
+                        acc *= (u_quad_t)base;
+                        acc += c;
+                }
+        }
+        if (neg && any > 0)
+                acc = -acc;
+        if (endptr != 0)
+                *endptr = (char *) (any ? s - 1 : nptr);
+        return (acc);
+}
diff --git a/src/lib/libc/stdlib/system.3 b/src/lib/libc/stdlib/system.3
new file mode 100644
index 0000000000..985adb07de
--- /dev/null
+++ b/src/lib/libc/stdlib/system.3
@@ -0,0 +1,98 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: system.3,v 1.5 1996/12/11 23:09:53 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt SYSTEM 3
+.Os
+.Sh NAME
+.Nm system
+.Nd pass a command to the shell
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft int
+.Fn system "const char *string"
+.Sh DESCRIPTION
+The
+.Fn system
+function
+hands the argument
+.Fa string
+to the command interpreter
+.Xr sh 1 .
+The calling process waits for the shell to finish executing the command,
+ignoring
+.Dv SIGINT
+and
+.Dv SIGQUIT ,
+and blocking
+.Dv SIGCHLD .
+.Pp
+If
+.Fa string
+is a
+.Dv NULL
+pointer,
+.Fn system
+will return non-zero.
+Otherwise,
+.Fn system
+returns the termination status of the shell in the format specified by 
+.Xr waitpid 2 .
+.Sh RETURN VALUES 
+If a child process cannot be created, or the termination status of
+the shell cannot be obtained, 
+.Fn system
+returns -1 and sets
+.Va errno
+to indicate the error.
+If execution of the shell fails, 
+.Fn system
+returns the termination status for a program that terminates with a call of 
+.Fn exit 127 .
+.Sh SEE ALSO
+.Xr sh 1 ,
+.Xr execve 2 ,
+.Xr waitpid 2 ,
+.Xr popen 3
+.Sh STANDARDS
+The
+.Fn system
+function
+conforms to
+.St -ansiC 
+and
+.St -p1003.2-92 .
diff --git a/src/lib/libc/stdlib/system.c b/src/lib/libc/stdlib/system.c
new file mode 100644
index 0000000000..3e1b047393
--- /dev/null
+++ b/src/lib/libc/stdlib/system.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 1988 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: system.c,v 1.3 1996/09/15 09:31:52 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <paths.h>
+
+extern char **environ;
+
+int
+system(command)
+        const char *command;
+{
+        pid_t pid;
+        sig_t intsave, quitsave;
+        int omask;
+        int pstat;
+        char *argp[] = {"sh", "-c", NULL, NULL};
+
+        if (!command)           /* just checking... */
+                return(1);
+
+        argp[2] = (char *)command;
+
+        omask = sigblock(sigmask(SIGCHLD));
+        switch(pid = vfork()) {
+        case -1:                        /* error */
+                (void)sigsetmask(omask);
+                return(-1);
+        case 0:                         /* child */
+                (void)sigsetmask(omask);
+                execve(_PATH_BSHELL, argp, environ);
+                _exit(127);
+        }
+
+        intsave = signal(SIGINT, SIG_IGN);
+        quitsave = signal(SIGQUIT, SIG_IGN);
+        pid = waitpid(pid, (int *)&pstat, 0);
+        (void)sigsetmask(omask);
+        (void)signal(SIGINT, intsave);
+        (void)signal(SIGQUIT, quitsave);
+        return(pid == -1 ? -1 : pstat);
+}
diff --git a/src/lib/libc/stdlib/tfind.c b/src/lib/libc/stdlib/tfind.c
new file mode 100644
index 0000000000..9e5bd4b0f2
--- /dev/null
+++ b/src/lib/libc/stdlib/tfind.c
@@ -0,0 +1,41 @@
+/*
+ * Tree search generalized from Knuth (6.2.2) Algorithm T just like
+ * the AT&T man page says.
+ *
+ * The node_t structure is for internal use only, lint doesn't grok it.
+ *
+ * Written by reading the System V Interface Definition, not the code.
+ *
+ * Totally public domain.
+ */
+/*LINTLIBRARY*/
+#include <search.h>
+
+typedef struct node_t
+{
+    char          *key;
+    struct node_t *llink, *rlink;
+} node;
+
+/* find a node, or return 0 */
+void *
+tfind(vkey, vrootp, compar)
+        const void      *vkey;          /* key to be found */
+        void            *const *vrootp; /* address of the tree root */
+        int             (*compar) __P((const void *, const void *));
+{
+    char *key = (char *)vkey;
+    node **rootp = (node **)vrootp;
+
+    if (rootp == (struct node_t **)0)
+        return ((struct node_t *)0);
+    while (*rootp != (struct node_t *)0) {      /* T1: */
+        int r;
+        if ((r = (*compar)(key, (*rootp)->key)) == 0)   /* T2: */
+            return (*rootp);            /* key found */
+        rootp = (r < 0) ?
+            &(*rootp)->llink :          /* T3: follow left branch */
+            &(*rootp)->rlink;           /* T4: follow right branch */
+    }
+    return (node *)0;
+}
diff --git a/src/lib/libc/stdlib/tsearch.3 b/src/lib/libc/stdlib/tsearch.3
new file mode 100644
index 0000000000..c2ef8ae6cb
--- /dev/null
+++ b/src/lib/libc/stdlib/tsearch.3
@@ -0,0 +1,116 @@
+.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+.\" 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. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: tsearch.3,v 1.3 1999/02/27 21:56:03 deraadt Exp $
+.\"
+.Dd June 15, 1997
+.Dt TSEARCH 3
+.Os
+.Sh NAME
+.Nm tsearch, tfind, tdelete, twalk
+.Nd manipulate binary search trees
+.Sh SYNOPSIS
+.Fd #include <search.h>
+.Ft void *
+.Fn tdelete "const void *key" "void **rootp", "int (*compar) (const void *, const void *)"
+.Ft void *
+.Fn tfind "const void *key" "void * const *rootp", "int (*compar) (const void *, const void *)"
+.Ft void *
+.Fn tsearch "const void *key" "void **rootp", "int (*compar) (const void *, const void *)"
+.Ft void
+.Fn twalk "const void *root" "void (*compar) (const void *, VISIT, int)"
+.Sh DESCRIPTION
+The
+.Fn tdelete ,
+.Fn tfind ,
+.Fn tsearch ,
+and
+.Fn twalk
+functions manage binary search trees based on algorithms T and D
+from Knuth (6.2.2).  The comparison function passed in by
+the user has the same style of return values as
+.Xr strcmp 3 .
+.Pp
+.Fn tfind
+searches for the datum matched by the argument
+.Fa key
+in the binary tree rooted at
+.Fa rootp ,
+returning a pointer to the datum if it is found and NULL
+if it is not.
+.Pp
+.Fn tsearch
+is identical to
+.Fn tfind
+except that if no match is found,
+.Fa key
+is inserted into the tree and a pointer to it is returned.  If
+.Fa rootp
+points to a NULL value a new binary search tree is created.
+.Pp
+.Fn tdelete
+deletes a node from the specified binary search tree and returns
+a pointer to the parent of the node to be deleted.
+It takes the same arguments as
+.Fn tfind
+and
+.Fn tsearch .
+If the node to be deleted is the root of the binary search tree,
+.Fa rootp
+will be adjusted.
+.Pp
+.Fn twalk
+walks the binary search tree rooted in
+.fa root
+and calls the function
+.Fa action
+on each node.
+.Fa action
+is called with three arguments: a pointer to the current node,
+a value from the enum 
+.Sy "typedef enum { preorder, postorder, endorder, leaf } VISIT;"
+specifying the traversal type, and a node level (where level
+zero is the root of the tree).
+.Sh SEE ALSO
+.Xr bsearch 3 ,
+.Xr hsearch 3 ,
+.Xr lsearch 3
+.Sh RETURN VALUES
+The
+.Fn tsearch
+function returns NULL if allocation of a new node fails (usually
+due to a lack of free memory).
+.Pp
+.Fn tfind ,
+.Fn tsearch ,
+and
+.Fn tdelete
+return NULL if
+.Fa rootp
+is NULL or the datum cannot be found.
+.Pp
+The
+.Fn twalk
+function returns no value.
diff --git a/src/lib/libc/stdlib/tsearch.c b/src/lib/libc/stdlib/tsearch.c
new file mode 100644
index 0000000000..562ace1845
--- /dev/null
+++ b/src/lib/libc/stdlib/tsearch.c
@@ -0,0 +1,126 @@
+/*
+ * Tree search generalized from Knuth (6.2.2) Algorithm T just like
+ * the AT&T man page says.
+ *
+ * The node_t structure is for internal use only, lint doesn't grok it.
+ *
+ * Written by reading the System V Interface Definition, not the code.
+ *
+ * Totally public domain.
+ */
+/*LINTLIBRARY*/
+
+#include <search.h>
+#include <stdlib.h>
+
+typedef struct node_t {
+    char          *key;
+    struct node_t *left, *right;
+} node;
+
+/* find or insert datum into search tree */
+void *
+tsearch(vkey, vrootp, compar)
+        const void      *vkey;          /* key to be located */
+        void            **vrootp;       /* address of tree root */
+        int             (*compar) __P((const void *, const void *));
+{
+    register node *q;
+    char *key = (char *)vkey;
+    node **rootp = (node **)vrootp;
+
+    if (rootp == (struct node_t **)0)
+        return ((void *)0);
+    while (*rootp != (struct node_t *)0) {      /* Knuth's T1: */
+        int r;
+
+        if ((r = (*compar)(key, (*rootp)->key)) == 0)   /* T2: */
+            return ((void *)*rootp);            /* we found it! */
+        rootp = (r < 0) ?
+            &(*rootp)->left :           /* T3: follow left branch */
+            &(*rootp)->right;           /* T4: follow right branch */
+    }
+    q = (node *) malloc(sizeof(node));  /* T5: key not found */
+    if (q != (struct node_t *)0) {      /* make new node */
+        *rootp = q;                     /* link new node to old */
+        q->key = key;                   /* initialize new node */
+        q->left = q->right = (struct node_t *)0;
+    }
+    return ((void *)q);
+}
+
+/* delete node with given key */
+void *
+tdelete(vkey, vrootp, compar)
+        const void      *vkey;          /* key to be deleted */
+        void            **vrootp;       /* address of the root of tree */
+        int             (*compar) __P((const void *, const void *));
+{
+    node **rootp = (node **)vrootp;
+    char *key = (char *)vkey;
+    node *p;
+    register node *q;
+    register node *r;
+    int cmp;
+
+    if (rootp == (struct node_t **)0 || (p = *rootp) == (struct node_t *)0)
+        return ((struct node_t *)0);
+    while ((cmp = (*compar)(key, (*rootp)->key)) != 0) {
+        p = *rootp;
+        rootp = (cmp < 0) ?
+            &(*rootp)->left :           /* follow left branch */
+            &(*rootp)->right;           /* follow right branch */
+        if (*rootp == (struct node_t *)0)
+            return ((void *)0);         /* key not found */
+    }
+    r = (*rootp)->right;                        /* D1: */
+    if ((q = (*rootp)->left) == (struct node_t *)0)     /* Left (struct node_t *)0? */
+        q = r;
+    else if (r != (struct node_t *)0) {         /* Right link is null? */
+        if (r->left == (struct node_t *)0) {    /* D2: Find successor */
+            r->left = q;
+            q = r;
+        } else {                        /* D3: Find (struct node_t *)0 link */
+            for (q = r->left; q->left != (struct node_t *)0; q = r->left)
+                r = q;
+            r->left = q->right;
+            q->left = (*rootp)->left;
+            q->right = (*rootp)->right;
+        }
+    }
+    free((struct node_t *) *rootp);     /* D4: Free node */
+    *rootp = q;                         /* link parent to new node */
+    return(p);
+}
+
+/* Walk the nodes of a tree */
+static void
+trecurse(root, action, level)
+        register node   *root;          /* Root of the tree to be walked */
+        register void   (*action)();    /* Function to be called at each node */
+        register int    level;
+{
+    if (root->left == (struct node_t *)0 && root->right == (struct node_t *)0)
+        (*action)(root, leaf, level);
+    else {
+        (*action)(root, preorder, level);
+        if (root->left != (struct node_t *)0)
+            trecurse(root->left, action, level + 1);
+        (*action)(root, postorder, level);
+        if (root->right != (struct node_t *)0)
+            trecurse(root->right, action, level + 1);
+        (*action)(root, endorder, level);
+    }
+}
+
+/* Walk the nodes of a tree */
+void
+twalk(vroot, action)
+        const void      *vroot;         /* Root of the tree to be walked */
+        void            (*action) __P((const void *, VISIT, int));
+{
+    node *root = (node *)vroot;
+
+    if (root != (node *)0 && action != (void(*)())0)
+        trecurse(root, action, 0);
+}
diff --git a/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc
new file mode 100644
index 0000000000..78eee7efa5
--- /dev/null
+++ b/src/lib/libc/string/Makefile.inc
@@ -0,0 +1,128 @@
+#       $OpenBSD: Makefile.inc,v 1.6 1998/11/20 11:18:51 d Exp $
+
+# string sources
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string ${LIBCSRCDIR}/string
+
+SRCS+=  bm.c memccpy.c strcasecmp.c strcoll.c strdup.c strerror.c \
+        strlcat.c strlcpy.c strmode.c strsignal.c strtok.c strxfrm.c \
+        __strerror.c __strsignal.c
+
+# machine-dependent net sources
+# m-d Makefile.inc must include sources for:
+#       bcmp() bcopy() bzero() ffs() index() memchr() memcmp() memset()
+#       rindex() strcat() strcmp() strcpy() strcspn() strlen()
+#       strncat() strncmp() strncpy() strpbrk() strsep()
+#       strspn() strstr() swav()
+# m-d Makefile.inc may include sources for:
+#       memcpy() memmove() strchr() strrchr()
+
+.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string/Makefile.inc"
+
+# if no machine specific memmove(3), build one out of bcopy(3).
+.if empty(SRCS:Mmemmove.S)
+OBJS+=  memmove.o
+memmove.o: bcopy.c
+        ${CC} -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
+        @${LD} -x -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+memmove.po: bcopy.c
+        ${CC} -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
+        @${LD} -X -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+memmove.so: bcopy.c
+        ${CC} ${PICFLAG} -DPIC -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
+                -o ${.TARGET}
+.endif
+
+# if no machine specific memcpy(3), build one out of bcopy(3).
+# if there is a machine specific memmove(3), we'll assume it aliases
+# memcpy(3).
+.if empty(SRCS:Mmemcpy.S)
+.if empty(SRCS:Mmemmove.S)
+OBJS+=  memcpy.o
+memcpy.o: bcopy.c
+        ${CC} -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
+        @${LD} -x -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+memcpy.po: bcopy.c
+        ${CC} -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
+        @${LD} -X -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+memcpy.so: bcopy.c
+        ${CC} ${PICFLAG} -DPIC -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
+                -o ${.TARGET}
+.endif
+.endif
+
+# if no machine specific strchr(3), build one out of index(3).
+.if empty(SRCS:Mstrchr.S)
+OBJS+=  strchr.o
+strchr.o: index.c
+        ${CC} -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
+        @${LD} -x -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+strchr.po: index.c
+        ${CC} -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
+        @${LD} -X -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+strchr.so: index.c
+        ${CC} ${PICFLAG} -DPIC -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
+            -o ${.TARGET}
+.endif
+
+# if no machine specific strrchr(3), build one out of rindex(3).
+.if empty(SRCS:Mstrrchr.S)
+OBJS+=  strrchr.o
+strrchr.o: rindex.c
+        ${CC} -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} -o ${.TARGET}
+        @${LD} -x -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+strrchr.po: rindex.c
+        ${CC} -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
+        @${LD} -X -r ${.TARGET}
+        @mv a.out ${.TARGET}
+
+strrchr.so: rindex.c
+        ${CC} ${PICFLAG} -DPIC -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
+            -o ${.TARGET}
+.endif
+
+# build .ln files for memmove, memcpy, strchr and strrchr always from
+# bcopy, index, and rindex
+LOBJS+= memmove.ln memcpy.ln strchr.ln strrchr.ln
+
+memmove.ln: bcopy.c
+        lint ${LINTFLAGS} -DMEMMOVE ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
+                ${LIBCSRCDIR}/string/bcopy.c
+
+memcpy.ln: bcopy.c
+        lint ${LINTFLAGS} -DMEMCOPY ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
+                ${LIBCSRCDIR}/string/bcopy.c
+
+strchr.ln: index.c
+        lint ${LINTFLAGS} -DSTRCHR ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
+                ${LIBCSRCDIR}/string/index.c
+
+strrchr.ln: rindex.c
+        lint ${LINTFLAGS} -DSTRRCHR ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
+                ${LIBCSRCDIR}/string/rindex.c
+
+MAN+=   bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
+        memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
+        strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strerror.3 \
+        string.3 strlen.3 strmode.3 strdup.3 strpbrk.3 strrchr.3 strsep.3 \
+        strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 strlcpy.3
+
+MLINKS+=bm.3 bm_comp.3 bm.3 bm_exec.3 bm.3 bm_free.3
+MLINKS+=strcasecmp.3 strncasecmp.3
+MLINKS+=strcat.3 strncat.3
+MLINKS+=strcmp.3 strncmp.3
+MLINKS+=strcpy.3 strncpy.3
+MLINKS+=strlcpy.3 strlcat.3
diff --git a/src/lib/libc/string/__strerror.c b/src/lib/libc/string/__strerror.c
new file mode 100644
index 0000000000..9c023f8a53
--- /dev/null
+++ b/src/lib/libc/string/__strerror.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: __strerror.c,v 1.6 1996/09/25 08:17:30 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifdef NLS
+#define catclose        _catclose
+#define catgets         _catgets
+#define catopen         _catopen
+#include <nl_types.h>
+#endif
+
+#define sys_errlist     _sys_errlist
+#define sys_nerr        _sys_nerr
+
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
+static char *itoa(num)
+        int num;
+{
+        static char buffer[11];
+        char *p;
+
+        p = buffer + 4;
+        while (num >= 10) {
+                *--p = (num % 10) + '0';
+                num /= 10;
+        }
+        *p = (num % 10) + '0';
+        return p;
+}
+
+/*
+ * Since perror() is not allowed to change the contents of strerror()'s
+ * static buffer, both functions supply their own buffers to the
+ * internal function __strerror().
+ */
+
+char *
+__strerror(num, buf)
+        int num;
+        char *buf;
+{
+#define UPREFIX "Unknown error: "
+        register unsigned int errnum;
+
+#ifdef NLS
+        nl_catd catd;
+        catd = catopen("libc", 0);
+#endif
+
+        errnum = num;                           /* convert to unsigned */
+        if (errnum < sys_nerr) {
+#ifdef NLS
+                strncpy(buf, catgets(catd, 1, errnum,
+                    (char *)sys_errlist[errnum]), NL_TEXTMAX-1);
+                buf[NL_TEXTMAX - 1] = '\0';
+#else
+                return(sys_errlist[errnum]);
+#endif
+        } else {
+#ifdef NLS
+                strncpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX-1);
+                buf[NL_TEXTMAX - 1] = '\0';
+#else
+                strcpy(buf, UPREFIX);
+#endif
+                strncat(buf, itoa(errnum), NL_TEXTMAX-strlen(buf)-1);
+        }
+
+#ifdef NLS
+        catclose(catd);
+#endif
+
+        return buf;
+}
diff --git a/src/lib/libc/string/__strsignal.c b/src/lib/libc/string/__strsignal.c
new file mode 100644
index 0000000000..ae0df72cd3
--- /dev/null
+++ b/src/lib/libc/string/__strsignal.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: __strsignal.c,v 1.5 1996/09/25 13:19:01 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifdef NLS
+#define catclose        _catclose
+#define catgets         _catgets
+#define catopen         _catopen
+#include <nl_types.h>
+#endif
+
+#define sys_siglist     _sys_siglist
+
+#include <stdio.h>
+#include <limits.h>
+#include <signal.h>
+#include <string.h>
+
+static char *itoa(num)
+        int num;
+{
+        static char buffer[11];
+        char *p;
+
+        p = buffer + 4;
+        while (num >= 10) {
+                *--p = (num % 10) + '0';
+                num /= 10;
+        }
+        *p = (num % 10) + '0';
+        return p;
+}
+
+char *
+__strsignal(num, buf)
+        int num;
+        char *buf;
+{
+#define UPREFIX "Unknown signal: "
+        register unsigned int signum;
+
+#ifdef NLS
+        nl_catd catd ;
+        catd = catopen("libc", 0);
+#endif
+
+        signum = num;                           /* convert to unsigned */
+        if (signum < NSIG) {
+#ifdef NLS
+                strncpy(buf, catgets(catd, 2, signum,
+                    (char *)sys_siglist[signum]), NL_TEXTMAX-1);
+                buf[NL_TEXTMAX-1] = '\0';
+#else
+                return((char *)sys_siglist[signum]);
+#endif
+        } else {
+#ifdef NLS
+                strncpy(buf, catgets(catd, 1, 0xffff, UPREFIX), NL_TEXTMAX-1);
+                buf[NL_TEXTMAX-1] = '\0';
+#else
+                strcpy(buf, UPREFIX);
+#endif
+                strncat(buf, itoa(signum), NL_TEXTMAX-strlen(buf)-1);
+        }
+
+#ifdef NLS
+        catclose(catd);
+#endif
+
+        return buf;
+}
diff --git a/src/lib/libc/string/bcmp.3 b/src/lib/libc/string/bcmp.3
new file mode 100644
index 0000000000..9234b5739d
--- /dev/null
+++ b/src/lib/libc/string/bcmp.3
@@ -0,0 +1,71 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: bcmp.3,v 1.2 1996/08/19 08:33:56 tholo Exp $
+.\"
+.Dd April 19, 1991
+.Dt BCMP 3
+.Os BSD 4.2
+.Sh NAME
+.Nm bcmp
+.Nd compare byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn bcmp "const void *b1" "const void *b2" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn bcmp
+function
+compares byte string
+.Fa b1
+against byte string
+.Fa b2 ,
+returning zero if they are identical, non-zero otherwise.
+Both strings are assumed to be
+.Fa len
+bytes long.
+Zero-length strings are always identical.
+.Pp
+The strings may overlap.
+.Sh SEE ALSO
+.Xr memcmp 3 ,
+.Xr strcasecmp 3 ,
+.Xr strcmp 3 ,
+.Xr strcoll 3 ,
+.Xr strxfrm 3
+.Sh HISTORY
+A
+.Fn bcmp
+function first appeared in 
+.Bx 4.2 .
diff --git a/src/lib/libc/string/bcmp.c b/src/lib/libc/string/bcmp.c
new file mode 100644
index 0000000000..4ed00975a4
--- /dev/null
+++ b/src/lib/libc/string/bcmp.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: bcmp.c,v 1.4 1996/08/19 08:33:57 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+/*
+ * bcmp -- vax cmpc3 instruction
+ */
+int
+bcmp(b1, b2, length)
+        const void *b1, *b2;
+        register size_t length;
+{
+        register char *p1, *p2;
+
+        if (length == 0)
+                return(0);
+        p1 = (char *)b1;
+        p2 = (char *)b2;
+        do
+                if (*p1++ != *p2++)
+                        break;
+        while (--length);
+        return(length);
+}
diff --git a/src/lib/libc/string/bcopy.3 b/src/lib/libc/string/bcopy.3
new file mode 100644
index 0000000000..4e841562e0
--- /dev/null
+++ b/src/lib/libc/string/bcopy.3
@@ -0,0 +1,71 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: bcopy.3,v 1.2 1996/08/19 08:33:57 tholo Exp $
+.\"
+.Dd April 19, 1991
+.Dt BCOPY 3
+.Os BSD 4.2
+.Sh NAME
+.Nm bcopy
+.Nd copy byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void
+.Fn bcopy "const void *src" "void *dst" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn bcopy
+function
+copies
+.Fa len
+bytes from string
+.Fa src
+to string
+.Fa dst .
+The two strings may overlap.
+If
+.Fa len
+is zero, no bytes are copied.
+.Sh SEE ALSO
+.Xr memccpy 3 ,
+.Xr memcpy 3 ,
+.Xr memmove 3 ,
+.Xr strcpy 3 ,
+.Xr strncpy 3
+.Sh HISTORY
+A
+.Fn bcopy
+function appeared in 
+.Bx 4.2 .
diff --git a/src/lib/libc/string/bcopy.c b/src/lib/libc/string/bcopy.c
new file mode 100644
index 0000000000..023a3b2db2
--- /dev/null
+++ b/src/lib/libc/string/bcopy.c
@@ -0,0 +1,138 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: bcopy.c,v 1.2 1996/08/19 08:33:58 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * sizeof(word) MUST BE A POWER OF TWO
+ * SO THAT wmask BELOW IS ALL ONES
+ */
+typedef long word;              /* "word" used for optimal copy speed */
+
+#define wsize   sizeof(word)
+#define wmask   (wsize - 1)
+
+/*
+ * Copy a block of memory, handling overlap.
+ * This is the routine that actually implements
+ * (the portable versions of) bcopy, memcpy, and memmove.
+ */
+#ifdef MEMCOPY
+void *
+memcpy(dst0, src0, length)
+#else
+#ifdef MEMMOVE
+void *
+memmove(dst0, src0, length)
+#else
+void
+bcopy(src0, dst0, length)
+#endif
+#endif
+        void *dst0;
+        const void *src0;
+        register size_t length;
+{
+        register char *dst = dst0;
+        register const char *src = src0;
+        register size_t t;
+
+        if (length == 0 || dst == src)          /* nothing to do */
+                goto done;
+
+        /*
+         * Macros: loop-t-times; and loop-t-times, t>0
+         */
+#define TLOOP(s) if (t) TLOOP1(s)
+#define TLOOP1(s) do { s; } while (--t)
+
+        if ((unsigned long)dst < (unsigned long)src) {
+                /*
+                 * Copy forward.
+                 */
+                t = (long)src;  /* only need low bits */
+                if ((t | (long)dst) & wmask) {
+                        /*
+                         * Try to align operands.  This cannot be done
+                         * unless the low bits match.
+                         */
+                        if ((t ^ (long)dst) & wmask || length < wsize)
+                                t = length;
+                        else
+                                t = wsize - (t & wmask);
+                        length -= t;
+                        TLOOP1(*dst++ = *src++);
+                }
+                /*
+                 * Copy whole words, then mop up any trailing bytes.
+                 */
+                t = length / wsize;
+                TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
+                t = length & wmask;
+                TLOOP(*dst++ = *src++);
+        } else {
+                /*
+                 * Copy backwards.  Otherwise essentially the same.
+                 * Alignment works as before, except that it takes
+                 * (t&wmask) bytes to align, not wsize-(t&wmask).
+                 */
+                src += length;
+                dst += length;
+                t = (long)src;
+                if ((t | (long)dst) & wmask) {
+                        if ((t ^ (long)dst) & wmask || length <= wsize)
+                                t = length;
+                        else
+                                t &= wmask;
+                        length -= t;
+                        TLOOP1(*--dst = *--src);
+                }
+                t = length / wsize;
+                TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
+                t = length & wmask;
+                TLOOP(*--dst = *--src);
+        }
+done:
+#if defined(MEMCOPY) || defined(MEMMOVE)
+        return (dst0);
+#else
+        return;
+#endif
+}
diff --git a/src/lib/libc/string/bm.3 b/src/lib/libc/string/bm.3
new file mode 100644
index 0000000000..c942930163
--- /dev/null
+++ b/src/lib/libc/string/bm.3
@@ -0,0 +1,113 @@
+.\" Copyright (c) 1994
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Andrew Hume of AT&T Bell Laboratories.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: bm.3,v 1.2 1996/08/19 08:33:58 tholo Exp $
+.\"
+.TH BM 3
+.SH NAME
+bm_comp, bm_exec, bm_free \- Boyer-Moore string search
+.SH SYNOPSIS
+.ft B
+#include <sys/types.h>
+.br
+#include <bm.h>
+.sp
+bm_pat *
+.br
+bm_comp(u_char *pattern, size_t patlen, u_char freq[256]);
+.sp
+u_char *
+.br
+bm_exec(bm_pat *pdesc, u_char *text, size_t len);
+.sp
+void
+.br
+bm_free(bm_pat *pdesc);
+.SH DESCRIPTION
+These routines implement an efficient mechanism to find an
+occurrence of a byte string within another byte string.
+.PP
+.I Bm_comp
+evaluates the
+.I patlen
+bytes starting at
+.IR pattern ,
+and returns a pointer to a structure describing them.
+The bytes referenced by
+.I pattern
+may be of any value.
+.PP
+The search takes advantage of the frequency distribution of the
+bytes in the text to be searched.
+If specified,
+.I freq
+should be an array of 256 values,
+with higher values indicating that the corresponding character occurs
+more frequently.
+(A less than optimal frequency distribution can only result in less
+than optimal performance, not incorrect results.)
+If
+.I freq
+is NULL,
+a system default table is used.
+.PP
+.I Bm_exec
+returns a pointer to the leftmost occurrence of the string given to
+.I bm_comp
+within
+.IR text ,
+or NULL if none occurs.
+The number of bytes in
+.I text
+must be specified by
+.IR len .
+.PP
+Space allocated for the returned description is discarded
+by calling
+.I bm_free
+with the returned description as an argument.
+.PP
+The asymptotic speed of
+.I bm_exec
+is
+.RI O( len / patlen ).
+.PP
+.SH "SEE ALSO"
+.IR regexp (3),
+.IR strstr (3)
+.sp
+.IR "Fast String Searching" ,
+Hume and Sunday,
+Software Practice and Experience,
+Vol. 21, 11 (November 1991) pp. 1221-48.
diff --git a/src/lib/libc/string/bm.c b/src/lib/libc/string/bm.c
new file mode 100644
index 0000000000..b191d340f6
--- /dev/null
+++ b/src/lib/libc/string/bm.c
@@ -0,0 +1,219 @@
+/*-
+ * Copyright (c) 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Andrew Hume of AT&T Bell Laboratories.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: bm.c,v 1.3 1996/08/19 08:33:59 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+
+#include <bm.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* 
+ * XXX
+ * The default frequency table starts at 99 and counts down.  The default
+ * table should probably be oriented toward text, and will necessarily be
+ * locale specific.  This one is for English.  It was derived from the
+ * OSF/1 and 4.4BSD formatted and unformatted manual pages, and about 100Mb
+ * of email and random text.  Change it if you can find something better.
+ */
+static u_char const freq_def[256] = {
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0, 77, 90,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+        99, 28, 42, 27, 16, 14, 20, 51,
+        66, 65, 59, 24, 75, 76, 84, 56,
+        72, 74, 64, 55, 54, 47, 41, 37,
+        44, 61, 70, 43, 23, 53, 49, 22,
+        33, 58, 40, 46, 45, 57, 60, 26,
+        30, 63, 21, 12, 32, 50, 38, 39,
+        34, 11, 48, 67, 62, 35, 15, 29,
+        71, 18,  9, 17, 25, 13, 10, 52,
+        36, 95, 78, 86, 87, 98, 82, 80,
+        88, 94, 19, 68, 89, 83, 93, 96,
+        81,  7, 91, 92, 97, 85, 69, 73,
+        31, 79,  8,  5,  4,  6,  3,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+         0,  0,  0,  0,  0,  0,  0,  0,
+};
+
+bm_pat *
+bm_comp(pb, len, freq)
+        u_char const *pb;
+        size_t len;
+        u_char const *freq;
+{
+        register u_char const *pe, *p;
+        register size_t *d, r;
+        register int j;
+        int sv_errno;
+        bm_pat *pat;
+
+        if (len == 0) {
+                errno = EINVAL;
+                return (NULL);
+        }
+        if ((pat = malloc(sizeof(*pat))) == NULL)
+                return (NULL);
+        pat->pat = NULL;
+        pat->delta = NULL;
+
+        pat->patlen = len;                      /* copy pattern */
+        if ((pat->pat = malloc(pat->patlen)) == NULL)
+                goto mem;
+        memcpy(pat->pat, pb, pat->patlen);
+                                                /* get skip delta */
+        if ((pat->delta = malloc(256 * sizeof(*d))) == NULL)
+                goto mem;
+        for (j = 0, d = pat->delta; j < 256; j++)
+                d[j] = pat->patlen;
+        for (pe = pb + pat->patlen - 1; pb <= pe; pb++)
+                d[*pb] = pe - pb;
+
+        if (freq == NULL)                       /* default freq table */
+                freq = freq_def;
+        r = 0;                                  /* get guard */
+        for (pb = pat->pat, pe = pb + pat->patlen - 1; pb < pe; pb++)
+                if (freq[*pb] < freq[pat->pat[r]])
+                        r = pb - pat->pat;
+        pat->rarec = pat->pat[r];
+        pat->rareoff = r - (pat->patlen - 1);
+
+                                                /* get md2 shift */
+        for (pe = pat->pat + pat->patlen - 1, p = pe - 1; p >= pat->pat; p--)
+                if (*p == *pe)
+                        break;
+
+        /* *p is first leftward reoccurrence of *pe */
+        pat->md2 = pe - p;
+        return (pat);
+
+mem:    sv_errno = errno;
+        bm_free(pat);
+        errno = sv_errno;
+        return (NULL);
+}
+
+void
+bm_free(pat)
+        bm_pat *pat;
+{
+        if (pat->pat != NULL)
+                free(pat->pat);
+        if (pat->delta != NULL)
+                free(pat->delta);
+        free(pat);
+}
+
+u_char *
+bm_exec(pat, base, n)
+        bm_pat *pat;
+        u_char *base;
+        size_t n;
+{
+        register u_char *e, *ep, *p, *q, *s;
+        register size_t *d0, k, md2, n1, ro;
+        register int rc;
+
+        if (n == 0)
+                return (NULL);
+
+        d0 = pat->delta;
+        n1 = pat->patlen - 1;
+        md2 = pat->md2;
+        ro = pat->rareoff;
+        rc = pat->rarec;
+        ep = pat->pat + pat->patlen - 1;
+        s = base + (pat->patlen - 1);
+
+        /* fast loop up to n - 3 * patlen */
+        e = base + n - 3 * pat->patlen;
+        while (s < e) {
+                k = d0[*s];             /* ufast skip loop */
+                while (k) {
+                        k = d0[*(s += k)];
+                        k = d0[*(s += k)];
+                }
+                if (s >= e)
+                        break;
+                if (s[ro] != rc)        /* guard test */
+                        goto mismatch1;
+                                        /* fwd match */
+                for (p = pat->pat, q = s - n1; p < ep;)
+                        if (*q++ != *p++)
+                                goto mismatch1;
+                return (s - n1);
+
+mismatch1:      s += md2;               /* md2 shift */
+        }
+
+        /* slow loop up to end */
+        e = base + n;
+        while (s < e) {
+                s += d0[*s];            /* step */
+                if (s >= e)
+                        break;
+                if (s[ro] != rc)        /* guard test */
+                        goto mismatch2;
+                                        /* fwd match */
+                for (p = pat->pat, q = s - n1; p <= ep;)
+                        if (*q++ != *p++)
+                                goto mismatch2;
+                return (s - n1);
+
+mismatch2:      s += md2;               /* md2 shift */
+        }
+
+        return (NULL);
+}
diff --git a/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3
new file mode 100644
index 0000000000..b553fd0beb
--- /dev/null
+++ b/src/lib/libc/string/bstring.3
@@ -0,0 +1,109 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: bstring.3,v 1.2 1996/08/19 08:33:59 tholo Exp $
+.\"
+.Dd April 19, 1991
+.Dt BSTRING 3
+.Os
+.Sh NAME
+.Nm bcmp ,
+.Nm bcopy ,
+.Nm bzero ,
+.Nm memccpy ,
+.Nm memchr ,
+.Nm memcmp ,
+.Nm memcpy ,
+.Nm memmove,
+.Nm memset
+.Nd byte string operations
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn bcmp "const void *b1" "const void *b2" "size_t len"
+.Ft void
+.Fn bcopy "const void *src" "void *dst" "size_t len"
+.Ft void
+.Fn bzero "void *b" "size_t len"
+.Ft void *
+.Fn memchr "const void *b" "int c" "size_t len"
+.Ft int
+.Fn memcmp "const void *b1" "const void *b2" "size_t len"
+.Ft void *
+.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
+.Ft void *
+.Fn memcpy "void *dst" "const void *src" "size_t len"
+.Ft void *
+.Fn memmove "void *dst" "const void *src" "size_t len"
+.Ft void *
+.Fn memset "void *b" "int c" "size_t len"
+.Sh DESCRIPTION
+These functions operate on variable length strings of bytes.
+They do not check for terminating null bytes as the routines
+listed in
+.Xr string 3
+do.
+.Pp
+See the specific manual pages for more information.
+.Sh SEE ALSO
+.Xr bcmp 3 ,
+.Xr bcopy 3 ,
+.Xr bzero 3 ,
+.Xr memccpy 3 ,
+.Xr memchr 3 ,
+.Xr memcmp 3 ,
+.Xr memcpy 3 ,
+.Xr memmove 3 ,
+.Xr memset 3
+.Sh STANDARDS
+The functions
+.Fn memchr ,
+.Fn memcmp ,
+.Fn memcpy ,
+.Fn memmove ,
+and
+.Fn memset
+conform to
+.St -ansiC .
+.Sh HISTORY
+The functions
+.Fn bzero
+and
+.Fn memccpy
+appeared in
+.Bx 4.3 ;
+the functions
+.Fn bcmp ,
+.Fn bcopy ,
+appeared in
+.Bx 4.2 .
diff --git a/src/lib/libc/string/bzero.3 b/src/lib/libc/string/bzero.3
new file mode 100644
index 0000000000..a8e55a63c1
--- /dev/null
+++ b/src/lib/libc/string/bzero.3
@@ -0,0 +1,67 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: bzero.3,v 1.2 1996/08/19 08:34:00 tholo Exp $
+.\"
+.Dd April 19, 1991
+.Dt BZERO 3
+.Os BSD 4.3
+.Sh NAME
+.Nm bzero
+.Nd write zeroes to a byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void
+.Fn bzero "void *b" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn bzero
+function
+writes
+.Fa len
+zero bytes to the string
+.Fa b .
+If
+.Fa len
+is zero,
+.Fn bzero
+does nothing.
+.Sh SEE ALSO
+.Xr memset 3 ,
+.Xr swab 3
+.Sh HISTORY
+A
+.Fn bzero
+function
+appeared in 
+.Bx 4.3 .
diff --git a/src/lib/libc/string/bzero.c b/src/lib/libc/string/bzero.c
new file mode 100644
index 0000000000..3e660a307f
--- /dev/null
+++ b/src/lib/libc/string/bzero.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: bzero.c,v 1.3 1996/08/19 08:34:00 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+/*
+ * bzero -- vax movc5 instruction
+ */
+void
+bzero(b, length)
+        void *b;
+        register size_t length;
+{
+        register char *p;
+
+        for (p = b; length--;)
+                *p++ = '\0';
+}
diff --git a/src/lib/libc/string/ffs.3 b/src/lib/libc/string/ffs.3
new file mode 100644
index 0000000000..9ef08aef8e
--- /dev/null
+++ b/src/lib/libc/string/ffs.3
@@ -0,0 +1,62 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: ffs.3,v 1.2 1996/08/19 08:34:01 tholo Exp $
+.\"
+.Dd April 19, 1991
+.Dt FFS 3
+.Os
+.Sh NAME
+.Nm ffs
+.Nd find first bit set in a bit string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn ffs "int value"
+.Sh DESCRIPTION
+The
+.Fn ffs
+function
+finds the first bit set in
+.Fa value
+and returns the index of that bit.
+Bits are numbered starting from 1, starting at the right-most
+bit.
+A return value of 0 means that the argument was zero.
+.Sh SEE ALSO
+.Xr bitstring 3
+.Sh HISTORY
+The
+.Fn ffs
+function appeared in
+.Bx 4.3 .
diff --git a/src/lib/libc/string/ffs.c b/src/lib/libc/string/ffs.c
new file mode 100644
index 0000000000..a0767e50ad
--- /dev/null
+++ b/src/lib/libc/string/ffs.c
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: ffs.c,v 1.3 1996/08/19 08:34:01 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+/*
+ * ffs -- vax ffs instruction
+ */
+int
+ffs(mask)
+        register int mask;
+{
+        register int bit;
+
+        if (mask == 0)
+                return(0);
+        for (bit = 1; !(mask & 1); bit++)
+                mask >>= 1;
+        return(bit);
+}
diff --git a/src/lib/libc/string/index.3 b/src/lib/libc/string/index.3
new file mode 100644
index 0000000000..d236a73a48
--- /dev/null
+++ b/src/lib/libc/string/index.3
@@ -0,0 +1,82 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: index.3,v 1.4 1997/12/30 01:09:49 deraadt Exp $
+.\"
+.Dd April 19, 1991
+.Dt INDEX 3
+.Os
+.Sh NAME
+.Nm index
+.Nd locate character in string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn index "const char *s" "int c"
+.Sh DESCRIPTION
+The
+.Fn index
+function
+locates the first character matching
+.Fa c
+(converted to a
+.Em char )
+in the null-terminated string
+.Fa s .
+.Sh RETURN VALUES
+If the character
+.Fa c
+is found, a pointer to it is returned; otherwise
+.Dv NULL
+is returned.
+If
+.Fa c
+is '\e0',
+.Fn index
+locates the terminating '\e0'.
+.Sh SEE ALSO
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh HISTORY
+An
+.Fn index
+function appeared in 
+.At v6 .
diff --git a/src/lib/libc/string/index.c b/src/lib/libc/string/index.c
new file mode 100644
index 0000000000..86c4e75f12
--- /dev/null
+++ b/src/lib/libc/string/index.c
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: index.c,v 1.2 1996/08/19 08:34:02 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+char *
+#ifdef STRCHR
+strchr(p, ch)
+#else
+index(p, ch)
+#endif
+        register const char *p, ch;
+{
+        for (;; ++p) {
+                if (*p == ch)
+                        return((char *)p);
+                if (!*p)
+                        return((char *)NULL);
+        }
+        /* NOTREACHED */
+}
diff --git a/src/lib/libc/string/memccpy.3 b/src/lib/libc/string/memccpy.3
new file mode 100644
index 0000000000..c2e15b1405
--- /dev/null
+++ b/src/lib/libc/string/memccpy.3
@@ -0,0 +1,75 @@
+.\" $OpenBSD: memccpy.3,v 1.4 1998/06/15 17:55:09 mickey Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)memccpy.3   8.1 (Berkeley) 6/9/93
+.\"
+.Dd June 9, 1993
+.Dt MEMCCPY 3
+.Os
+.Sh NAME
+.Nm memccpy
+.Nd copy string until character found
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void *
+.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn memccpy
+function
+copies bytes from string
+.Fa src
+to string
+.Fa dst .
+If the character
+.Fa c
+(as converted to an unsigned char) occurs in the string
+.Fa src ,
+the copy stops and a pointer to the byte after the copy of
+.Fa c
+in the string
+.Fa dst
+is returned.
+Otherwise,
+.Fa len
+bytes are copied, and a NULL pointer is returned.
+.Sh SEE ALSO
+.Xr bcopy 3 ,
+.Xr memcpy 3 ,
+.Xr memmove 3 ,
+.Xr strcpy 3
+.Sh HISTORY
+The
+.Fn memccpy
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/string/memccpy.c b/src/lib/libc/string/memccpy.c
new file mode 100644
index 0000000000..020e6e5679
--- /dev/null
+++ b/src/lib/libc/string/memccpy.c
@@ -0,0 +1,64 @@
+/*      $OpenBSD: memccpy.c,v 1.3 1997/08/20 04:09:39 millert Exp $     */
+
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)memccpy.c   8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$OpenBSD: memccpy.c,v 1.3 1997/08/20 04:09:39 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+void *
+memccpy(t, f, c, n)
+        void *t;
+        const void *f;
+        int c;
+        register size_t n;
+{
+
+        if (n) {
+                register unsigned char *tp = t;
+                register const unsigned char *fp = f;
+                register unsigned char uc = c;
+                do {
+                        if ((*tp++ = *fp++) == uc)
+                                return (tp);
+                } while (--n != 0);
+        }
+        return (0);
+}
diff --git a/src/lib/libc/string/memchr.3 b/src/lib/libc/string/memchr.3
new file mode 100644
index 0000000000..56a2aee9ce
--- /dev/null
+++ b/src/lib/libc/string/memchr.3
@@ -0,0 +1,81 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: memchr.3,v 1.2 1996/08/19 08:34:04 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt MEMCHR 3
+.Os
+.Sh NAME
+.Nm memchr
+.Nd locate byte in byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void *
+.Fn memchr "const void *b" "int c" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn memchr
+function
+locates the first occurrence of
+.Fa c
+(converted to an unsigned char)
+in string
+.Fa b .
+.Sh RETURN VALUES
+The
+.Fn memchr
+function
+returns a pointer to the byte located,
+or NULL if no such byte exists within
+.Fa len
+bytes.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn memchr
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/memchr.c b/src/lib/libc/string/memchr.c
new file mode 100644
index 0000000000..2ebb5dab32
--- /dev/null
+++ b/src/lib/libc/string/memchr.c
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: memchr.c,v 1.2 1996/08/19 08:34:04 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+void *
+memchr(s, c, n)
+        const void *s;
+        register unsigned char c;
+        register size_t n;
+{
+        if (n != 0) {
+                register const unsigned char *p = s;
+
+                do {
+                        if (*p++ == c)
+                                return ((void *)(p - 1));
+                } while (--n != 0);
+        }
+        return (NULL);
+}
diff --git a/src/lib/libc/string/memcmp.3 b/src/lib/libc/string/memcmp.3
new file mode 100644
index 0000000000..34c5f60861
--- /dev/null
+++ b/src/lib/libc/string/memcmp.3
@@ -0,0 +1,82 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: memcmp.3,v 1.3 1996/12/10 09:06:11 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt MEMCMP 3
+.Os
+.Sh NAME
+.Nm memcmp
+.Nd compare byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn memcmp "const void *b1" "const void *b2" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn memcmp
+function
+compares byte string
+.Fa b1
+against byte string
+.Fa b2 .
+Both strings are assumed to be
+.Fa len
+bytes long.
+.Sh RETURN VALUES
+The
+.Fn memcmp
+function
+returns zero if the two strings are identical,
+otherwise returns the difference between the first two differing bytes
+(treated as unsigned char values, so that
+.Sq Li \e200
+is greater than
+.Sq Li \&\e0 ,
+for example).
+Zero-length strings are always identical.
+.Sh SEE ALSO
+.Xr bcmp 3 ,
+.Xr strcasecmp 3 ,
+.Xr strcmp 3 ,
+.Xr strcoll 3 ,
+.Xr strxfrm 3
+.Sh STANDARDS
+The
+.Fn memcmp
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/memcmp.c b/src/lib/libc/string/memcmp.c
new file mode 100644
index 0000000000..5ce33e2998
--- /dev/null
+++ b/src/lib/libc/string/memcmp.c
@@ -0,0 +1,60 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: memcmp.c,v 1.2 1996/08/19 08:34:05 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Compare memory regions.
+ */
+int
+memcmp(s1, s2, n)
+        const void *s1, *s2;
+        size_t n;
+{
+        if (n != 0) {
+                register const unsigned char *p1 = s1, *p2 = s2;
+
+                do {
+                        if (*p1++ != *p2++)
+                                return (*--p1 - *--p2);
+                } while (--n != 0);
+        }
+        return (0);
+}
diff --git a/src/lib/libc/string/memcpy.3 b/src/lib/libc/string/memcpy.3
new file mode 100644
index 0000000000..75eb00b2d5
--- /dev/null
+++ b/src/lib/libc/string/memcpy.3
@@ -0,0 +1,83 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: memcpy.3,v 1.2 1996/08/19 08:34:06 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt MEMCPY 3
+.Os
+.Sh NAME
+.Nm memcpy
+.Nd copy byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void *
+.Fn memcpy "void *dst" "const void *src" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn memcpy
+function
+copies
+.Fa len
+bytes from string
+.Fa src
+to string
+.Fa dst .
+.Sh RETURN VALUES
+The
+.Fn memcpy
+function
+returns the original value of
+.Fa dst .
+.Sh SEE ALSO
+.Xr bcopy 3 ,
+.Xr memccpy 3 ,
+.Xr memmove 3 ,
+.Xr strcpy 3
+.Sh STANDARDS
+The
+.Fn memcpy
+function
+conforms to
+.St -ansiC .
+.Sh BUGS
+In this implementation
+.Fn memcpy
+is implemented using
+.Xr bcopy 3 ,
+and therefore the strings may overlap.
+On other systems, copying overlapping strings may produce surprises.
+A simpler solution is to not use
+.Fn memcpy .
diff --git a/src/lib/libc/string/memmove.3 b/src/lib/libc/string/memmove.3
new file mode 100644
index 0000000000..95f6b7596c
--- /dev/null
+++ b/src/lib/libc/string/memmove.3
@@ -0,0 +1,75 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: memmove.3,v 1.2 1996/08/19 08:34:07 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt MEMMOVE 3
+.Os
+.Sh NAME
+.Nm memmove
+.Nd copy byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void *
+.Fn memmove "void *dst" "const void *src" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn memmove
+function
+copies
+.Fa len
+bytes from string
+.Fa src
+to string
+.Fa dst .
+The two strings may overlap;
+the copy is always done in a non-destructive manner.
+.Sh RETURN VALUES
+The
+.Fn memmove
+function returns the original value of
+.Fa dst .
+.Sh SEE ALSO
+.Xr bcopy 3 ,
+.Xr memccpy 3 ,
+.Xr memcpy 3 ,
+.Xr strcpy 3
+.Sh STANDARDS
+The
+.Fn memmove
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/memset.3 b/src/lib/libc/string/memset.3
new file mode 100644
index 0000000000..e1d8583732
--- /dev/null
+++ b/src/lib/libc/string/memset.3
@@ -0,0 +1,72 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: memset.3,v 1.3 1997/08/24 21:56:45 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt MEMSET 3
+.Os
+.Sh NAME
+.Nm memset
+.Nd write a byte to byte string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void *
+.Fn memset "void *b" "int c" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn memset
+function
+writes
+.Fa len
+bytes of value
+.Fa c
+(converted to an unsigned char) to the string
+.Fa b .
+.Sh RETURN VALUES
+The
+.Fn memset
+function
+returns the original value of
+.Fa b .
+.Sh SEE ALSO
+.Xr bzero 3 ,
+.Xr swab 3
+.Sh STANDARDS
+The
+.Fn memset
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/memset.c b/src/lib/libc/string/memset.c
new file mode 100644
index 0000000000..c3373a21a9
--- /dev/null
+++ b/src/lib/libc/string/memset.c
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: memset.c,v 1.2 1996/08/19 08:34:07 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+void *
+memset(dst, c, n)
+        void *dst;
+        register int c;
+        register size_t n;
+{
+
+        if (n != 0) {
+                register char *d = dst;
+
+                do
+                        *d++ = c;
+                while (--n != 0);
+        }
+        return (dst);
+}
diff --git a/src/lib/libc/string/rindex.3 b/src/lib/libc/string/rindex.3
new file mode 100644
index 0000000000..db7f8e1cd8
--- /dev/null
+++ b/src/lib/libc/string/rindex.3
@@ -0,0 +1,80 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: rindex.3,v 1.3 1997/12/30 01:09:49 deraadt Exp $
+.\"
+.Dd April 19, 1991
+.Dt RINDEX 3
+.Os
+.Sh NAME
+.Nm rindex
+.Nd locate character in string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn rindex "const char *s" "int c"
+.Sh DESCRIPTION
+The
+.Fn rindex
+function
+locates the last character
+matching
+.Fa c
+(converted to a
+.Em char )
+in the null-terminated string
+.Fa s .
+If the character c is found, a pointer to it is returned; otherwise NULL is returned.
+If
+.Fa c
+is
+.Ql \e0 ,
+.Fn rindex
+locates the terminating
+.Ql \e0 .
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh HISTORY
+A
+.Fn rindex
+function appeared in 
+.At v6 .
diff --git a/src/lib/libc/string/rindex.c b/src/lib/libc/string/rindex.c
new file mode 100644
index 0000000000..f18553f667
--- /dev/null
+++ b/src/lib/libc/string/rindex.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: rindex.c,v 1.2 1996/08/19 08:34:08 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+char *
+#ifdef STRRCHR
+strrchr(p, ch)
+#else
+rindex(p, ch)
+#endif
+        register const char *p, ch;
+{
+        register char *save;
+
+        for (save = NULL;; ++p) {
+                if (*p == ch)
+                        save = (char *)p;
+                if (!*p)
+                        return(save);
+        }
+        /* NOTREACHED */
+}
diff --git a/src/lib/libc/string/strcasecmp.3 b/src/lib/libc/string/strcasecmp.3
new file mode 100644
index 0000000000..52a13055ee
--- /dev/null
+++ b/src/lib/libc/string/strcasecmp.3
@@ -0,0 +1,89 @@
+.\" $OpenBSD: strcasecmp.3,v 1.4 1998/06/15 17:55:11 mickey Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)strcasecmp.3        8.1 (Berkeley) 6/9/93
+.\"
+.Dd June 9, 1993
+.Dt STRCASECMP 3
+.Os
+.Sh NAME
+.Nm strcasecmp
+.Nd compare strings, ignoring case
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn strcasecmp "const char *s1" "const char *s2"
+.Ft int
+.Fn strncasecmp "const char *s1" "const char *s2" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn strcasecmp
+and
+.Fn strncasecmp
+functions
+compare the null-terminated strings
+.Fa s1
+and
+.Fa s2
+and return an integer greater than, equal to, or less than 0,
+according as
+.Fa s1
+is lexicographically greater than, equal to, or less than
+.Fa s2
+after translation of each corresponding character to lower-case.
+The strings themselves are not modified.
+The comparison is done using unsigned characters, so that
+.Sq Li \e200
+is greater than
+.Ql \e0 .
+.Pp
+The
+.Fn strncasecmp
+compares at most
+.Fa len
+characters.
+.Sh SEE ALSO
+.Xr bcmp 3 ,
+.Xr memcmp 3 ,
+.Xr strcmp 3 ,
+.Xr strcoll 3 ,
+.Xr strxfrm 3
+.Sh HISTORY
+The
+.Fn strcasecmp
+and
+.Fn strncasecmp
+functions first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/string/strcasecmp.c b/src/lib/libc/string/strcasecmp.c
new file mode 100644
index 0000000000..1f487524aa
--- /dev/null
+++ b/src/lib/libc/string/strcasecmp.c
@@ -0,0 +1,120 @@
+/*      $OpenBSD: strcasecmp.c,v 1.3 1997/08/20 04:13:57 millert Exp $  */
+
+/*
+ * Copyright (c) 1987, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <string.h>
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)strcasecmp.c        8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$OpenBSD: strcasecmp.c,v 1.3 1997/08/20 04:13:57 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+typedef unsigned char u_char;
+
+/*
+ * This array is designed for mapping upper and lower case letter
+ * together for a case independent comparison.  The mappings are
+ * based upon ascii character sequences.
+ */
+static const u_char charmap[] = {
+        '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+        '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+        '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+        '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+        '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+        '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+        '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+        '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+        '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+        '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+        '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+        '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+        '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+        '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+        '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+        '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+        '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+        '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+        '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+        '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+        '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+        '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+        '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+        '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+        '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+        '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+        '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+        '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+        '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+        '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+        '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+        '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+};
+
+int
+strcasecmp(s1, s2)
+        const char *s1, *s2;
+{
+        register const u_char *cm = charmap,
+                        *us1 = (const u_char *)s1,
+                        *us2 = (const u_char *)s2;
+
+        while (cm[*us1] == cm[*us2++])
+                if (*us1++ == '\0')
+                        return (0);
+        return (cm[*us1] - cm[*--us2]);
+}
+
+int
+strncasecmp(s1, s2, n)
+        const char *s1, *s2;
+        register size_t n;
+{
+        if (n != 0) {
+                register const u_char *cm = charmap,
+                                *us1 = (const u_char *)s1,
+                                *us2 = (const u_char *)s2;
+
+                do {
+                        if (cm[*us1] != cm[*us2++])
+                                return (cm[*us1] - cm[*--us2]);
+                        if (*us1++ == '\0')
+                                break;
+                } while (--n != 0);
+        }
+        return (0);
+}
diff --git a/src/lib/libc/string/strcat.3 b/src/lib/libc/string/strcat.3
new file mode 100644
index 0000000000..7591423f96
--- /dev/null
+++ b/src/lib/libc/string/strcat.3
@@ -0,0 +1,137 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strcat.3,v 1.5 1999/03/06 23:41:13 millert Exp $
+.\"
+.Dd July 8, 1997
+.Dt STRCAT 3
+.Os
+.Sh NAME
+.Nm strcat
+.Nd concatenate strings
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strcat "char *s" "const char *append"
+.Ft char *
+.Fn strncat "char *s" "const char *append" "size_t count"
+.Sh DESCRIPTION
+The
+.Fn strcat
+and
+.Fn strncat
+functions
+append a copy of the null-terminated string
+.Fa append
+to the end of the null-terminated string
+.Fa s ,
+then add a terminating
+.Ql \e0 .
+The string
+.Fa s
+must have sufficient space to hold the result.
+.Pp
+The
+.Fn strncat
+function
+appends not more than
+.Fa count
+characters where space for the terminating
+.Ql \e0
+should not be included in
+.Fa count .
+.Sh RETURN VALUES
+The
+.Fn strcat
+and
+.Fn strncat
+functions
+return the pointer
+.Fa s .
+.Sh EXAMPLES
+The following appends
+.Dq Li abc
+to
+.Dq Li chararray :
+.Bd -literal -offset indent
+char *letters = "abcdefghi";
+
+(void)strncat(chararray, letters, 3);
+.Ed
+.Pp
+The following example shows how to use
+.Fn strncat
+safely in conjunction with
+.Xr strncpy 3 .
+.Bd -literal -offset indent
+char buf[BUFSIZ];
+char *input, *suffix;
+
+(void)strncpy(buf, input, sizeof(buf) - 1);
+buf[sizeof(buf) - 1] = '\e0';
+(void)strncat(buf, suffix, sizeof(buf) - 1 - strlen(buf));
+.Ed
+.Pp
+The above will copy as many characters from
+.Dq Li input
+to
+.Dq Li buf
+as will
+fit.  It then appends as many characters from suffix as will fit (or none
+if there is no space).  For operations like this, the
+.Xr strlcpy 3
+and
+.Xr strlcat 3
+functions are a better choice, as shown below.
+.Bd -literal -offset indent
+(void)strlcpy(buf, input, sizeof(buf));
+(void)strlcat(buf, suffix, sizeof(buf));
+.Ed
+.Sh SEE ALSO
+.Xr bcopy 3 ,
+.Xr memccpy 3 ,
+.Xr memcpy 3 ,
+.Xr memmove 3 ,
+.Xr strcpy 3 ,
+.Xr strlcat 3 ,
+.Xr strlcpy 3
+.Sh STANDARDS
+The
+.Fn strcat
+and
+.Fn strncat
+functions
+conform to
+.St -ansiC .
diff --git a/src/lib/libc/string/strcat.c b/src/lib/libc/string/strcat.c
new file mode 100644
index 0000000000..374a2b7464
--- /dev/null
+++ b/src/lib/libc/string/strcat.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strcat.c,v 1.4 1996/08/19 08:34:10 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+char *
+strcat(s, append)
+        register char *s;
+        register const char *append;
+{
+        char *save = s;
+
+        for (; *s; ++s);
+        while ((*s++ = *append++) != '\0');
+        return(save);
+}
diff --git a/src/lib/libc/string/strchr.3 b/src/lib/libc/string/strchr.3
new file mode 100644
index 0000000000..c3bc2f8817
--- /dev/null
+++ b/src/lib/libc/string/strchr.3
@@ -0,0 +1,87 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strchr.3,v 1.3 1997/12/29 22:31:50 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRCHR 3
+.Os
+.Sh NAME
+.Nm strchr
+.Nd locate character in string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strchr "const char *s" "int c"
+.Sh DESCRIPTION
+The
+.Fn strchr
+function locates the first occurrence of
+.Ar c
+in the string pointed to by
+.Ar s .
+The terminating
+.Dv NUL
+character is considered part of the string.
+If
+.Fa c
+is
+.Ql \e0 ,
+.Fn strchr
+locates the terminating
+.Ql \e0 .
+.Sh RETURN VALUES
+The function
+.Fn strchr
+returns a pointer to the located character, or
+.Dv NULL
+if the character does not appear in the string.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn strchr
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strcmp.3 b/src/lib/libc/string/strcmp.3
new file mode 100644
index 0000000000..91e51d68fc
--- /dev/null
+++ b/src/lib/libc/string/strcmp.3
@@ -0,0 +1,93 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strcmp.3,v 1.2 1996/08/19 08:34:11 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRCMP 3
+.Os
+.Sh NAME
+.Nm strcmp
+.Nd compare strings
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn strcmp "const char *s1" "const char *s2"
+.Ft int
+.Fn strncmp "const char *s1" "const char *s2" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn strcmp
+and
+.Fn strncmp
+functions
+lexicographically compare the null-terminated strings
+.Fa s1
+and
+.Fa s2 .
+.Sh RETURN VALUES
+The
+.Fn strcmp
+and
+.Fn strncmp
+return an integer greater than, equal to, or less than 0, according
+as the string
+.Fa s1
+is greater than, equal to, or less than the string
+.Fa s2 .
+The comparison is done using unsigned characters, so that
+.Ql \e200
+is greater than
+.Ql \e0 .
+.Pp
+The
+.Fn strncmp
+compares not more than
+.Fa len
+characters.
+.Sh SEE ALSO
+.Xr bcmp 3 ,
+.Xr memcmp 3 ,
+.Xr strcasecmp 3 ,
+.Xr strcoll 3 ,
+.Xr strxfrm 3
+.Sh STANDARDS
+The
+.Fn strcmp
+and
+.Fn strncmp
+functions
+conform to
+.St -ansiC .
diff --git a/src/lib/libc/string/strcmp.c b/src/lib/libc/string/strcmp.c
new file mode 100644
index 0000000000..9a5b208323
--- /dev/null
+++ b/src/lib/libc/string/strcmp.c
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strcmp.c,v 1.3 1996/08/19 08:34:12 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+/*
+ * Compare strings.
+ */
+int
+strcmp(s1, s2)
+        register const char *s1, *s2;
+{
+        while (*s1 == *s2++)
+                if (*s1++ == 0)
+                        return (0);
+        return (*(unsigned char *)s1 - *(unsigned char *)--s2);
+}
diff --git a/src/lib/libc/string/strcoll.3 b/src/lib/libc/string/strcoll.3
new file mode 100644
index 0000000000..20af998885
--- /dev/null
+++ b/src/lib/libc/string/strcoll.3
@@ -0,0 +1,74 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strcoll.3,v 1.2 1996/08/19 08:34:12 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRCOLL 3
+.Os
+.Sh NAME
+.Nm strcoll
+.Nd compare strings according to current collation
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft int
+.Fn strcoll "const char *s1" "const char *s2"
+.Sh DESCRIPTION
+The
+.Fn strcoll
+function
+lexicographically compares the null-terminated strings
+.Fa s1
+and
+.Fa s2
+according to the current locale collation
+and returns an integer greater than, equal to, or less than 0,
+according as
+.Fa s1
+is greater than, equal to, or less than
+.Fa s2 .
+.Sh SEE ALSO
+.Xr bcmp 3 ,
+.Xr memcmp 3 ,
+.Xr setlocale 3 ,
+.Xr strcasecmp 3 ,
+.Xr strcmp 3 ,
+.Xr strxfrm 3
+.Sh STANDARDS
+The
+.Fn strcoll
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strcoll.c b/src/lib/libc/string/strcoll.c
new file mode 100644
index 0000000000..dca0b10d25
--- /dev/null
+++ b/src/lib/libc/string/strcoll.c
@@ -0,0 +1,52 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strcoll.c,v 1.2 1996/08/19 08:34:13 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Compare strings according to LC_COLLATE category of current locale.
+ */
+int
+strcoll(s1, s2)
+        const char *s1, *s2;
+{
+        /* LC_COLLATE is unimplemented, hence always "C" */
+        return (strcmp(s1, s2));
+}
diff --git a/src/lib/libc/string/strcpy.3 b/src/lib/libc/string/strcpy.3
new file mode 100644
index 0000000000..626a06af7b
--- /dev/null
+++ b/src/lib/libc/string/strcpy.3
@@ -0,0 +1,154 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strcpy.3,v 1.5 1999/03/06 23:36:27 millert Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRCPY 3
+.Os BSD 4
+.Sh NAME
+.Nm strcpy
+.Nd copy strings
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strcpy "char *dst" "const char *src"
+.Ft char *
+.Fn strncpy "char *dst" "const char *src" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn strcpy
+and
+.Fn strncpy
+functions
+copy the string
+.Fa src
+to
+.Fa dst
+(including the terminating
+.Ql \e0
+character).
+.Pp
+The
+.Fn strncpy
+copies not more than
+.Fa len
+characters into
+.Fa dst ,
+appending
+.Ql \e0
+characters if
+.Fa src
+is less than
+.Fa len
+characters long, and
+.Em not
+terminating
+.Fa dst
+if
+.Fa src
+is more than
+.Fa len
+characters long.
+.Sh RETURN VALUES
+The
+.Fn strcpy
+and
+.Fn strncpy
+functions
+return
+.Fa dst .
+.Sh EXAMPLES
+The following sets
+.Dq Li chararray
+to
+.Dq Li abc\e0\e0\e0 :
+.Bd -literal -offset indent
+(void)strncpy(chararray, "abc", 6);
+.Ed
+.Pp
+The following sets
+.Dq Li chararray
+to
+.Dq Li abcdef
+and does
+.Em not
+NUL-terminate chararray because the source string is >= the length parameter.
+.Fn strncpy
+.Em only
+NUL-terminates the destination string when then length of the source
+string is less than the length parameter.
+.Bd -literal -offset indent
+(void)strncpy(chararray, "abcdefgh", 6);
+.Ed
+.Pp
+The following copies as many characters from
+.Dq Li input
+to
+.Dq Li buf
+as will fit and NUL-terminates the result.  Because
+.Fn strncpy
+does
+.Em not
+guarantee to NUL-terminate the string itself, we must do this by hand.
+.Bd -literal -offset indent
+char buf[BUFSIZ];
+
+(void)strncpy(buf, input, sizeof(buf) - 1);
+buf[sizeof(buf) - 1] = '\e0';
+.Ed
+.Pp
+Note that
+.Xr strlcpy 3
+is a better choice for this kind of operation.  The equivalent using
+.Xr strlcpy 3
+is simply:
+.Bd -literal -offset indent
+(void)strlcpy(buf, input, sizeof(buf));
+.Ed
+.Sh SEE ALSO
+.Xr bcopy 3 ,
+.Xr memccpy 3 ,
+.Xr memcpy 3 ,
+.Xr memmove 3 ,
+.Xr strlcpy 3 
+.Sh STANDARDS
+The
+.Fn strcpy
+and
+.Fn strncpy
+functions
+conform to
+.St -ansiC .
diff --git a/src/lib/libc/string/strcpy.c b/src/lib/libc/string/strcpy.c
new file mode 100644
index 0000000000..76b063fc10
--- /dev/null
+++ b/src/lib/libc/string/strcpy.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strcpy.c,v 1.4 1996/08/19 08:34:14 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+char *
+strcpy(to, from)
+        register char *to;
+        register const char *from;
+{
+        char *save = to;
+
+        for (; (*to = *from) != '\0'; ++from, ++to);
+        return(save);
+}
diff --git a/src/lib/libc/string/strcspn.3 b/src/lib/libc/string/strcspn.3
new file mode 100644
index 0000000000..93c6d8f84c
--- /dev/null
+++ b/src/lib/libc/string/strcspn.3
@@ -0,0 +1,84 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strcspn.3,v 1.2 1996/08/19 08:34:14 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRCSPN 3
+.Os
+.Sh NAME
+.Nm strcspn
+.Nd span the complement of a string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft size_t
+.Fn strcspn "const char *s" "const char *charset"
+.Sh DESCRIPTION
+The
+.Fn strcspn
+function
+spans the initial part of the null-terminated string
+.Fa s
+as long as the characters from
+.Fa s
+do not occur in string
+.Fa charset
+(it
+spans the
+.Em complement
+of
+.Fa charset ) .
+.Sh RETURN VALUES
+The
+.Fn strcspn
+function
+returns the number of characters spanned.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn strcspn
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strcspn.c b/src/lib/libc/string/strcspn.c
new file mode 100644
index 0000000000..f7261564a7
--- /dev/null
+++ b/src/lib/libc/string/strcspn.c
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strcspn.c,v 1.2 1996/08/19 08:34:15 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Span the complement of string s2.
+ */
+size_t
+strcspn(s1, s2)
+        const char *s1;
+        register const char *s2;
+{
+        register const char *p, *spanp;
+        register char c, sc;
+
+        /*
+         * Stop as soon as we find any character from s2.  Note that there
+         * must be a NUL in s2; it suffices to stop when we find that, too.
+         */
+        for (p = s1;;) {
+                c = *p++;
+                spanp = s2;
+                do {
+                        if ((sc = *spanp++) == c)
+                                return (p - 1 - s1);
+                } while (sc != 0);
+        }
+        /* NOTREACHED */
+}
diff --git a/src/lib/libc/string/strdup.3 b/src/lib/libc/string/strdup.3
new file mode 100644
index 0000000000..6abbba57cb
--- /dev/null
+++ b/src/lib/libc/string/strdup.3
@@ -0,0 +1,68 @@
+.\" $OpenBSD: strdup.3,v 1.6 1998/08/19 05:51:14 pjanzen Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)strdup.3    8.1 (Berkeley) 6/9/93
+.\"
+.Dd June 9, 1993
+.Dt STRDUP 3
+.Os
+.Sh NAME
+.Nm strdup
+.Nd save a copy of a string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strdup "const char *str"
+.Sh DESCRIPTION
+The
+.Fn strdup
+function
+allocates sufficient memory for a copy
+of the string
+.Fa str ,
+does the copy, and returns a pointer to it.
+The pointer may subsequently be used as an
+argument to the function
+.Xr free 3 .
+.Pp
+If insufficient memory is available, NULL is returned.
+.Sh SEE ALSO
+.Xr free 3 ,
+.Xr malloc 3 ,
+.Xr strcpy 3 ,
+.Xr strlen 3
+.Sh HISTORY
+The
+.Fn strdup
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/string/strdup.c b/src/lib/libc/string/strdup.c
new file mode 100644
index 0000000000..be7f7ad094
--- /dev/null
+++ b/src/lib/libc/string/strdup.c
@@ -0,0 +1,62 @@
+/*      $OpenBSD: strdup.c,v 1.3 1997/08/20 04:18:52 millert Exp $      */
+
+/*
+ * Copyright (c) 1988, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)strdup.c    8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$OpenBSD: strdup.c,v 1.3 1997/08/20 04:18:52 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+char *
+strdup(str)
+        const char *str;
+{
+        size_t siz;
+        char *copy;
+
+        siz = strlen(str) + 1;
+        if ((copy = malloc(siz)) == NULL)
+                return(NULL);
+        (void)memcpy(copy, str, siz);
+        return(copy);
+}
diff --git a/src/lib/libc/string/strerror.3 b/src/lib/libc/string/strerror.3
new file mode 100644
index 0000000000..487c2b0e9f
--- /dev/null
+++ b/src/lib/libc/string/strerror.3
@@ -0,0 +1,65 @@
+.\" Copyright (c) 1980, 1991 Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strerror.3,v 1.2 1996/08/19 08:34:16 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRERROR 3
+.Os BSD 4
+.Sh NAME
+.Nm strerror
+.Nd get error message string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strerror "int errnum"
+.Sh DESCRIPTION
+The
+.Fn strerror
+function returns a pointer to the language-dependent error message
+string affiliated with an error number.
+.Pp
+The array pointed to is not to be modified by the program, but may be
+overwritten by subsequent calls to
+.Fn strerror .
+.Sh SEE ALSO
+.Xr intro 2 ,
+.Xr perror 3 ,
+.Xr setlocale 3
+.Sh STANDARDS
+The
+.Fn strerror
+function conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strerror.c b/src/lib/libc/string/strerror.c
new file mode 100644
index 0000000000..0e2690c3dd
--- /dev/null
+++ b/src/lib/libc/string/strerror.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strerror.c,v 1.2 1996/08/19 08:34:17 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+#include <limits.h>
+
+/*
+ * Since perror() is not allowed to change the contents of strerror()'s
+ * static buffer, both functions supply their own buffers to the
+ * internal function __strerror().
+ */
+
+extern char *__strerror __P((int, char *));
+
+char *
+strerror(num)
+        int num;
+{
+        static char buf[NL_TEXTMAX];
+        return __strerror(num, buf);
+}
diff --git a/src/lib/libc/string/string.3 b/src/lib/libc/string/string.3
new file mode 100644
index 0000000000..323d4f3040
--- /dev/null
+++ b/src/lib/libc/string/string.3
@@ -0,0 +1,155 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: string.3,v 1.3 1998/09/06 22:23:18 aaron Exp $
+.\"
+.Dd April 19, 1991
+.Dt STRING 3
+.Os BSD 4
+.Sh NAME
+.Nm strcat ,
+.Nm strncat ,
+.Nm strchr ,
+.Nm strrchr ,
+.Nm strcmp ,
+.Nm strncmp ,
+.Nm strcasecmp,
+.Nm strncasecmp ,
+.Nm strcpy ,
+.Nm strncpy ,
+.Nm strerror ,
+.Nm strlen ,
+.Nm strpbrk ,
+.Nm strsep,
+.Nm strspn ,
+.Nm strcspn ,
+.Nm strstr ,
+.Nm strtok ,
+.Nm index ,
+.Nm rindex
+.Nd string specific functions
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strcat "char *s" "const char * append"
+.Ft char *
+.Fn strncat "char *s" "const char *append" "size_t count"
+.Ft char *
+.Fn strchr "const char *s" "int c"
+.Ft char *
+.Fn strrchr "const char *s" "int c"
+.Ft int
+.Fn strcmp "const char *s1" "const char *s2"
+.Ft int
+.Fn strncmp "const char *s1" "const char *s2" "size_t count"
+.Ft int
+.Fn strcasecmp "const char *s1" "const char *s2"
+.Ft int
+.Fn strncasecmp "const char *s1" "const char *s2" "size_t count"
+.Ft char *
+.Fn strcpy "char *dst" "const char *src"
+.Ft char *
+.Fn strncpy "char *dst" "const char *src" "size_t count"
+.Ft char *
+.Fn strerror "int errno"
+.Ft size_t
+.Fn strlen "const char *s"
+.Ft char *
+.Fn strpbrk "const char *s" "const char *charset"
+.Ft char *
+.Fn strsep "char **stringp" "const char *delim"
+.Ft size_t
+.Fn strspn "const char *s" "const char *charset"
+.Ft size_t
+.Fn strcspn "const char *s" "const char *charset"
+.Ft char *
+.Fn strstr "const char *big" "const char *little"
+.Ft char *
+.Fn strtok "char *s" "const char *delim"
+.Ft char *
+.Fn index "const char *s" "int c"
+.Ft char *
+.Fn rindex "const char *s" "int c"
+.Sh DESCRIPTION
+The string functions
+manipulate strings terminated by a
+null byte.
+.Pp
+See the specific manual pages for more information.
+For manipulating variable length generic objects as byte
+strings (without the null byte check), see
+.Xr bstring 3 .
+.Pp
+Except as noted in their specific manual pages,
+the string functions do not test the destination
+for size limitations.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr strcat 3 ,
+.Xr strchr 3 ,
+.Xr strrchr 3 ,
+.Xr strcmp 3 ,
+.Xr strcasecmp 3 ,
+.Xr strcpy 3 ,
+.Xr strerror 3 ,
+.Xr strlen 3 ,
+.Xr strpbrk 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strcspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3 ,
+.Xr rindex 3
+.Xr bstring 3
+.Sh STANDARDS
+The
+.Fn strcat ,
+.Fn strncat ,
+.Fn strchr ,
+.Fn strrchr ,
+.Fn strcmp ,
+.Fn strncmp ,
+.Fn strcpy ,
+.Fn strncpy ,
+.Fn strerror ,
+.Fn strlen ,
+.Fn strpbrk ,
+.Fn strsep ,
+.Fn strspn ,
+.Fn strcspn ,
+.Fn strstr ,
+and
+.Fn strtok
+functions
+conform to
+.St -ansiC .
diff --git a/src/lib/libc/string/strlcat.c b/src/lib/libc/string/strlcat.c
new file mode 100644
index 0000000000..2e8c56926e
--- /dev/null
+++ b/src/lib/libc/string/strlcat.c
@@ -0,0 +1,71 @@
+/*      $OpenBSD: strlcat.c,v 1.1 1998/07/01 01:29:45 millert Exp $     */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlcat.c,v 1.1 1998/07/01 01:29:45 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t strlcat(dst, src, siz)
+        char *dst;
+        const char *src;
+        size_t siz;
+{
+        register char *d = dst;
+        register const char *s = src;
+        register size_t n = siz;
+        size_t dlen;
+
+        /* Find the end of dst and adjust bytes left */
+        while (*d != '\0' && n != 0)
+                d++;
+        dlen = d - dst;
+        n -= dlen;
+
+        if (n == 0)
+                return(dlen + strlen(s));
+        while (*s != '\0') {
+                if (n != 1) {
+                        *d++ = *s;
+                        n--;
+                }
+                s++;
+        }
+        *d = '\0';
+
+        return(dlen + (s - src));       /* count does not include NUL */
+}
diff --git a/src/lib/libc/string/strlcpy.3 b/src/lib/libc/string/strlcpy.3
new file mode 100644
index 0000000000..1e46ef2e90
--- /dev/null
+++ b/src/lib/libc/string/strlcpy.3
@@ -0,0 +1,147 @@
+.\" $OpenBSD: strlcpy.3,v 1.3 1998/11/11 17:12:02 espie Exp $
+.\"
+.\" Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+.\" 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. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd June 22, 1998
+.Dt STRLCPY 3
+.Os
+.Sh NAME
+.Nm strlcpy,
+.Nm strlcat
+.Nd size-bounded string copying and concatenation
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft size_t
+.Fn strlcpy "char *dst" "const char *src" "size_t size"
+.Ft size_t
+.Fn strlcat "char *dst" "const char *src" "size_t size"
+.Sh DESCRIPTION
+The
+.Fn strlcpy
+and
+.Fn strlcat
+functions copy and concatenate strings respectively.  They are designed
+to be safer, more consistent, and less error prone replacements for
+.Xr strncpy 3
+and
+.Xr strncat 3 .
+Unlike those functions,
+.Fn strlcpy
+and
+.Fn strlcat
+take the full size of the buffer (not just the length) and guarantee to
+NUL-terminate the result (as long as
+.Fa size
+is larger than 0).  Note that you should include a byte for the NUL in
+.Fa size .
+.Pp
+The
+.Fn strlcpy
+function copies up to
+.Fa size
+- 1 characters from the NUL-terminated string
+.Fa src
+to
+.Fa dst ,
+NUL-terminating the result.
+.Pp
+The
+.Fn strlcat
+function appends the NUL-terminated string
+.Fa src
+to the end of
+.Fa dst .
+It will append at most
+.Fa size
+- strlen(dst) - 1 bytes, NUL-terminating the result.
+.Sh RETURN VALUES
+The
+.Fn strlcpy
+and
+.Fn strlcat
+functions return the total length of the string they tried to
+create.  For
+.Fn strlcpy
+that means the length of
+.Fa src .
+For
+.Fn strlcat
+that means the initial length of
+.Fa dst
+plus
+the length of
+.Fa src .
+While this may seem somewhat confusing it was done to make
+truncation detection simple.
+.Sh EXAMPLES
+The following code fragment illustrates the simple case:
+.Bd -literal -offset indent
+char *s, *p, buf[BUFSIZ];
+
+.Li ...
+
+(void)strlcpy(buf, s, sizeof(buf));
+(void)strlcat(buf, p, sizeof(buf));
+.Ed
+.Pp
+To detect truncation, perhaps while building a pathname, something
+like the following might be used:
+.Bd -literal -offset indent
+char *dir, *file, pname[MAXPATHNAMELEN];
+
+.Li ...
+
+if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname))
+        goto toolong;
+if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname))
+        goto toolong;
+.Ed
+.Pp
+Since we know how many characters we copied the first time, we can
+speed things up a bit by using a copy instead on an append:
+.Bd -literal -offset indent
+char *dir, *file, pname[MAXPATHNAMELEN];
+size_t n;
+
+.Li ...
+
+n = strlcpy(pname, dir, sizeof(pname));
+if (n >= sizeof(pname))
+        goto toolong;
+if (strlcpy(pname + n, file, sizeof(pname) - n) >= sizeof(pname) - n)
+        goto toolong;
+.Ed
+.Pp
+However, one may question the validity of such optimizations, as they
+defeat the whole purpose of
+.Fn strlcpy
+and
+.Fn strlcat .
+As a matter of fact, the first version of this manual page got it wrong.
+.Sh SEE ALSO
+.Xr snprintf 3 ,
+.Xr strncpy 3 ,
+.Xr strncat 3
diff --git a/src/lib/libc/string/strlcpy.c b/src/lib/libc/string/strlcpy.c
new file mode 100644
index 0000000000..2b6a166175
--- /dev/null
+++ b/src/lib/libc/string/strlcpy.c
@@ -0,0 +1,63 @@
+/*      $OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $    */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t strlcpy(dst, src, siz)
+        char *dst;
+        const char *src;
+        size_t siz;
+{
+        register char *d = dst;
+        register const char *s = src;
+        register size_t n = siz;
+
+        if (n == 0)
+                return(strlen(s));
+        while (*s != '\0') {
+                if (n != 1) {
+                        *d++ = *s;
+                        n--;
+                }
+                s++;
+        }
+        *d = '\0';
+
+        return(s - src);        /* count does not include NUL */
+}
diff --git a/src/lib/libc/string/strlen.3 b/src/lib/libc/string/strlen.3
new file mode 100644
index 0000000000..99e7dd19c3
--- /dev/null
+++ b/src/lib/libc/string/strlen.3
@@ -0,0 +1,70 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strlen.3,v 1.2 1996/08/19 08:34:19 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRLEN 3
+.Os
+.Sh NAME
+.Nm strlen
+.Nd find length of string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft size_t
+.Fn strlen "const char *s"
+.Sh DESCRIPTION
+The
+.Fn strlen
+function
+computes the length of the string
+.Fa s .
+.Sh RETURN VALUES
+The
+.Fn strlen
+function
+returns
+the number of characters that precede the
+terminating
+.Dv NUL
+character.
+.Sh SEE ALSO
+.Xr string 3
+.Sh STANDARDS
+The
+.Fn strlen
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strlen.c b/src/lib/libc/string/strlen.c
new file mode 100644
index 0000000000..332d5766f9
--- /dev/null
+++ b/src/lib/libc/string/strlen.c
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlen.c,v 1.3 1996/08/19 08:34:19 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+size_t
+strlen(str)
+        const char *str;
+{
+        register const char *s;
+
+        for (s = str; *s; ++s);
+        return(s - str);
+}
+
diff --git a/src/lib/libc/string/strmode.3 b/src/lib/libc/string/strmode.3
new file mode 100644
index 0000000000..3db953704d
--- /dev/null
+++ b/src/lib/libc/string/strmode.3
@@ -0,0 +1,152 @@
+.\" $OpenBSD: strmode.3,v 1.6 1998/06/15 17:55:13 mickey Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)strmode.3   8.3 (Berkeley) 7/28/94
+.\"
+.Dd July 28, 1994
+.Dt STRMODE 3
+.Os
+.Sh NAME
+.Nm strmode
+.Nd convert inode status information into a symbolic string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft void
+.Fn strmode "mode_t mode" "char *bp"
+.Sh DESCRIPTION
+The
+.Fn strmode
+function
+converts a file
+.Fa mode
+(the type and permission information associated with an inode, see
+.Xr stat 2 )
+into a symbolic string which is stored in the location referenced by
+.Fa bp .
+This stored string is eleven characters in length plus a trailing
+.Dv NUL .
+.Pp
+The first character is the inode type, and will be one of the following:
+.Pp
+.Bl -tag -width flag -offset indent -compact
+.It \-
+regular file
+.It b
+block special
+.It c
+character special
+.It d
+directory
+.It l
+symbolic link
+.It p
+fifo
+.It s
+socket
+.It w
+whiteout
+.It ?
+unknown inode type
+.El
+.Pp
+The next nine characters encode three sets of permissions, in three
+characters each.
+The first three characters are the permissions for the owner of the
+file, the second three for the group the file belongs to, and the
+third for the ``other'', or default, set of users.
+.Pp
+Permission checking is done as specifically as possible.
+If read permission is denied to the owner of a file in the first set
+of permissions, the owner of the file will not be able to read the file.
+This is true even if the owner is in the file's group and the group
+permissions allow reading or the ``other'' permissions allow reading.
+.Pp
+If the first character of the three character set is an ``r'', the file is
+readable for that set of users; if a dash ``\-'', it is not readable.
+.Pp
+If the second character of the three character set is a ``w'', the file is
+writable for that set of users; if a dash ``\-'', it is not writable.
+.Pp
+The third character is the first of the following characters that apply:
+.Bl -tag -width xxxx
+.It S
+If the character is part of the owner permissions and the file is not
+executable or the directory is not searchable by the owner, and the
+set-user-id bit is set.
+.It S
+If the character is part of the group permissions and the file is not
+executable or the directory is not searchable by the group, and the
+set-group-id bit is set.
+.It T
+If the character is part of the other permissions and the file is not
+executable or the directory is not searchable by others, and the ``sticky''
+.Pq Dv S_ISVTX
+bit is set.
+.It s
+If the character is part of the owner permissions and the file is
+executable or the directory searchable by the owner, and the set-user-id
+bit is set.
+.It s
+If the character is part of the group permissions and the file is
+executable or the directory searchable by the group, and the set-group-id
+bit is set.
+.It t
+If the character is part of the other permissions and the file is
+executable or the directory searchable by others, and the ``sticky''
+.Pq Dv S_ISVTX
+bit is set.
+.It x
+The file is executable or the directory is searchable.
+.It \-
+None of the above apply.
+.El
+.Pp
+The last character is a plus sign ``+'' if there are any alternate
+or additional access control methods associated with the inode, otherwise
+it will be a space.
+.Sh RETURN VALUES
+The
+.Fn strmode
+function
+always returns 0.
+.Sh SEE ALSO
+.Xr chmod 1 ,
+.Xr find 1 ,
+.Xr stat 2 ,
+.Xr getmode 3 ,
+.Xr setmode 3
+.Sh HISTORY
+The
+.Fn strmode
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/string/strmode.c b/src/lib/libc/string/strmode.c
new file mode 100644
index 0000000000..5e7f15e857
--- /dev/null
+++ b/src/lib/libc/string/strmode.c
@@ -0,0 +1,152 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strmode.c,v 1.3 1997/06/13 13:57:20 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+
+void
+strmode(mode, p)
+        register mode_t mode;
+        register char *p;
+{
+         /* print type */
+        switch (mode & S_IFMT) {
+        case S_IFDIR:                   /* directory */
+                *p++ = 'd';
+                break;
+        case S_IFCHR:                   /* character special */
+                *p++ = 'c';
+                break;
+        case S_IFBLK:                   /* block special */
+                *p++ = 'b';
+                break;
+        case S_IFREG:                   /* regular */
+                *p++ = '-';
+                break;
+        case S_IFLNK:                   /* symbolic link */
+                *p++ = 'l';
+                break;
+        case S_IFSOCK:                  /* socket */
+                *p++ = 's';
+                break;
+#ifdef S_IFIFO
+        case S_IFIFO:                   /* fifo */
+                *p++ = 'p';
+                break;
+#endif
+#ifdef S_IFWHT
+        case S_IFWHT:                   /* whiteout */
+                *p++ = 'w';
+                break;
+#endif
+        default:                        /* unknown */
+                *p++ = '?';
+                break;
+        }
+        /* usr */
+        if (mode & S_IRUSR)
+                *p++ = 'r';
+        else
+                *p++ = '-';
+        if (mode & S_IWUSR)
+                *p++ = 'w';
+        else
+                *p++ = '-';
+        switch (mode & (S_IXUSR | S_ISUID)) {
+        case 0:
+                *p++ = '-';
+                break;
+        case S_IXUSR:
+                *p++ = 'x';
+                break;
+        case S_ISUID:
+                *p++ = 'S';
+                break;
+        case S_IXUSR | S_ISUID:
+                *p++ = 's';
+                break;
+        }
+        /* group */
+        if (mode & S_IRGRP)
+                *p++ = 'r';
+        else
+                *p++ = '-';
+        if (mode & S_IWGRP)
+                *p++ = 'w';
+        else
+                *p++ = '-';
+        switch (mode & (S_IXGRP | S_ISGID)) {
+        case 0:
+                *p++ = '-';
+                break;
+        case S_IXGRP:
+                *p++ = 'x';
+                break;
+        case S_ISGID:
+                *p++ = 'S';
+                break;
+        case S_IXGRP | S_ISGID:
+                *p++ = 's';
+                break;
+        }
+        /* other */
+        if (mode & S_IROTH)
+                *p++ = 'r';
+        else
+                *p++ = '-';
+        if (mode & S_IWOTH)
+                *p++ = 'w';
+        else
+                *p++ = '-';
+        switch (mode & (S_IXOTH | S_ISVTX)) {
+        case 0:
+                *p++ = '-';
+                break;
+        case S_IXOTH:
+                *p++ = 'x';
+                break;
+        case S_ISVTX:
+                *p++ = 'T';
+                break;
+        case S_IXOTH | S_ISVTX:
+                *p++ = 't';
+                break;
+        }
+        *p++ = ' ';             /* will be a '+' if ACL's implemented */
+        *p = '\0';
+}
diff --git a/src/lib/libc/string/strncat.c b/src/lib/libc/string/strncat.c
new file mode 100644
index 0000000000..27ae2ba324
--- /dev/null
+++ b/src/lib/libc/string/strncat.c
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strncat.c,v 1.2 1996/08/19 08:34:21 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Concatenate src on the end of dst.  At most strlen(dst)+n+1 bytes
+ * are written at dst (at most n+1 bytes being appended).  Return dst.
+ */
+char *
+strncat(dst, src, n)
+        char *dst;
+        const char *src;
+        register size_t n;
+{
+        if (n != 0) {
+                register char *d = dst;
+                register const char *s = src;
+
+                while (*d != 0)
+                        d++;
+                do {
+                        if ((*d = *s++) == 0)
+                                break;
+                        d++;
+                } while (--n != 0);
+                *d = 0;
+        }
+        return (dst);
+}
diff --git a/src/lib/libc/string/strncmp.c b/src/lib/libc/string/strncmp.c
new file mode 100644
index 0000000000..0224957f8b
--- /dev/null
+++ b/src/lib/libc/string/strncmp.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strncmp.c,v 1.3 1996/08/19 08:34:21 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef _KERNEL
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+int
+strncmp(s1, s2, n)
+        register const char *s1, *s2;
+        register size_t n;
+{
+
+        if (n == 0)
+                return (0);
+        do {
+                if (*s1 != *s2++)
+                        return (*(unsigned char *)s1 - *(unsigned char *)--s2);
+                if (*s1++ == 0)
+                        break;
+        } while (--n != 0);
+        return (0);
+}
diff --git a/src/lib/libc/string/strncpy.c b/src/lib/libc/string/strncpy.c
new file mode 100644
index 0000000000..01bc8a872e
--- /dev/null
+++ b/src/lib/libc/string/strncpy.c
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strncpy.c,v 1.2 1996/08/19 08:34:22 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Copy src to dst, truncating or null-padding to always copy n bytes.
+ * Return dst.
+ */
+char *
+strncpy(dst, src, n)
+        char *dst;
+        const char *src;
+        register size_t n;
+{
+        if (n != 0) {
+                register char *d = dst;
+                register const char *s = src;
+
+                do {
+                        if ((*d++ = *s++) == 0) {
+                                /* NUL pad the remaining n-1 bytes */
+                                while (--n != 0)
+                                        *d++ = 0;
+                                break;
+                        }
+                } while (--n != 0);
+        }
+        return (dst);
+}
diff --git a/src/lib/libc/string/strpbrk.3 b/src/lib/libc/string/strpbrk.3
new file mode 100644
index 0000000000..5876f560a9
--- /dev/null
+++ b/src/lib/libc/string/strpbrk.3
@@ -0,0 +1,79 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strpbrk.3,v 1.2 1996/08/19 08:34:22 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRPBRK 3
+.Os
+.Sh NAME
+.Nm strpbrk
+.Nd locate multiple characters in string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strpbrk "const char *s" "const char *charset"
+.Sh DESCRIPTION
+The
+.Fn strpbrk
+function
+locates in the null-terminated string
+.Fa s
+the first occurrence of any character in the string
+.Fa charset
+and returns a pointer to this character.
+If no characters from
+.Fa charset
+occur anywhere in
+.Fa s
+.Fn strpbrk
+returns NULL.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn strpbrk
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strpbrk.c b/src/lib/libc/string/strpbrk.c
new file mode 100644
index 0000000000..748a3a8c94
--- /dev/null
+++ b/src/lib/libc/string/strpbrk.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1985 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strpbrk.c,v 1.2 1996/08/19 08:34:23 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Find the first occurrence in s1 of a character in s2 (excluding NUL).
+ */
+char *
+strpbrk(s1, s2)
+        register const char *s1, *s2;
+{
+        register const char *scanp;
+        register int c, sc;
+
+        while ((c = *s1++) != 0) {
+                for (scanp = s2; (sc = *scanp++) != 0;)
+                        if (sc == c)
+                                return ((char *)(s1 - 1));
+        }
+        return (NULL);
+}
diff --git a/src/lib/libc/string/strrchr.3 b/src/lib/libc/string/strrchr.3
new file mode 100644
index 0000000000..6dd00d32fb
--- /dev/null
+++ b/src/lib/libc/string/strrchr.3
@@ -0,0 +1,90 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strrchr.3,v 1.2 1996/08/19 08:34:23 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRRCHR 3
+.Os
+.Sh NAME
+.Nm strrchr
+.Nd locate character in string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strrchr "const char *s" "int c"
+.Sh DESCRIPTION
+The
+.Fn strrchr
+function
+locates the last occurrence of
+.Fa c
+(converted to a char)
+in the string
+.Fa s .
+If
+.Fa c
+is
+.Ql \e0 ,
+.Fn strrchr
+locates the terminating
+.Ql \e0 .
+.Sh RETURN VALUES
+The
+.Fn strrchr
+function
+returns a pointer to the character,
+or a null
+pointer if
+.Fa c
+does not occur anywhere in
+.Fa s .
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn strrchr
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strsep.3 b/src/lib/libc/string/strsep.3
new file mode 100644
index 0000000000..5af262a074
--- /dev/null
+++ b/src/lib/libc/string/strsep.3
@@ -0,0 +1,110 @@
+.\" $OpenBSD: strsep.3,v 1.4 1998/06/15 17:55:14 mickey Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)strsep.3    8.1 (Berkeley) 6/9/93
+.\"
+.Dd June 9, 1993
+.Dt STRSEP 3
+.Os
+.Sh NAME
+.Nm strsep
+.Nd separate strings
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strsep "char **stringp" "char *delim"
+.Sh DESCRIPTION
+The
+.Fn strsep
+function locates, in the string referenced by
+.Fa *stringp ,
+the first occurrence of any character in the string
+.Fa delim
+(or the terminating
+.Ql \e0
+character) and replaces it with a
+.Ql \e0 .
+The location of the next character after the delimiter character
+(or NULL, if the end of the string was reached) is stored in
+.Fa *stringp .
+The original value of
+.Fa *stringp
+is returned.
+.Pp
+An ``empty'' field, i.e. one caused by two adjacent delimiter characters,
+can be detected by comparing the location referenced by the pointer returned
+in
+.Fa *stringp
+to
+.Ql \e0 .
+.Pp
+If
+.Fa *stringp
+is initially
+.Dv NULL ,
+.Fn strsep
+returns
+.Dv NULL .
+.Sh EXAMPLES
+The following uses
+.Fn strsep
+to parse a string, containing tokens delimited by white space, into an
+argument vector:
+.Bd -literal -offset indent
+char **ap, *argv[10], *inputstring;
+
+for (ap = argv; (*ap = strsep(&inputstring, " \et")) != NULL;)
+        if (**ap != '\e0')
+                ++ap;
+.Ed
+.Sh HISTORY
+The
+.Fn strsep
+function
+is intended as a replacement for the
+.Fn strtok
+function.
+While the
+.Fn strtok
+function should be preferred for portability reasons (it conforms to
+.St -ansiC )
+it is unable to handle empty fields, i.e. detect fields delimited by
+two adjacent delimiter characters, or to be used for more than a single
+string at a time.
+The
+.Fn strsep
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/string/strsep.c b/src/lib/libc/string/strsep.c
new file mode 100644
index 0000000000..b69b715fc5
--- /dev/null
+++ b/src/lib/libc/string/strsep.c
@@ -0,0 +1,85 @@
+/*      $OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $      */
+
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)strsep.c    8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Get next token from string *stringp, where tokens are possibly-empty
+ * strings separated by characters from delim.  
+ *
+ * Writes NULs into the string at *stringp to end tokens.
+ * delim need not remain constant from call to call.
+ * On return, *stringp points past the last NUL written (if there might
+ * be further tokens), or is NULL (if there are definitely no more tokens).
+ *
+ * If *stringp is NULL, strsep returns NULL.
+ */
+char *
+strsep(stringp, delim)
+        register char **stringp;
+        register const char *delim;
+{
+        register char *s;
+        register const char *spanp;
+        register int c, sc;
+        char *tok;
+
+        if ((s = *stringp) == NULL)
+                return (NULL);
+        for (tok = s;;) {
+                c = *s++;
+                spanp = delim;
+                do {
+                        if ((sc = *spanp++) == c) {
+                                if (c == 0)
+                                        s = NULL;
+                                else
+                                        s[-1] = 0;
+                                *stringp = s;
+                                return (tok);
+                        }
+                } while (sc != 0);
+        }
+        /* NOTREACHED */
+}
diff --git a/src/lib/libc/string/strsignal.3 b/src/lib/libc/string/strsignal.3
new file mode 100644
index 0000000000..42e433c259
--- /dev/null
+++ b/src/lib/libc/string/strsignal.3
@@ -0,0 +1,60 @@
+.\" Copyright (c) 1980, 1991 Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strsignal.3,v 1.2 1996/08/19 08:34:25 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRSIGNAL 3
+.Os BSD 4
+.Sh NAME
+.Nm strsignal
+.Nd get signal description string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strsignal "int sig"
+.Sh DESCRIPTION
+The
+.Fn strsignal
+function returns a pointer to the language-dependent string describing
+a signal.
+.Pp
+The array pointed to is not to be modified by the program, but may be
+overwritten by subsequent calls to
+.Fn strsignal .
+.Sh SEE ALSO
+.Xr intro 2 ,
+.Xr psignal 3 ,
+.Xr setlocale 3
diff --git a/src/lib/libc/string/strsignal.c b/src/lib/libc/string/strsignal.c
new file mode 100644
index 0000000000..cf03af5963
--- /dev/null
+++ b/src/lib/libc/string/strsignal.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strsignal.c,v 1.2 1996/08/19 08:34:25 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+#include <limits.h>
+
+extern char *__strsignal __P((int, char *));
+
+char *
+strsignal(sig)
+        int sig;
+{
+        static char buf[NL_TEXTMAX];
+        return __strsignal(sig, buf);
+}
diff --git a/src/lib/libc/string/strspn.3 b/src/lib/libc/string/strspn.3
new file mode 100644
index 0000000000..7d15470dee
--- /dev/null
+++ b/src/lib/libc/string/strspn.3
@@ -0,0 +1,79 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strspn.3,v 1.3 1996/08/19 08:34:25 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRSPN 3
+.Os
+.Sh NAME
+.Nm strspn
+.Nd span a string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft size_t
+.Fn strspn "const char *s" "const char *charset"
+.Sh DESCRIPTION
+The
+.Fn strspn
+function
+spans the initial part of the null-terminated string
+.Fa s
+as long as the characters from
+.Fa s
+occur in string
+.Fa charset .
+.Sh RETURN VALUES
+The
+.Fn strspn
+function
+returns the number of characters spanned.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strstr 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn strspn
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strspn.c b/src/lib/libc/string/strspn.c
new file mode 100644
index 0000000000..41940f9190
--- /dev/null
+++ b/src/lib/libc/string/strspn.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strspn.c,v 1.2 1996/08/19 08:34:26 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Span the string s2 (skip characters that are in s2).
+ */
+size_t
+strspn(s1, s2)
+        const char *s1;
+        register const char *s2;
+{
+        register const char *p = s1, *spanp;
+        register char c, sc;
+
+        /*
+         * Skip any characters in s2, excluding the terminating \0.
+         */
+cont:
+        c = *p++;
+        for (spanp = s2; (sc = *spanp++) != 0;)
+                if (sc == c)
+                        goto cont;
+        return (p - 1 - s1);
+}
diff --git a/src/lib/libc/string/strstr.3 b/src/lib/libc/string/strstr.3
new file mode 100644
index 0000000000..fa455b426a
--- /dev/null
+++ b/src/lib/libc/string/strstr.3
@@ -0,0 +1,88 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strstr.3,v 1.2 1996/08/19 08:34:26 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRSTR 3
+.Os
+.Sh NAME
+.Nm strstr
+.Nd locate a substring in a string
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strstr "const char *big" "const char *little"
+.Sh DESCRIPTION
+The
+.Fn strstr
+function
+locates the first occurrence of the null-terminated string
+.Fa little
+in the null-terminated string
+.Fa big .
+If
+.Fa little
+is the empty string,
+.Fn strstr
+returns
+.Fa big ;
+if
+.Fa little
+occurs nowhere in
+.Fa big ,
+.Fn strstr
+returns NULL;
+otherwise
+.Fn strstr
+returns a pointer to the first character of the first occurrence of
+.Fa little .
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strtok 3
+.Sh STANDARDS
+The
+.Fn strstr
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strstr.c b/src/lib/libc/string/strstr.c
new file mode 100644
index 0000000000..763c7e29d7
--- /dev/null
+++ b/src/lib/libc/string/strstr.c
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strstr.c,v 1.2 1996/08/19 08:34:27 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Find the first occurrence of find in s.
+ */
+char *
+strstr(s, find)
+        register const char *s, *find;
+{
+        register char c, sc;
+        register size_t len;
+
+        if ((c = *find++) != 0) {
+                len = strlen(find);
+                do {
+                        do {
+                                if ((sc = *s++) == 0)
+                                        return (NULL);
+                        } while (sc != c);
+                } while (strncmp(s, find, len) != 0);
+                s--;
+        }
+        return ((char *)s);
+}
diff --git a/src/lib/libc/string/strtok.3 b/src/lib/libc/string/strtok.3
new file mode 100644
index 0000000000..876e0eb515
--- /dev/null
+++ b/src/lib/libc/string/strtok.3
@@ -0,0 +1,112 @@
+.\" Copyright (c) 1988, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the American National Standards Committee X3, on Information
+.\" Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strtok.3,v 1.3 1998/04/28 07:36:55 deraadt Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRTOK 3
+.Os BSD 3
+.Sh NAME
+.Nm strtok ,
+.Nm strsep
+.Nd string token operations
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft char *
+.Fn strtok "char *str" "const char *sep"
+.Sh DESCRIPTION
+.Bf -symbolic
+This interface is obsoleted by 
+.Xr strsep 3 .
+.Ef
+.Pp
+The
+.Fn strtok
+function
+is used to isolate sequential tokens in a null-terminated string,
+.Fa str .
+These tokens are separated in the string by at least one of the
+characters in
+.Fa sep .
+The first time that
+.Fn strtok
+is called,
+.Fa str
+should be specified; subsequent calls, wishing to obtain further tokens
+from the same string, should pass a null pointer instead.
+The separator string,
+.Fa sep ,
+must be supplied each time, and may change between calls.
+.Pp
+The
+.Fn strtok
+function
+returns a pointer to the beginning of each subsequent token in the string,
+after replacing the separator character itself with a
+.Dv NUL
+character.
+When no more tokens remain, a null pointer is returned.
+.Sh SEE ALSO
+.Xr index 3 ,
+.Xr memchr 3 ,
+.Xr rindex 3 ,
+.Xr strchr 3 ,
+.Xr strcspn 3 ,
+.Xr strpbrk 3 ,
+.Xr strrchr 3 ,
+.Xr strsep 3 ,
+.Xr strspn 3 ,
+.Xr strstr 3
+.Sh STANDARDS
+The
+.Fn strtok
+function
+conforms to
+.St -ansiC .
+.Sh BUGS
+There is no way to get tokens from multiple strings simultaneously.
+.Pp
+The System V
+.Fn strtok ,
+if handed a string containing only delimiter characters,
+will not alter the next starting point, so that a call to
+.Fn strtok
+with a different (or empty) delimiter string
+may return a
+.Pf non- Dv NULL
+value.
+Since this implementation always alters the next starting point,
+such a sequence of calls would always return
+.Dv NULL .
diff --git a/src/lib/libc/string/strtok.c b/src/lib/libc/string/strtok.c
new file mode 100644
index 0000000000..2fce04c3ad
--- /dev/null
+++ b/src/lib/libc/string/strtok.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strtok.c,v 1.2 1996/08/19 08:34:28 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+char *
+strtok(s, delim)
+        register char *s;
+        register const char *delim;
+{
+        register char *spanp;
+        register int c, sc;
+        char *tok;
+        static char *last;
+
+
+        if (s == NULL && (s = last) == NULL)
+                return (NULL);
+
+        /*
+         * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
+         */
+cont:
+        c = *s++;
+        for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
+                if (c == sc)
+                        goto cont;
+        }
+
+        if (c == 0) {           /* no non-delimiter characters */
+                last = NULL;
+                return (NULL);
+        }
+        tok = s - 1;
+
+        /*
+         * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
+         * Note that delim must have one NUL; we stop if we see that, too.
+         */
+        for (;;) {
+                c = *s++;
+                spanp = (char *)delim;
+                do {
+                        if ((sc = *spanp++) == c) {
+                                if (c == 0)
+                                        s = NULL;
+                                else
+                                        s[-1] = 0;
+                                last = s;
+                                return (tok);
+                        }
+                } while (sc != 0);
+        }
+        /* NOTREACHED */
+}
diff --git a/src/lib/libc/string/strxfrm.3 b/src/lib/libc/string/strxfrm.3
new file mode 100644
index 0000000000..3ebdd42c29
--- /dev/null
+++ b/src/lib/libc/string/strxfrm.3
@@ -0,0 +1,68 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Chris Torek and the American National Standards Committee X3,
+.\" on Information Processing Systems.
+.\"
+.\" Redistribution and use in source 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: strxfrm.3,v 1.2 1996/08/19 08:34:28 tholo Exp $
+.\"
+.Dd June 29, 1991
+.Dt STRXFRM 3
+.Os
+.Sh NAME
+.Nm strxfrm
+.Nd transform a string under locale
+.Sh SYNOPSIS
+.Fd #include <string.h>
+.Ft size_t
+.Fn strxfrm "char *dst" "const char *src" "size_t n"
+.Sh DESCRIPTION
+The
+.Fn strxfrm
+function
+does something horrible (see
+.Tn ANSI
+standard).
+In this implementation it just copies.
+.Sh SEE ALSO
+.Xr bcmp 3 ,
+.Xr memcmp 3 ,
+.\" .Xr setlocale 3 ,
+.Xr strcasecmp 3 ,
+.Xr strcmp 3 ,
+.Xr strcoll 3
+.Sh STANDARDS
+The
+.Fn strxfrm
+function
+conforms to
+.St -ansiC .
diff --git a/src/lib/libc/string/strxfrm.c b/src/lib/libc/string/strxfrm.c
new file mode 100644
index 0000000000..6b258edecc
--- /dev/null
+++ b/src/lib/libc/string/strxfrm.c
@@ -0,0 +1,73 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strxfrm.c,v 1.2 1996/08/19 08:34:29 tholo Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <string.h>
+
+/*
+ * Transform src, storing the result in dst, such that
+ * strcmp() on transformed strings returns what strcoll()
+ * on the original untransformed strings would return.
+ */
+size_t
+strxfrm(dst, src, n)
+        register char *dst;
+        register const char *src;
+        register size_t n;
+{
+        register size_t r = 0;
+        register int c;
+
+        /*
+         * Since locales are unimplemented, this is just a copy.
+         */
+        if (n != 0) {
+                while ((c = *src++) != 0) {
+                        r++;
+                        if (--n == 0) {
+                                while (*src++ != 0)
+                                        r++;
+                                break;
+                        }
+                        *dst++ = c;
+                }
+                *dst = 0;
+        }
+        return (r);
+}
diff --git a/src/lib/libc/string/swab.3 b/src/lib/libc/string/swab.3
new file mode 100644
index 0000000000..d1bfc358fb
--- /dev/null
+++ b/src/lib/libc/string/swab.3
@@ -0,0 +1,65 @@
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" 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 the University of
+.\"     California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     $OpenBSD: swab.3,v 1.3 1998/02/10 02:19:48 deraadt Exp $
+.\"
+.Dd May 1, 1991
+.Dt SWAB 3
+.Os
+.Sh NAME
+.Nm swab
+.Nd swap adjacent bytes
+.Sh SYNOPSIS
+.Fd #include <unistd.h>
+.Ft void
+.Fn swab "const void *src" "void *dst" "size_t len"
+.Sh DESCRIPTION
+The function
+.Fn swab
+copies
+.Fa len
+bytes from the location referenced by
+.Fa src
+to the location referenced by
+.Fa dst ,
+swapping adjacent bytes.
+.Pp
+The argument
+.Fa len
+must be even number.
+.Sh SEE ALSO
+.Xr bzero 3 ,
+.Xr memset 3
+.Sh HISTORY
+A
+.Fn swab
+function appeared in
+.At v7 .
diff --git a/src/lib/libc/string/swab.c b/src/lib/libc/string/swab.c
new file mode 100644
index 0000000000..311cf13a53
--- /dev/null
+++ b/src/lib/libc/string/swab.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jeffrey Mogul.
+ *
+ * Redistribution and use in source 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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: swab.c,v 1.3 1998/02/10 02:19:48 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <unistd.h>
+
+void
+swab(from, to, len)
+        const void *from;
+        void *to;
+        size_t len;
+{
+        register unsigned long temp;
+        register int n;
+        register char *fp, *tp;
+
+        n = (len >> 1) + 1;
+        fp = (char *)from;
+        tp = (char *)to;
+#define STEP    temp = *fp++,*tp++ = *fp++,*tp++ = temp
+        /* round to multiple of 8 */
+        while ((--n) & 07)
+                STEP;
+        n >>= 3;
+        while (--n >= 0) {
+                STEP; STEP; STEP; STEP;
+                STEP; STEP; STEP; STEP;
+        }
+}
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);
+        }
+
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
new file mode 100644
index 0000000000..3954b2d858
--- /dev/null
+++ b/src/lib/libssl/Makefile
@@ -0,0 +1,10 @@
+.include <bsd.own.mk>
+ECHO= /bin/echo
+
+.if exists(${.OBJDIR}/src-patent)
+SUBDIR= crypto-patent ssl-patent
+.else
+SUBDIR= crypto ssl
+.endif
+
+.include <bsd.subdir.mk>
diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper
new file mode 100644
index 0000000000..282912514d
--- /dev/null
+++ b/src/lib/libssl/Makefile.bsd-wrapper
@@ -0,0 +1,100 @@
+# Build wrapper for SSLeay.
+# $OpenBSD: Makefile.bsd-wrapper,v 1.9 1999/03/17 18:25:56 deraadt Exp $
+
+# Our lndir is hacked; specify a full path to avoid potential conflicts
+# with the one installed with X11.
+LNDIR=          /usr/bin/lndir
+
+
+# Figure out what flag we use to SSLeay's configure. This
+# needs to be tested on all architectures.
+
+.if ${MACHINE_ARCH} == "i386"
+SSLCONF=        OpenBSD-x86
+.else
+.if ${MACHINE_ARCH} == "pmax"
+SSLCONF=        OpenBSD-pmax
+.else
+.if ${MACHINE_ARCH} == "arc"
+SSLCONF=        OpenBSD-arc
+.else
+.if ${MACHINE_ARCH} == "alpha"
+SSLCONF=        OpenBSD-alpha
+.else
+.if ${MACHINE_ARCH} == "sparc"
+SSLCONF=        OpenBSD-bigendian
+.else
+.if ${MACHINE_ARCH} == "m88k"
+SSLCONF=        OpenBSD-bigendian
+.else
+##UNTESTED!     
+SSLCONF=        OpenBSD-bigendian
+.endif
+.endif
+.endif
+.endif
+.endif
+.endif
+
+MUNGEDFILES =   ${.OBJDIR}/${SSL_SRC}/crypto/bf/bf_locl.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/bn/bn.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/des/des.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/des/des_locl.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/idea/idea.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/rc2/rc2.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/rc4/rc4.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/rc4/rc4_locl.h
+
+
+.include <bsd.own.mk>
+
+.if exists(src-patent)
+SSL_SRC=src-patent
+.else
+SSL_SRC=src
+.endif    
+
+all:    prereq
+        cd ${.OBJDIR} && ${MAKE}
+
+includes: prereq
+        cd ${.OBJDIR} && ${MAKE} includes
+
+prereq: ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h
+
+install:
+        cd ${.OBJDIR} && ${MAKE} install
+
+${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h : ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
+        cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF}
+
+.if !exists(${.OBJDIR}/${SSL_SRC}/Makefile.ssl)
+${.OBJDIR}/${SSL_SRC}/Makefile.ssl: ${.CURDIR}/${SSL_SRC}/Makefile.ssl
+        ${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper -e Makefile.ssl ${.CURDIR} && cp ${.CURDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}
+.endif
+
+clean:  ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
+        cd ${.OBJDIR} && ${MAKE} clean
+
+cleandir: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
+        cd ${.OBJDIR} && rm -f ${MUNGEDFILES} && ${MAKE} cleandir
+
+test:
+        # Nothing here so far...
+
+depend:
+        # Nothing here so far...
+
+lint:
+        # Nothing here so far...
+
+tags:
+        # Nothing here so far...
+
+distribution:
+        ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
+           ${.CURDIR}/ssleay.cnf ${DESTDIR}/etc/ssl/lib/ssleay.cnf
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
diff --git a/src/lib/libssl/README.OPENBSD b/src/lib/libssl/README.OPENBSD
new file mode 100644
index 0000000000..7cc3d0d424
--- /dev/null
+++ b/src/lib/libssl/README.OPENBSD
@@ -0,0 +1,66 @@
+
+        This is an SSLeay-0.9.0b (the b means the PKCS#1 bug is fixed) tree.
+        
+        It has the following modifcations made to it.
+
+        0) util/perlpath.pl has been run to change perlpath to /usr/bin
+           util/ssldir.pl has been run to change the ssl dir to /usr/ssl
+           Null check added to crypto/err/err.c (mailed to Eric Young)
+           to avoid problems in error handling.  Includes install into
+           /usr/include/ssl, certs and configs are expected to be in
+           /etc/ssl.
+
+        1) Changes for openbsd compilation to have been made to
+           config and Configure (these have been sent to Eric Young)
+
+NOTES:
+
+        Many tests will fail miserably, since most of them start
+        with SSL v2, which requires RSA, and of course, they barf.
+        idea tests will also fail. This is to be expected. Do
+        "make -k test" if you want to see the output and draw
+        your own conclusions.
+
+        Many parts of the utility programs may not work, although things
+        like client and server will provided you start them in a mode
+        that does not require RSA to operate.
+
+        Unlike an ssl library built to remove the offending routines
+        (which removes many of the things like SSL23init which many
+        packages like web servers use) this library does contain
+        stubs for everything. The patent bits will simply fail. The
+        idea is that this may be used as is for limited functionality,
+        or where possible replaced with a full function library. When
+        porting an app it is important to remember to try to use the
+        tls1 version of stuff first where possible. I.E. if you're
+        going to SSL-ize OpenBSD telnet, for example, call the tls1 init
+        functions *NOT* sslv2init or sslv23init, or you'll be dependent
+        on RSA and have a version that will only work with a full
+        function library. Use the tls versions and you'll work with
+        both - a good thing.
+
+        "crypto" and "ssl" are OpenBSD style build dirs for the
+        libraries of the same name. "ssleay" is the build dir for the
+        "ssleay" executable, used to control everything vagely ssleay
+        like, from testing to generating certificates, to playing
+        simple client server games. libraries expect to install headers
+        in "/usr/include/ssl", libraries in /usr/lib, ssleay in /usr/sbin
+
+TODO:
+        SSLeay contains just no library docs, it's all use the
+        force, read the source. This should be fixed sometime.
+
+        DSS certificate generation is a black art. This
+        needs to be properly documented and a comprehensive procedure
+        written up, at least for how to generate a cert for 
+        a host to be used by multiple servers. beck@ has talked
+        to Mark Shuttleworth of Thawte, and he has agreed that
+        if we can get DSS hosts certs up and running Thawte will
+        consider providing the service (for the usual fee of course)
+        of for-real signing of OpenBSD host certs for those who
+        want a real CA for things like telnet and ftp and the like.
+        
+        Apps beyond ssleay need testing - apps that use exclusively old style
+        sslv2 or sslv2/3 need to be converted/modified where possible to
+        try the tls1 stuff, so that we can handle doing things without
+        RSA. 
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile
new file mode 100644
index 0000000000..14ceca92d7
--- /dev/null
+++ b/src/lib/libssl/crypto-patent/Makefile
@@ -0,0 +1,179 @@
+
+LIB=    crypto
+
+SSLEAYDIST= src-patent
+
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+= -DL_ENDIAN -DBN_ASM
+.else
+.if ${MACHINE_ARCH} == "arc"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "pmax"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "alpha"
+# no ENDIAN stuff defined for alpha
+.else
+CFLAGS+= -DB_ENDIAN
+.endif
+.endif
+.endif
+.endif 
+
+CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LCRYPTO_SRC}
+SRCS+=  cryptlib.c mem.c cversion.c ex_data.c cpt_err.c                 
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+SRCS+=  md2_dgst.c md2_one.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+SRCS+=  md5_dgst.c md5_one.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+SRCS+=  sha_dgst.c sha1dgst.c sha_one.c sha1_one.c      
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+SRCS+=  mdc2dgst.c mdc2_one.c                                   
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+SRCS+=  hmac.c                                                  
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+SRCS+=  rmd_dgst.c rmd_one.c                            
+CFLAGS+= -I${LCRYPTO_SRC}/des
+SRCS+=  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
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+SRCS+=  rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c       
+SRCS+=  rc2ofb64.c                                                      
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+SRCS+=  rc4_skey.c rc4_enc.c
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+SRCS+=  rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c      
+SRCS+=  rc5ofb64.c rc5_enc.c
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+SRCS+=  i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c             
+SRCS+=  i_skey.c                                                        
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+SRCS+=  bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c bf_enc.c               
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+SRCS+=  c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c    
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+SRCS+=  bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mod.c    
+SRCS+=  bn_mul.c bn_print.c bn_rand.c bn_shift.c bn_sub.c
+SRCS+=  bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c
+SRCS+=  bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c           
+SRCS+=  bn_mulw.c 
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+SRCS+=  rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c        
+SRCS+=  rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c        
+SRCS+=  rsa_none.c                                                      
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+SRCS+=  dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c         
+SRCS+=  dsa_sign.c dsa_err.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+SRCS+=  dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c  
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+SRCS+=  buffer.c buf_err.c                              
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+SRCS+=  bio_lib.c bio_cb.c bio_err.c bss_mem.c          
+SRCS+=  bss_null.c bss_fd.c bss_file.c bss_sock.c       
+SRCS+=  bss_conn.c bf_null.c bf_buff.c 
+SRCS+=  b_print.c b_dump.c b_sock.c bss_acpt.c          
+SRCS+=  bf_nbio.c                                                       
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+SRCS+=  stack.c                                                 
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+SRCS+=  lhash.c lh_stats.c                                      
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+SRCS+=  md_rand.c randfile.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/err
+SRCS+=  err.c err_all.c err_prn.c                               
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+SRCS+=  obj_dat.c obj_lib.c obj_err.c
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+SRCS+=  encode.c digest.c evp_enc.c evp_key.c           
+SRCS+=  e_ecb_d.c e_cbc_d.c e_cfb_d.c e_ofb_d.c         
+SRCS+=  e_ecb_i.c e_cbc_i.c e_cfb_i.c e_ofb_i.c         
+SRCS+=  e_ecb_3d.c e_cbc_3d.c e_rc4.c names.c           
+SRCS+=  e_cfb_3d.c e_ofb_3d.c e_xcbc_d.c e_ecb_r2.c     
+SRCS+=  e_cbc_r2.c e_cfb_r2.c e_ofb_r2.c e_ecb_bf.c     
+SRCS+=  e_cbc_bf.c e_cfb_bf.c e_ofb_bf.c e_ecb_c.c      
+SRCS+=  e_cbc_c.c e_cfb_c.c e_ofb_c.c e_ecb_r5.c        
+SRCS+=  e_cbc_r5.c e_cfb_r5.c e_ofb_r5.c m_null.c       
+SRCS+=  m_md2.c m_md5.c m_sha.c m_sha1.c m_dss.c        
+SRCS+=  m_dss1.c m_mdc2.c m_ripemd.c p_open.c           
+SRCS+=  p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c
+SRCS+=  p_dec.c bio_md.c bio_b64.c bio_enc.c            
+SRCS+=  evp_err.c e_null.c c_all.c evp_lib.c
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+SRCS+=  pem_sign.c pem_seal.c pem_info.c pem_lib.c      
+SRCS+=  pem_all.c pem_err.c                                     
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+SRCS+=  a_object.c a_bitstr.c a_utctm.c a_int.c 
+SRCS+=  a_octet.c a_print.c a_type.c a_set.c    
+SRCS+=  a_dup.c a_d2i_fp.c a_i2d_fp.c a_sign.c  
+SRCS+=  a_digest.c a_verify.c x_algor.c x_val.c 
+SRCS+=  x_pubkey.c x_sig.c x_req.c x_attrib.c   
+SRCS+=  x_name.c x_cinf.c x_x509.c x_crl.c              
+SRCS+=  x_info.c x_spki.c d2i_r_pr.c i2d_r_pr.c 
+SRCS+=  d2i_r_pu.c i2d_r_pu.c d2i_s_pr.c i2d_s_pr.c     
+SRCS+=  d2i_s_pu.c i2d_s_pu.c d2i_pu.c d2i_pr.c         
+SRCS+=  i2d_pu.c i2d_pr.c t_req.c t_x509.c              
+SRCS+=  t_pkey.c p7_i_s.c p7_signi.c p7_signd.c 
+SRCS+=  p7_recip.c p7_enc_c.c p7_evp.c p7_dgst.c        
+SRCS+=  p7_s_e.c p7_enc.c p7_lib.c f_int.c              
+SRCS+=  f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c       
+SRCS+=  d2i_dsap.c n_pkey.c a_hdr.c x_pkey.c    
+SRCS+=  a_bool.c x_exten.c asn1_par.c asn1_lib.c        
+SRCS+=  asn1_err.c a_meth.c a_bytes.c evp_asn1.c        
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+SRCS+=  x509_def.c x509_d2.c x509_r2x.c x509_cmp.c      
+SRCS+=  x509_obj.c x509_req.c x509_vfy.c x509_set.c     
+SRCS+=  x509rset.c x509_err.c x509name.c x509_v3.c      
+SRCS+=  x509_ext.c x509pack.c x509type.c x509_lu.c      
+SRCS+=  x_all.c x509_txt.c by_file.c by_dir.c   
+SRCS+=  v3_net.c v3_x509.c                                      
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+SRCS+=  conf.c conf_err.c                                       
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+SRCS+=  txt_db.c                                                        
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
+SRCS+=  pk7_lib.c pkcs7err.c pk7_doit.c
+
+HDRS=   asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
+        bn/bn.h buffer/buffer.h cast/cast.h conf/conf.h des/des.h dh/dh.h \
+        dsa/dsa.h err/err.h evp/evp.h hmac/hmac.h idea/idea.h lhash/lhash.h \
+        md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
+        pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
+        ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
+        x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
+
+.PATH:  ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2    \
+        ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des  ${LCRYPTO_SRC}/rc2 \
+        ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf    \
+        ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn  ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa   \
+        ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \
+        ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \
+        ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1  ${LCRYPTO_SRC}/asn1 \
+        ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \
+        ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}
+
+includes:
+        @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
+        @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
+                j="cmp -s ${LCRYPTO_SRC}/$$i \
+                ${DESTDIR}/usr/include/ssl/`basename $$i` || \
+                ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+                ${LCRYPTO_SRC}/$$i ${DESTDIR}/usr/include/ssl"; \
+                echo $$j; \
+                eval "$$j"; \
+        done
+
+
+.include <bsd.lib.mk>
+
diff --git a/src/lib/libssl/crypto-patent/shlib_version b/src/lib/libssl/crypto-patent/shlib_version
new file mode 100644
index 0000000000..893819d18f
--- /dev/null
+++ b/src/lib/libssl/crypto-patent/shlib_version
@@ -0,0 +1,2 @@
+major=1
+minor=1
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
new file mode 100644
index 0000000000..9db529295b
--- /dev/null
+++ b/src/lib/libssl/crypto/Makefile
@@ -0,0 +1,183 @@
+
+LIB=    crypto
+
+SSLEAYDIST= src
+
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+= -DL_ENDIAN -DBN_ASM
+.else
+.if ${MACHINE_ARCH} == "arc"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "pmax"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "alpha"
+# no ENDIAN stuff defined for alpha
+.else
+CFLAGS+= -DB_ENDIAN
+.endif
+.endif
+.endif
+.endif 
+
+CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LCRYPTO_SRC}
+SRCS+=  cryptlib.c mem.c cversion.c ex_data.c cpt_err.c                 
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+SRCS+=  md2_dgst.c md2_one.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+SRCS+=  md5_dgst.c md5_one.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+SRCS+=  sha_dgst.c sha1dgst.c sha_one.c sha1_one.c      
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+SRCS+=  mdc2dgst.c mdc2_one.c                                   
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+SRCS+=  hmac.c                                                  
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+SRCS+=  rmd_dgst.c rmd_one.c                            
+CFLAGS+= -I${LCRYPTO_SRC}/des
+SRCS+=  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
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+SRCS+=  rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c       
+SRCS+=  rc2ofb64.c                                                      
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+SRCS+=  rc4_skey.c rc4_enc.c
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+SRCS+=  rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c      
+SRCS+=  rc5ofb64.c rc5_enc.c
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+SRCS+=  i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c             
+SRCS+=  i_skey.c                                                        
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+SRCS+=  bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c bf_enc.c               
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+SRCS+=  c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c    
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+SRCS+=  bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mod.c    
+SRCS+=  bn_mul.c bn_print.c bn_rand.c bn_shift.c bn_sub.c
+SRCS+=  bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c
+SRCS+=  bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c           
+SRCS+=  bn_mulw.c 
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+SRCS+=  rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c        
+SRCS+=  rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c        
+SRCS+=  rsa_none.c                                                      
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+SRCS+=  dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c         
+SRCS+=  dsa_sign.c dsa_err.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+SRCS+=  dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c  
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+SRCS+=  buffer.c buf_err.c                              
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+SRCS+=  bio_lib.c bio_cb.c bio_err.c bss_mem.c          
+SRCS+=  bss_null.c bss_fd.c bss_file.c bss_sock.c       
+SRCS+=  bss_conn.c bf_null.c bf_buff.c 
+SRCS+=  b_print.c b_dump.c b_sock.c bss_acpt.c          
+SRCS+=  bf_nbio.c                                                       
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+SRCS+=  stack.c                                                 
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+SRCS+=  lhash.c lh_stats.c                                      
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+SRCS+=  md_rand.c randfile.c                                    
+CFLAGS+= -I${LCRYPTO_SRC}/err
+SRCS+=  err.c err_all.c err_prn.c                               
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+SRCS+=  obj_dat.c obj_lib.c obj_err.c
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+SRCS+=  encode.c digest.c evp_enc.c evp_key.c           
+SRCS+=  e_ecb_d.c e_cbc_d.c e_cfb_d.c e_ofb_d.c         
+SRCS+=  e_ecb_i.c e_cbc_i.c e_cfb_i.c e_ofb_i.c         
+SRCS+=  e_ecb_3d.c e_cbc_3d.c e_rc4.c names.c           
+SRCS+=  e_cfb_3d.c e_ofb_3d.c e_xcbc_d.c e_ecb_r2.c     
+SRCS+=  e_cbc_r2.c e_cfb_r2.c e_ofb_r2.c e_ecb_bf.c     
+SRCS+=  e_cbc_bf.c e_cfb_bf.c e_ofb_bf.c e_ecb_c.c      
+SRCS+=  e_cbc_c.c e_cfb_c.c e_ofb_c.c e_ecb_r5.c        
+SRCS+=  e_cbc_r5.c e_cfb_r5.c e_ofb_r5.c m_null.c       
+SRCS+=  m_md2.c m_md5.c m_sha.c m_sha1.c m_dss.c        
+SRCS+=  m_dss1.c m_mdc2.c m_ripemd.c p_open.c           
+SRCS+=  p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c
+SRCS+=  p_dec.c bio_md.c bio_b64.c bio_enc.c            
+SRCS+=  evp_err.c e_null.c c_all.c evp_lib.c
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+SRCS+=  pem_sign.c pem_seal.c pem_info.c pem_lib.c      
+SRCS+=  pem_all.c pem_err.c                                     
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+SRCS+=  a_object.c a_bitstr.c a_utctm.c a_int.c 
+SRCS+=  a_octet.c a_print.c a_type.c a_set.c    
+SRCS+=  a_dup.c a_d2i_fp.c a_i2d_fp.c a_sign.c  
+SRCS+=  a_digest.c a_verify.c x_algor.c x_val.c 
+SRCS+=  x_pubkey.c x_sig.c x_req.c x_attrib.c   
+SRCS+=  x_name.c x_cinf.c x_x509.c x_crl.c              
+SRCS+=  x_info.c x_spki.c d2i_r_pr.c i2d_r_pr.c 
+SRCS+=  d2i_r_pu.c i2d_r_pu.c d2i_s_pr.c i2d_s_pr.c     
+SRCS+=  d2i_s_pu.c i2d_s_pu.c d2i_pu.c d2i_pr.c         
+SRCS+=  i2d_pu.c i2d_pr.c t_req.c t_x509.c              
+SRCS+=  t_pkey.c p7_i_s.c p7_signi.c p7_signd.c 
+SRCS+=  p7_recip.c p7_enc_c.c p7_evp.c p7_dgst.c        
+SRCS+=  p7_s_e.c p7_enc.c p7_lib.c f_int.c              
+SRCS+=  f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c       
+SRCS+=  d2i_dsap.c n_pkey.c a_hdr.c x_pkey.c    
+SRCS+=  a_bool.c x_exten.c asn1_par.c asn1_lib.c        
+SRCS+=  asn1_err.c a_meth.c a_bytes.c evp_asn1.c        
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+SRCS+=  x509_def.c x509_d2.c x509_r2x.c x509_cmp.c      
+SRCS+=  x509_obj.c x509_req.c x509_vfy.c x509_set.c     
+SRCS+=  x509rset.c x509_err.c x509name.c x509_v3.c      
+SRCS+=  x509_ext.c x509pack.c x509type.c x509_lu.c      
+SRCS+=  x_all.c x509_txt.c by_file.c by_dir.c   
+SRCS+=  v3_net.c v3_x509.c                                      
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+SRCS+=  conf.c conf_err.c                                       
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+SRCS+=  txt_db.c                                                        
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
+SRCS+=  pk7_lib.c pkcs7err.c pk7_doit.c
+
+HDRS=   asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
+        bn/bn.h buffer/buffer.h cast/cast.h conf/conf.h des/des.h dh/dh.h \
+        dsa/dsa.h err/err.h evp/evp.h hmac/hmac.h idea/idea.h lhash/lhash.h \
+        md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
+        pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
+        ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
+        x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
+
+.PATH:  ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2    \
+        ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des  ${LCRYPTO_SRC}/rc2 \
+        ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf    \
+        ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn  ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa   \
+        ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \
+        ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \
+        ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1  ${LCRYPTO_SRC}/asn1 \
+        ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \
+        ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}
+
+includes:
+        @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
+        @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
+        cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
+                f=`basename $$i`; \
+                j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \
+                       ${LCRYPTO_SRC}/$$i >$$d/$$f && \
+                (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
+                ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+                           $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
+                echo $$j; \
+                eval "$$j"; \
+        done; \
+        rm -rf $$d
+
+
+.include <bsd.lib.mk>
+
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version
new file mode 100644
index 0000000000..1edea46de9
--- /dev/null
+++ b/src/lib/libssl/crypto/shlib_version
@@ -0,0 +1,2 @@
+major=1
+minor=0
diff --git a/src/lib/libssl/src/COPYRIGHT b/src/lib/libssl/src/COPYRIGHT
new file mode 100644
index 0000000000..4faa8c0a46
--- /dev/null
+++ b/src/lib/libssl/src/COPYRIGHT
@@ -0,0 +1,65 @@
+Copyright (C) 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).
+
+Please note that MD2, MD5 and IDEA are publically available standards
+that contain sample implementations, I have re-coded them in my own
+way but there is nothing special about those implementations.  The DES
+library is another mater :-).
+
+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.]
+
+The reason behind this being stated in this direct manner is past
+experience in code simply being copied and the attribution removed
+from it and then being distributed as part of other packages. This
+implementation was a non-trivial and unpaid effort.
+
diff --git a/src/lib/libssl/src/Configure b/src/lib/libssl/src/Configure
index 1dc0ed320c..8b9ecbcdef 100644
--- a/src/lib/libssl/src/Configure
+++ b/src/lib/libssl/src/Configure
@@ -135,6 +135,8 @@ $x86_bsdi_asm="asm/bn86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/bx86bsdi.o:asm/m
 "OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:::",
 "OpenBSD-x86",   "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
 "OpenBSD-bigendian", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+"OpenBSD-pmax", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+"OpenBSD-arc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 "FreeBSD",   "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
 #"bsdi-gcc",     "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",
 "nextstep",     "cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",
diff --git a/src/lib/libssl/src/HISTORY b/src/lib/libssl/src/HISTORY
new file mode 100644
index 0000000000..7712100038
--- /dev/null
+++ b/src/lib/libssl/src/HISTORY
@@ -0,0 +1,316 @@
+16-Mar-98
+        - Patch for Cray T90 from Wayne Schroeder <schroede@SDSC.EDU>
+        - Lots and lots of changes
+
+29-Jan-98
+        - ASN1_BIT_STRING_set_bit()/ASN1_BIT_STRING_get_bit() from
+          Goetz Babin-Ebell <babinebell@trustcenter.de>.
+        - SSL_version() now returns SSL2_VERSION, SSL3_VERSION or
+          TLS1_VERSION.
+
+7-Jan-98
+        - Finally reworked the cipher string to ciphers again, so it
+          works correctly
+        - All the app_data stuff is now ex_data with funcion calls to access.
+          The index is supplied by a function and 'methods' can be setup
+          for the types that are called on XXX_new/XXX_free.  This lets
+          applications get notified on creation and destruction.  Some of
+          the RSA methods could be implemented this way and I may do so.
+        - Oh yes, SSL under perl5 is working at the basic level.
+
+15-Dec-97
+        - Warning - the gethostbyname cache is not fully thread safe,
+          but it should work well enough.
+        - Major internal reworking of the app_data stuff.  More functions
+          but if you were accessing ->app_data directly, things will
+          stop working.
+        - The perlv5 stuff is working.  Currently on message digests,
+          ciphers and the bignum library.
+
+9-Dec-97
+        - Modified re-negotiation so that server initated re-neg
+          will cause a SSL_read() to return -1 should retry.
+          The danger otherwise was that the server and the
+          client could end up both trying to read when using non-blocking
+          sockets.
+
+4-Dec-97
+        - Lots of small changes
+        - Fix for binaray mode in Windows for the FILE BIO, thanks to
+          Bob Denny <rdenny@dc3.com>
+
+17-Nov-97
+        - Quite a few internal cleanups, (removal of errno, and using macros
+          defined in e_os.h).
+        - A bug in ca.c, pointed out by yasuyuki-ito@d-cruise.co.jp, where
+          the automactic naming out output files was being stuffed up.
+
+29-Oct-97
+        - The Cast5 cipher has been added.  MD5 and SHA-1 are now in assember
+          for x86.
+
+21-Oct-97
+        - Fixed a bug in the BIO_gethostbyname() cache.
+
+15-Oct-97
+        - cbc mode for blowfish/des/3des is now in assember.  Blowfish asm
+          has also been improved.  At this point in time, on the pentium,
+          md5 is %80 faster, the unoptimesed sha-1 is %79 faster,
+          des-cbc is %28 faster, des-ede3-cbc is %9 faster and blowfish-cbc
+          is %62 faster.
+
+12-Oct-97
+        - MEM_BUF_grow() has been fixed so that it always sets the buf->length
+          to the value we are 'growing' to.  Think of MEM_BUF_grow() as the
+          way to set the length value correctly.
+
+10-Oct-97
+        - I now hash for certificate lookup on the raw DER encoded RDN (md5).
+          This breaks things again :-(.  This is efficent since I cache
+          the DER encoding of the RDN.
+        - The text DN now puts in the numeric OID instead of UNKNOWN.
+        - req can now process arbitary OIDs in the config file.
+        - I've been implementing md5 in x86 asm, much faster :-).
+        - Started sha1 in x86 asm, needs more work.
+        - Quite a few speedups in the BN stuff.  RSA public operation
+          has been made faster by caching the BN_MONT_CTX structure.
+          The calulating of the Ai where A*Ai === 1 mod m was rather
+          expensive.  Basically a 40-50% speedup on public operations.
+          The RSA speedup is now 15% on pentiums and %20 on pentium
+          pro.
+
+30-Sep-97
+        - After doing some profiling, I added x86 adm for bn_add_words(),
+          which just adds 2 arrays of longs together.  A %10 speedup
+          for 512 and 1024 bit RSA on the pentium pro.
+
+29-Sep-97
+        - Converted the x86 bignum assembler to us the perl scripts
+          for generation.
+
+23-Sep-97
+        - If SSL_set_session() is passed a NULL session, it now clears the
+          current session-id.
+
+22-Sep-97
+        - Added a '-ss_cert file' to apps/ca.c.  This will sign selfsigned
+          certificates.
+        - Bug in crypto/evp/encode.c where by decoding of 65 base64
+          encoded lines, one line at a time (via a memory BIO) would report
+          EOF after the first line was decoded.
+        - Fix in X509_find_by_issuer_and_serial() from
+          Dr Stephen Henson <shenson@bigfoot.com>
+
+19-Sep-97
+        - NO_FP_API and NO_STDIO added.
+        - Put in sh config command.  It auto runs Configure with the correct
+          parameters.
+
+18-Sep-97
+        - Fix x509.c so if a DSA cert has different parameters to its parent,
+          they are left in place.  Not tested yet.
+
+16-Sep-97
+        - ssl_create_cipher_list() had some bugs, fixes from
+          Patrick Eisenacher <eisenach@stud.uni-frankfurt.de>
+        - Fixed a bug in the Base64 BIO, where it would return 1 instead
+          of -1 when end of input was encountered but should retry.
+          Basically a Base64/Memory BIO interaction problem.
+        - Added a HMAC set of functions in preporarion for TLS work.
+
+15-Sep-97
+        - Top level makefile tweak - Cameron Simpson <cs@zip.com.au>
+        - Prime generation spead up %25 (512 bit prime, pentium pro linux)
+          by using montgomery multiplication in the prime number test.
+
+11-Sep-97
+        - Ugly bug in ssl3_write_bytes().  Basically if application land
+          does a SSL_write(ssl,buf,len) where len > 16k, the SSLv3 write code
+          did not check the size and tried to copy the entire buffer.
+          This would tend to cause memory overwrites since SSLv3 has
+          a maximum packet size of 16k.  If your program uses
+          buffers <= 16k, you would probably never see this problem.
+        - Fixed a new errors that were cause by malloc() not returning
+          0 initialised memory..
+        - SSL_OP_NETSCAPE_CA_DN_BUG was being switched on when using
+          SSL_CTX_set_options(ssl_ctx,SSL_OP_ALL); which was a bad thing
+          since this flags stops SSLeay being able to handle client
+          cert requests correctly.
+
+08-Sep-97
+        - SSL_SESS_CACHE_NO_INTERNAL_LOOKUP option added.  When switched
+          on, the SSL server routines will not use a SSL_SESSION that is
+          held in it's cache.  This in intended to be used with the session-id
+          callbacks so that while the session-ids are still stored in the
+          cache, the decision to use them and how to look them up can be
+          done by the callbacks.  The are the 'new', 'get' and 'remove'
+          callbacks.  This can be used to determine the session-id
+          to use depending on information like which port/host the connection
+          is coming from.  Since the are also SSL_SESSION_set_app_data() and
+          SSL_SESSION_get_app_data() functions, the application can hold
+          information against the session-id as well.
+
+03-Sep-97
+        - Added lookup of CRLs to the by_dir method,
+          X509_load_crl_file() also added.  Basically it means you can
+          lookup CRLs via the same system used to lookup certificates.
+        - Changed things so that the X509_NAME structure can contain
+          ASN.1 BIT_STRINGS which is required for the unique
+          identifier OID.
+        - Fixed some problems with the auto flushing of the session-id
+          cache.  It was not occuring on the server side.
+
+02-Sep-97
+        - Added SSL_CTX_sess_cache_size(SSL_CTX *ctx,unsigned long size)
+          which is the maximum number of entries allowed in the
+          session-id cache.  This is enforced with a simple FIFO list.
+          The default size is 20*1024 entries which is rather large :-).
+          The Timeout code is still always operating.
+
+01-Sep-97
+        - Added an argument to all the 'generate private key/prime`
+          callbacks.  It is the last parameter so this should not
+          break existing code but it is needed for C++.
+        - Added the BIO_FLAGS_BASE64_NO_NL flag for the BIO_f_base64()
+          BIO.  This lets the BIO read and write base64 encoded data
+          without inserting or looking for '\n' characters.  The '-A'
+          flag turns this on when using apps/enc.c.
+        - RSA_NO_PADDING added to help BSAFE functionality.  This is a
+          very dangerous thing to use, since RSA private key
+          operations without random padding bytes (as PKCS#1 adds) can
+          be attacked such that the private key can be revealed.
+        - ASN.1 bug and rc2-40-cbc and rc4-40 added by
+          Dr Stephen Henson <shenson@bigfoot.com>
+
+31-Aug-97 (stuff added while I was away)        
+        - Linux pthreads by Tim Hudson (tjh@cryptsoft.com).
+        - RSA_flags() added allowing bypass of pub/priv match check
+          in ssl/ssl_rsa.c - Tim Hudson.
+        - A few minor bugs.
+
+SSLeay 0.8.1 released.
+
+19-Jul-97
+        - Server side initated dynamic renegotiation is broken.  I will fix
+          it when I get back from holidays.
+
+15-Jul-97
+        - Quite a few small changes.
+        - INVALID_SOCKET usage cleanups from Alex Kiernan <alex@hisoft.co.uk>
+
+09-Jul-97
+        - Added 2 new values to the SSL info callback.
+          SSL_CB_START which is passed when the SSL protocol is started
+          and SSL_CB_DONE when it has finished sucsessfully.
+
+08-Jul-97
+        - Fixed a few bugs problems in apps/req.c and crypto/asn1/x_pkey.c
+          that related to DSA public/private keys.
+        - Added all the relevent PEM and normal IO functions to support
+          reading and writing RSAPublic keys.
+        - Changed makefiles to use ${AR} instead of 'ar r'
+
+07-Jul-97
+        - Error in ERR_remove_state() that would leave a dangling reference
+          to a free()ed location - thanks to Alex Kiernan <alex@hisoft.co.uk>
+        - s_client now prints the X509_NAMEs passed from the server
+          when requesting a client cert.
+        - Added a ssl->type, which is one of SSL_ST_CONNECT or
+          SSL_ST_ACCEPT.  I had to add it so I could tell if I was
+          a connect or an accept after the handshake had finished.
+        - SSL_get_client_CA_list(SSL *s) now returns the CA names
+          passed by the server if called by a client side SSL.
+
+05-Jul-97
+        - Bug in X509_NAME_get_text_by_OBJ(), looking starting at index
+          0, not -1 :-(  Fix from Tim Hudson (tjh@cryptsoft.com).
+
+04-Jul-97
+        - Fixed some things in X509_NAME_add_entry(), thanks to
+          Matthew Donald <matthew@world.net>.
+        - I had a look at the cipher section and though that it was a
+          bit confused, so I've changed it.
+        - I was not setting up the RC4-64-MD5 cipher correctly.  It is
+          a MS special that appears in exported MS Money.
+        - Error in all my DH ciphers.  Section 7.6.7.3 of the SSLv3
+          spec.  I was missing the two byte length header for the
+          ClientDiffieHellmanPublic value.  This is a packet sent from
+          the client to the server.  The SSL_OP_SSLEAY_080_CLIENT_DH_BUG
+          option will enable SSLeay server side SSLv3 accept either
+          the correct or my 080 packet format.
+        - Fixed a few typos in crypto/pem.org.
+
+02-Jul-97
+        - Alias mapping for EVP_get_(digest|cipher)byname is now
+          performed before a lookup for actual cipher.  This means
+          that an alias can be used to 're-direct' a cipher or a
+          digest.
+        - ASN1_read_bio() had a bug that only showed up when using a
+          memory BIO.  When EOF is reached in the memory BIO, it is
+          reported as a -1 with BIO_should_retry() set to true.
+
+01-Jul-97
+        - Fixed an error in X509_verify_cert() caused by my
+          miss-understanding how 'do { contine } while(0);' works.
+          Thanks to Emil Sit <sit@mit.edu> for educating me :-)
+
+30-Jun-97
+        - Base64 decoding error.  If the last data line did not end with
+          a '=', sometimes extra data would be returned.
+        - Another 'cut and paste' bug in x509.c related to setting up the
+          STDout BIO.
+
+27-Jun-97
+        - apps/ciphers.c was not printing due to an editing error.
+        - Alex Kiernan <alex@hisoft.co.uk> send in a nice fix for
+          a library build error in util/mk1mf.pl
+
+26-Jun-97
+        - Still did not have the auto 'experimental' code removal
+          script correct.
+        - A few header tweaks for Watcom 11.0 under Win32 from
+          Rolf Lindemann <Lindemann@maz-hh.de>
+        - 0 length OCTET_STRING bug in asn1_parse
+        - A minor fix with an non-existent function in the MS .def files.
+        - A few changes to the PKCS7 stuff.
+
+25-Jun-97
+        SSLeay 0.8.0 finally it gets released.
+
+24-Jun-97
+        Added a SSL_OP_EPHEMERAL_RSA option which causes all SSLv3 RSA keys to
+        use a temporary RSA key.  This is experimental and needs some more work.
+        Fixed a few Win16 build problems.
+
+23-Jun-97
+        SSLv3 bug. I was not doing the 'lookup' of the CERT structure
+        correctly. I was taking the SSL->ctx->default_cert when I should
+        have been using SSL->cert. The bug was in ssl/s3_srvr.c
+
+20-Jun-97
+        X509_ATTRIBUTES were being encoded wrongly by apps/reg.c and the
+        rest of the library. Even though I had the code required to do
+        it correctly, apps/req.c was doing the wrong thing.  I have fixed
+        and tested everything.
+
+        Missing a few #ifdef FIONBIO sections in crypto/bio/bss_acpt.c.
+
+19-Jun-97
+        Fixed a bug in the SSLv2 server side first packet handling. When
+        using the non-blocking test BIO, the ssl->s2->first_packet flag
+        was being reset when a would-block failure occurred when reading
+        the first 5 bytes of the first packet. This caused the checking
+        logic to run at the wrong time and cause an error.
+
+        Fixed a problem with specifying cipher. If RC4-MD5 were used,
+        only the SSLv3 version would be picked up.  Now this will pick
+        up both SSLv2 and SSLv3 versions. This required changing the
+        SSL_CIPHER->mask values so that they only mask the ciphers,
+        digests, authentication, export type and key-exchange algorithms.
+
+        I found that when a SSLv23 session is established, a reused
+        session, of type SSLv3 was attempting to write the SSLv2 
+        ciphers, which were invalid. The SSL_METHOD->put_cipher_by_char 
+        method has been modified so it will only write out cipher which
+        that method knows about.  
+
diff --git a/src/lib/libssl/src/HISTORY.066 b/src/lib/libssl/src/HISTORY.066
new file mode 100644
index 0000000000..f85224977a
--- /dev/null
+++ b/src/lib/libssl/src/HISTORY.066
@@ -0,0 +1,443 @@
+SSLeay 0.6.5
+
+After quite some time (3 months), the new release.  I have been very busy
+for the last few months and so this is mostly bug fixes and improvments.
+
+The main additions are
+
+- assember for x86 DES.  For all those gcc based systems, this is a big
+  improvement.  From 117,000 DES operation a second on a pentium 100,
+  I now get 191,000.  I have also reworked the C version so it
+  now gives 148,000 DESs per second.  
+- As mentioned above, the inner DES macros now have some more variant that
+  sometimes help, sometimes hinder performance.  There are now 3 options
+  DES_PTR (ptr vs array lookup), DES_UNROLL (full vs partial loop unrolling)
+  and DES_RISC (a more register intensive version of the inner macro).
+  The crypto/des/des_opts.c program, when compiled and run, will give
+  an indication of the correct options to use.
+- The BIO stuff has been improved.  Read doc/bio.doc.  There are now
+  modules for encryption and base64 encoding and a BIO_printf() function.
+- The CA program will accept simple one line X509v3 extensions in the
+  ssleay.cnf file.  Have a look at the example.  Currently this just
+  puts the text into the certificate as an OCTET_STRING so currently
+  the more advanced X509v3 data types are not handled but this is enough
+  for the netscape extensions.
+- There is the start of a nicer higher level interface to the X509
+  strucutre.
+- Quite a lot of bug fixes.
+- CRYPTO_malloc_init()  (or CRYPTO_set_mem_functions()) can be used
+  to define the malloc(), free() and realloc() routines to use
+  (look in crypto/crypto.h).  This is mostly needed for Windows NT/95 when
+  using DLLs and mixing CRT libraries.
+
+In general, read the 'VERSION' file for changes and be aware that some of
+the new stuff may not have been tested quite enough yet, so don't just plonk
+in SSLeay 0.6.5 when 0.6.4 used to work and expect nothing to break.
+
+SSLeay 0.6.4 30/08/96 eay
+
+I've just finished some test builds on Windows NT, Windows 3.1, Solaris 2.3,
+Solaris 2.5, Linux, IRIX, HPUX 10 and everthing seems to work :-).
+
+The main changes in this release
+
+- Thread safe.  have a read of doc/threads.doc and play in the mt directory.
+  For anyone using 0.6.3 with threads, I found 2 major errors so consider
+  moving to 0.6.4.  I have a test program that builds under NT and
+  solaris.
+- The get session-id callback has changed.  Have a read of doc/callback.doc.
+- The X509_cert_verify callback (the SSL_verify callback) now
+  has another argument.  Have a read of doc/callback.doc
+- 'ca -preserve', sign without re-ordering the DN.  Not tested much.
+- VMS support.
+- Compile time memory leak detection can now be built into SSLeay.
+  Read doc/memory.doc
+- CONF routines now understand '\', '\n', '\r' etc.  What this means is that
+  the  SPKAC object mentioned in doc/ns-ca.doc can be on multiple lines.
+- 'ssleay ciphers' added, lists the default cipher list for SSLeay.
+- RC2 key setup is now compatable with Netscape.
+- Modifed server side of SSL implementation, big performance difference when
+          using session-id reuse.
+
+0.6.3
+
+Bug fixes and the addition of some nice stuff to the 'ca' program.
+Have a read of doc/ns-ca.doc for how hit has been modified so
+it can be driven from a CGI script.  The CGI script is not provided,
+but that is just being left as an excersize for the reader :-).
+
+0.6.2
+
+This is most bug fixes and functionality improvements.
+
+Additions are
+- More thread debugging patches, the thread stuff is still being
+  tested, but for those keep to play with stuff, have a look in
+  crypto/cryptlib.c.  The application needs to define 1 (or optionaly
+  a second) callback that is used to implement locking.  Compiling
+  with LOCK_DEBUG spits out lots of locking crud :-).
+  This is what I'm currently working on.
+- SSL_CTX_set_default_passwd_cb() can be used to define the callback
+  function used in the SSL*_file() functions used to load keys.  I was
+  always of the opinion that people should call
+  PEM_read_RSAPrivateKey() and pass the callback they want to use, but
+  it appears they just want to use the SSL_*_file() function() :-(.
+- 'enc' now has a -kfile so a key can be read from a file.  This is
+  mostly used so that the passwd does not appear when using 'ps',
+  which appears imposible to stop under solaris.
+- X509v3 certificates now work correctly.  I even have more examples
+  in my tests :-).  There is now a X509_EXTENSION type that is used in
+  X509v3 certificates and CRLv2.
+- Fixed that signature type error :-(
+- Fixed quite a few potential memory leaks and problems when reusing
+  X509, CRL and REQ structures.
+- EVP_set_pw_prompt() now sets the library wide default password
+  prompt.
+- The 'pkcs7' command will now, given the -print_certs flag, output in
+  pem format, all certificates and CRL contained within.  This is more
+  of a pre-emtive thing for the new verisign distribution method.  I
+  should also note, that this also gives and example in code, of how
+  to do this :-), or for that matter, what is involved in going the
+  other way (list of certs and crl -> pkcs7).
+- Added RSA's DESX to the DES library.  It is also available via the
+  EVP_desx_cbc() method and via 'enc desx'. 
+
+SSLeay 0.6.1
+
+The main functional changes since 0.6.0 are as follows
+- Bad news, the Microsoft 060 DLL's are not compatable, but the good news is
+  that from now on, I'll keep the .def numbers the same so they will be.
+- RSA private key operations are about 2 times faster that 0.6.0
+- The SSL_CTX now has more fields so default values can be put against
+  it.  When an SSL structure is created, these default values are used
+  but can be overwritten.  There are defaults for cipher, certificate,
+  private key, verify mode and callback.  This means SSL session
+  creation can now be
+  ssl=SSL_new()
+  SSL_set_fd(ssl,sock);
+  SSL_accept(ssl)
+  ....
+  All the other uglyness with having to keep a global copy of the
+  private key and certificate/verify mode in the server is now gone.
+- ssl/ssltest.c - one process talking SSL to its self for testing.
+- Storage of Session-id's can be controled via a session_cache_mode
+  flag.  There is also now an automatic default flushing of 
+  old session-id's.
+- The X509_cert_verify() function now has another parameter, this
+  should not effect most people but it now means that the reason for
+  the failure to verify is now available via SSL_get_verify_result(ssl).
+  You don't have to use a global variable.
+- SSL_get_app_data() and SSL_set_app_data() can be used to keep some
+  application data against the SSL structure.  It is upto the application
+  to free the data.  I don't use it, but it is available.
+- SSL_CTX_set_cert_verify_callback() can be used to specify a
+  verify callback function that completly replaces my certificate
+  verification code.  Xcert should be able to use this :-).
+  The callback is of the form int app_verify_callback(arg,ssl,cert).
+  This needs to be documented more.
+- I have started playing with shared library builds, have a look in
+  the shlib directory.  It is very simple.  If you need a numbered
+  list of functions, have a look at misc/crypto.num and misc/ssl.num.
+- There is some stuff to do locking to make the library thread safe.
+  I have only started this stuff and have not finished.  If anyone is
+  keen to do so, please send me the patches when finished.
+
+So I have finally made most of the additions to the SSL interface that
+I thought were needed.
+
+There will probably be a pause before I make any non-bug/documentation
+related changes to SSLeay since I'm feeling like a bit of a break.
+
+eric - 12 Jul 1996
+I saw recently a comment by some-one that we now seem to be entering
+the age of perpetual Beta software.
+Pioneered by packages like linux but refined to an art form by
+netscape.
+
+I too wish to join this trend with the anouncement of SSLeay 0.6.0 :-).
+
+There are quite a large number of sections that are 'works in
+progress' in this package.  I will also list the major changes and
+what files you should read.
+
+BIO - this is the new IO structure being used everywhere in SSLeay.  I
+started out developing this because of microsoft, I wanted a mechanism
+to callback to the application for all IO, so Windows 3.1 DLL
+perversion could be hidden from me and the 15 different ways to write
+to a file under NT would also not be dictated by me at library build
+time.  What the 'package' is is an API for a data structure containing
+functions.  IO interfaces can be written to conform to the
+specification.  This in not intended to hide the underlying data type
+from the application, but to hide it from SSLeay :-).
+I have only really finished testing the FILE * and socket/fd modules.
+There are also 'filter' BIO's.  Currently I have only implemented
+message digests, and it is in use in the dgst application.  This
+functionality will allow base64/encrypto/buffering modules to be
+'push' into a BIO without it affecting the semantics.  I'm also
+working on an SSL BIO which will hide the SSL_accept()/SLL_connet()
+from an event loop which uses the interface.
+It is also possible to 'attach' callbacks to a BIO so they get called
+before and after each operation, alowing extensive debug output
+to be generated (try running dgst with -d).
+
+Unfortunaly in the conversion from 0.5.x to 0.6.0, quite a few
+functions that used to take FILE *, now take BIO *.
+The wrappers are easy to write
+
+function_fp(fp,x)
+FILE *fp;
+        {
+        BIO *b;
+        int ret;
+
+        if ((b=BIO_new(BIO_s_file())) == NULL) error.....
+        BIO_set_fp(b,fp,BIO_NOCLOSE);
+        ret=function_bio(b,x);
+        BIO_free(b);
+        return(ret);
+        }
+Remember, there are no functions that take FILE * in SSLeay when
+compiled for Windows 3.1 DLL's.
+
+--
+I have added a general EVP_PKEY type that can hold a public/private
+key.  This is now what is used by the EVP_ functions and is passed
+around internally.  I still have not done the PKCS#8 stuff, but
+X509_PKEY is defined and waiting :-)
+
+--
+For a full function name listings, have a look at ms/crypt32.def and
+ms/ssl32.def.  These are auto-generated but are complete.
+Things like ASN1_INTEGER_get() have been added and are in here if you
+look.  I have renamed a few things, again, have a look through the
+function list and you will probably find what you are after.  I intend
+to at least put a one line descrition for each one.....
+
+--
+Microsoft - thats what this release is about, read the MICROSOFT file.
+
+--
+Multi-threading support.  I have started hunting through the code and
+flaging where things need to be done.  In a state of work but high on
+the list.
+
+--
+For random numbers, edit e_os.h and set DEVRANDOM (it's near the top)
+be be you random data device, otherwise 'RFILE' in e_os.h
+will be used, in your home directory.  It will be updated
+periodically.  The environment variable RANDFILE will override this
+choice and read/write to that file instead.  DEVRANDOM is used in
+conjunction to the RFILE/RANDFILE.  If you wish to 'seed' the random
+number generator, pick on one of these files.
+
+--
+
+The list of things to read and do
+
+dgst -d
+s_client -state (this uses a callback placed in the SSL state loop and
+                will be used else-where to help debug/monitor what
+                is happening.)
+
+doc/why.doc
+doc/bio.doc <- hmmm, needs lots of work.
+doc/bss_file.doc <- one that is working :-)
+doc/session.doc <- it has changed
+doc/speed.doc
+ also play with ssleay version -a.  I have now added a SSLeay()
+ function that returns a version number, eg 0600 for this release
+ which is primarily to be used to check DLL version against the
+ application.
+util/*  Quite a few will not interest people, but some may, like
+ mk1mf.pl, mkdef.pl,
+util/do_ms.sh
+
+try
+cc -Iinclude -Icrypto -c crypto/crypto.c
+cc -Iinclude -Issl -c ssl/ssl.c
+You have just built the SSLeay libraries as 2 object files :-)
+
+Have a general rummage around in the bin stall directory and look at
+what is in there, like CA.sh and c_rehash
+
+There are lots more things but it is 12:30am on a Friday night and I'm
+heading home :-).
+
+eric 22-Jun-1996
+This version has quite a few major bug fixes and improvements.  It DOES NOT
+do SSLv3 yet.
+
+The main things changed
+- A Few days ago I added the s_mult application to ssleay which is
+  a demo of an SSL server running in an event loop type thing.
+  It supports non-blocking IO, I have finally gotten it right, SSL_accept()
+  can operate in non-blocking IO mode, look at the code to see how :-).
+  Have a read of doc/s_mult as well.  This program leaks memory and
+  file descriptors everywhere but I have not cleaned it up yet.
+  This is a demo of how to do non-blocking IO.
+- The SSL session management has been 'worked over' and there is now
+  quite an expansive set of functions to manipulate them.  Have a read of
+  doc/session.doc for some-things I quickly whipped up about how it now works.
+  This assume you know the SSLv2 protocol :-)
+- I can now read/write the netscape certificate format, use the
+  -inform/-outform  'net' options to the x509 command.  I have not put support
+  for this type in the other demo programs, but it would be easy to add.
+- asn1parse and 'enc' have been modified so that when reading base64
+  encoded files (pem format), they do not require '-----BEGIN' header lines.
+  The 'enc' program had a buffering bug fixed, it can be used as a general
+  base64 -> binary -> base64 filter by doing 'enc -a -e' and 'enc -a -d'
+  respecivly.  Leaving out the '-a' flag in this case makes the 'enc' command
+  into a form of 'cat'.
+- The 'x509' and 'req' programs have been fixed and modified a little so
+  that they generate self-signed certificates correctly.  The test
+  script actually generates a 'CA' certificate and then 'signs' a
+  'user' certificate.  Have a look at this shell script (test/sstest)
+  to see how things work, it tests most possible combinations of what can
+  be done.
+- The 'SSL_set_pref_cipher()' function has been 'fixed' and the prefered name
+  of SSL_set_cipher_list() is now the correct API (stops confusion :-).
+  If this function is used in the client, only the specified ciphers can
+  be used, with preference given to the order the ciphers were listed.
+  For the server, if this is used, only the specified ciphers will be used
+  to accept connections.  If this 'option' is not used, a default set of
+  ciphers will be used.  The SSL_CTX_set_cipher_list(SSL_CTX *ctx) sets this
+  list for all ciphers started against the SSL_CTX.  So the order is
+  SSL cipher_list, if not present, SSL_CTX cipher list, if not
+  present, then the library default.
+  What this means is that normally ciphers like
+  NULL-MD5 will never be used.  The only way this cipher can be used
+  for both ends to specify to use it.
+  To enable or disable ciphers in the library at build time, modify the
+  first field for the cipher in the ssl_ciphers array in ssl/ssl_lib.c.
+  This file also contains the 'pref_cipher' list which is the default
+  cipher preference order.
+- I'm not currently sure if the 'rsa -inform net' and the 'rsa -outform net'
+  options work.  They should, and they enable loading and writing the
+  netscape rsa private key format.  I will be re-working this section of
+  SSLeay for the next version.  What is currently in place is a quick and
+  dirty hack.
+- I've re-written parts of the bignum library.  This gives speedups
+  for all platforms.  I now provide assembler for use under Windows NT.
+  I have not tested the Windows 3.1 assembler but it is quite simple code.
+  This gives RSAprivate_key operation encryption times of 0.047s (512bit key)
+  and 0.230s (1024bit key) on a pentium 100 which I consider reasonable.
+  Basically the times available under linux/solaris x86 can be achieve under
+  Windows NT.  I still don't know how these times compare to RSA's BSAFE
+  library but I have been emailing with people and with their help, I should
+  be able to get my library's quite a bit faster still (more algorithm changes).
+  The object file crypto/bn/asm/x86-32.obj should be used when linking
+  under NT.
+- 'make makefile.one' in the top directory will generate a single makefile
+  called 'makefile.one'  This makefile contains no perl references and
+  will build the SSLeay library into the 'tmp' and 'out' directories.
+  util/mk1mf.pl >makefile.one is how this makefile is
+  generated.  The mk1mf.pl command take several option to generate the
+  makefile for use with cc, gcc, Visual C++ and Borland C++.  This is
+  still under development.  I have only build .lib's for NT and MSDOS
+  I will be working on this more.  I still need to play with the
+  correct compiler setups for these compilers and add some more stuff but
+  basically if you just want to compile the library
+  on a 'non-unix' platform, this is a very very good file to start with :-).
+  Have a look in the 'microsoft' directory for my current makefiles.
+  I have not yet modified things to link with sockets under Windows NT.
+  You guys should be able to do this since this is actually outside of the
+  SSLeay scope :-).  I will be doing it for myself soon.
+  util/mk1mf.pl takes quite a few options including no-rc, rsaref  and no-sock
+  to build without RC2/RC4, to require RSAref for linking, and to
+  build with no socket code.
+
+- Oh yes, the cipher that was reported to be compatible with RSA's RC2 cipher
+  that was posted to sci.crypt has been added to the library and SSL.
+  I take the view that if RC2 is going to be included in a standard,
+  I'll include the cipher to make my package complete.
+  There are NO_RC2, NO_RC4 and NO_IDEA macros to remove these ciphers
+  at compile time.  I have not tested this recently but it should all work
+  and if you are in the USA and don't want RSA threatening to sue you,
+  you could probably remove the RC4/RC2 code inside these sections.
+  I may in the future include a perl script that does this code
+  removal automatically for those in the USA :-).
+- I have removed all references to sed in the makefiles.  So basically,
+  the development environment requires perl and sh.  The build environment
+  does not (use the makefile.one makefile).
+  The Configure script still requires perl, this will probably stay that way
+  since I have perl for Windows NT :-).
+
+eric (03-May-1996)
+
+PS Have a look in the VERSION file for more details on the changes and
+   bug fixes.
+I have fixed a few bugs, added alpha and x86 assembler and generally cleaned
+things up.  This version will be quite stable, mostly because I'm on
+holidays until 10-March-1996.  For any problems in the interum, send email
+to Tim Hudson <tjh@mincom.oz.au>.
+
+SSLeay 0.5.0
+
+12-12-95
+This is going out before it should really be released.
+
+I leave for 11 weeks holidays on the 22-12-95 and so I either sit on
+this for 11 weeks or get things out.  It is still going to change a
+lot in the next week so if you do grab this version, please test and
+give me feed back ASAP, inculuding questions on how to do things with
+the library.  This will prompt me to write documentation so I don't
+have to answer the same question again :-).
+
+This 'pre' release version is for people who are interested in the
+library.  The applications will have to be changed to use
+the new version of the SSL interface.  I intend to finish more
+documentation before I leave but until then, look at the programs in
+the apps directory.  As far as code goes, it is much much nicer than
+the old version.
+
+The current library works, has no memory leaks (as far as I can tell)
+and is far more bug free that 0.4.5d.  There are no global variable of
+consequence (I believe) and I will produce some documentation that
+tell where to look for those people that do want to do multi-threaded
+stuff.
+
+There should be more documentation.  Have a look in the
+doc directory.  I'll be adding more before I leave, it is a start
+by mostly documents the crypto library.  Tim Hudson will update
+the web page ASAP.  The spelling and grammar are crap but
+it is better than nothing :-)
+
+Reasons to start playing with version 0.5.0
+- All the programs in the apps directory build into one ssleay binary.
+- There is a new version of the 'req' program that generates certificate
+  requests, there is even documentation for this one :-)
+- There is a demo certification authorithy program.  Currently it will
+  look at the simple database and update it.  It will generate CRL from
+  the data base.  You need to edit the database by hand to revoke a
+  certificate, it is my aim to use perl5/Tk but I don't have time to do
+  this right now.  It will generate the certificates but the management
+  scripts still need to be written.  This is not a hard task.
+- Things have been cleaned up alot.
+- Have a look at the enc and dgst programs in the apps directory.
+- It supports v3 of x509 certiticates.
+
+
+Major things missing.
+- I have been working on (and thinging about) the distributed x509
+  hierachy problem.  I have not had time to put my solution in place.
+  It will have to wait until I come back.
+- I have not put in CRL checking in the certificate verification but
+  it would not be hard to do.  I was waiting until I could generate my
+  own CRL (which has only been in the last week) and I don't have time
+  to put it in correctly.
+- Montgomery multiplication need to be implemented.  I know the
+  algorithm, just ran out of time.
+- PKCS#7.  I can load and write the DER version.  I need to re-work
+  things to support BER (if that means nothing, read the ASN1 spec :-).
+- Testing of the higher level digital envelope routines.  I have not
+  played with the *_seal() and *_open() type functions.  They are
+  written but need testing.  The *_sign() and *_verify() functions are
+  rock solid. 
+- PEM.  Doing this and PKCS#7 have been dependant on the distributed
+  x509 heirachy problem.  I started implementing my ideas, got
+  distracted writing a CA program and then ran out of time.  I provide
+  the functionality of RSAref at least.
+- Re work the asm. code for the x86.  I've changed by low level bignum
+  interface again, so I really need to tweak the x86 stuff.  gcc is
+  good enough for the other boxes.
+
diff --git a/src/lib/libssl/src/MICROSOFT b/src/lib/libssl/src/MICROSOFT
new file mode 100644
index 0000000000..54176f0472
--- /dev/null
+++ b/src/lib/libssl/src/MICROSOFT
@@ -0,0 +1,146 @@
+The Microsoft World.
+
+The good news, to build SSLeay for the Microsft World
+
+Windows 3.1 DLL's
+perl Configure VC-WIN16
+nmake -f ms\w31dll.mak
+
+Windows NT/95 DLL's
+perl Configure VC-WIN32
+nmake -f ms\ntdll.mak
+
+Now the bad news
+All builds were done using Microsofts Visual C++ 1.52c and [45].x.
+If you are a borland person, you are probably going to have to help me
+finish the stuff in util/pl/BC*pl
+
+All builds were made under Windows NT - this means long filenames, so
+you may have problems under Windows 3.1 but probably not under 95.
+
+Because file pointers don't work in DLL's under Windows 3.1 (well at
+least stdin/stdout don't and I don't like having to differentiate
+between these and other file pointers), I now use the BIO file-pointer
+module, which needs to be linked into your application.  You can either
+use the memory buffer BIO for IO, or compile bss_file.c into your
+application, it is in the apps directory and is just a copy of
+crypto/buffer/bss_file.c with #define APPS_WIN16 added.
+I have not yet automated the makefile to automatically copy it into 'out'
+for a win 3.1 build....
+
+All callbacks passed into SSLeay for Windows 3.1 need to be of type
+_far _loadds.
+
+I don't support building with the pascal calling convention.
+
+The DLL and static builds are large memory model.
+
+To build static libraries for NT/95 or win 3.1
+
+perl util/mk1mf.pl VC-WIN32 > mf-stat.nt
+perl util/mk1mf.pl VC-WIN16 > mf-stat.w31
+for DLL's
+perl util/mk1mf.pl dll VC-WIN32 > mf-dll.nt
+perl util/mk1mf.pl dll VC-WIN16 > mf-dll.w31
+
+Again you will notice that if you dont have perl, you cannot do this.
+
+Now the next importaint issue.  Running Configure!
+I have small assember code files for critical big number library operation
+in crypto/bn/asm.  There is, asm code, object files and uuencode
+object files.  They are
+x86nt32.asm     - 32bit flat memory model assember - suitable Win32
+x86w16.asm      - 16bit assember - used in the msdos build.
+x86w32.asm      - 32bit assember, win 3.1 segments, used for win16 build.
+
+If you feel compelled to build the 16bit maths routines in the windows 3.1
+build,
+perl Configure VC-W31-16
+perl util/mk1mf.pl dll VC-W31-16 > mf-dll.w31
+
+If you hate assember and don't want anything to do with it,
+perl util/mk1mf.pl no-asm VC-WIN16 > mf-dll.w31
+will work for any of the makefile generations.
+
+There are more options to mk1mf.pl but these all leave the temporary
+files in 'tmp' and the output files in 'out' by default.
+
+The NT build is done for console mode.
+
+The Windows 3.1 version of SSLeay uses quickwin, the interface is ugly
+but it is better than nothing.  If you want ugly, try doing anything
+that involves getting a password.  I decided to be ugly instead of
+echoing characters.  For Windows 3.1 I would just sugest using the
+msdos version of the ssleay application for command line work.
+The QuickWin build is primarily for testing.
+
+For both NT and Windows 3.1, I have not written the code so that
+s_client, s_server can take input from the keyboard.  You can happily
+start applications up in separate windows, watch them handshake, and then sit
+there for-ever.  I have not had the time to get this working, and I've
+been able to test things from a unix box to the NT box :-).
+Try running ssleay s_server on the windows box
+(with either -cert ../apps/server.pem -www)
+and run ssleay s_time from another window.
+This often stuffs up on Windows 3.1, but I'm not worried since this is
+probably a problem with my demo applications, not the libraries.
+
+After a build of one of the version of microsoft SSLeay,
+'cd ms' and then run 'test'.  This should check everything out and
+even does a trial run of generating certificates.
+'test.bat' requires that perl be install, you be in the ms directory
+(not the test directory, thats for unix so stay out :-) and that the
+build output directory be ../out 
+
+On a last note, you will probably get division by zero errors and
+stuff after a build.  This is due to your own inability to follow
+instructions :-).
+
+The reasons for the problem is probably one of the following.
+
+1)      You did not run Configure.  This is critical for windows 3.1 when
+        using assember.  The values in crypto/bn/bn.h must match the
+        ones requred for the assember code.  (remember that if you
+        edit crypto/bn/bn.h by hand, it will be clobered the next time
+        you run Configure by the contents of crypto/bn/bn.org).
+        SSLeay version -o will list the compile options.
+        For VC-WIN32 you need bn(64,32) or bn(32,32)
+        For VC-W31-32/VC-WIN16 you need bn(32,32)
+        For VC-W31-16 you need bn(32,16) or bn(16,16)
+        For VC-MSDOS you need bn(32,16) or bn(16,16).
+
+        The first number will be 2 times bigger than the second if
+        BN_LLONG is defined in bn.h and the size of the second number
+        depends on the 'bits' defined at the start of bn.h.  Have a
+        look, it's all reasonably clear.
+        If you want to start messing with 8 bit builds and things like
+        that, build without the assember by re-generating a makefile
+        via 'perl util/mk1mf.pl no-asm'.
+2)      You tried to build under MS-DOS or Windows 3.1 using the /G3
+        option.  Don't.  It is buggy (thats why you just got that
+        error) and unless you want to work out which optimising flag
+        to turn off, I'm not going to help you :-).  I also noticed
+        that code often ran slower when compiled with /G3.
+3)      Under NT/95, malloc goes stupid.  You are probably linking with
+        the wrong library, there are problems if you mix the threaded
+        and non-threaded libraries (due to the DLL being staticly
+        linked with one and the applicaion using another.
+
+Well hopefully thats most of the MS issues handled, see you in ssl-users :-).
+
+eric 30-Aug-1996
+
+SSLeay 0.6.5
+For Windows 95/NT, add CRYPTO_malloc_init() to your program before any
+calls to the SSLeay libraries.  This function will insert callbacks so that
+the SSLeay libraries will use the same malloc(), free() and realloc() as
+your application so 'problem 3)' mentioned above will go away.
+
+There is now DES assember for Windows NT/95.  The file is
+crypto/des/asm/win32.asm and replaces crypto/des/des_enc.c in the build.
+
+There is also Blowfish assember for Windows NT/95.  The file is
+crypto/bf/asm/win32.asm and replaces crypto/bf/bf_enc.c in the build.
+
+eric 25-Jun-1997
+
diff --git a/src/lib/libssl/src/MINFO b/src/lib/libssl/src/MINFO
new file mode 100644
index 0000000000..0509f33648
--- /dev/null
+++ b/src/lib/libssl/src/MINFO
@@ -0,0 +1,968 @@
+RELATIVE_DIRECTORY=.
+AR=ar r
+BASENAME=SSLeay
+BF_ENC=bf_enc.o
+BN_MULW=bn_mulw.o
+CAST_ENC=c_enc.o
+CC=cc
+CFLAG=-O -DNOPROTO
+DES_ENC=des_enc.o fcrypt_b.o
+DIRS=crypto ssl rsaref apps test tools
+EDIRS=times doc bugs util include certs ms shlib mt demos perl dep
+EXHEADER=e_os.h
+EX_LIBS=
+GENERAL=Makefile
+HEADER=e_os.h
+INSTALLTOP=/usr/local/ssl
+LIBS=libcrypto.a libssl.a
+MAKE=make -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+MAN1=1
+MAN3=3
+MD5_ASM_OBJ=
+MISC=COPYRIGHT Configure HISTORY.066 INSTALL Makefile.ssl Makefile README TODO HISTORY README.066 README.080 README.090 VERSION PROBLEMS MINFO makefile.one e_os.h MICROSOFT makevms.com config PATENTS
+NAME=SSLeay-0.9.0
+ONEDIRS=out tmp
+PEX_LIBS=-L. -L.. -L../.. -L../../..
+RC4_ENC=rc4_enc.o
+RC5_ENC=rc5_enc.o
+RMD160_ASM_OBJ=
+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 asn1 x509 conf txt_db pkcs7
+SHA1_ASM_OBJ=
+SHELL=/bin/sh
+TARFILE=SSLeay-0.9.0.tar
+TOP=.
+VERSION=0.9.0
+WDIRS=windows
+WTARFILE=SSLeay-0.9.0-win.tar
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto
+ALL=Makefile README cryptlib.c mem.c cversion.c ex_data.c cpt_err.c cryptlib.h date.h crypto.h cryptall.h
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I. -I../include -g -DCFLAGS=" \"cc -g\" "
+DIR=crypto
+ERR=crypto
+ERRC=cpt_err
+EXHEADER=crypto.h cryptall.h
+EX_LIBS=
+GENERAL=Makefile README
+HEADER=cryptlib.h date.h crypto.h cryptall.h
+INCLUDE=-I. -I../include
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../libcrypto.a
+LIBOBJ=cryptlib.o mem.o cversion.o ex_data.o cpt_err.o
+LIBS=
+LIBSRC=cryptlib.c mem.c cversion.c ex_data.c cpt_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+PEX_LIBS=
+RM=/bin/rm -f
+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
+SRC=cryptlib.c mem.c cversion.c ex_data.c cpt_err.c
+TOP=..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/md2
+ALL=Makefile md2_dgst.c md5_one.c md2.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=md
+EXHEADER=md2.h
+GENERAL=Makefile
+HEADER=md2.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=md2_dgst.o md2_one.o
+LIBSRC=md2_dgst.c md5_one.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=md2_dgst.c md5_one.c
+TEST=md2test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/md5
+ALL=Makefile md5_dgst.c md5_one.c md5_locl.h md5.h
+APPS=md5.c
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+CPP=cc -E
+DIR=md5
+EXHEADER=md5.h
+GENERAL=Makefile
+HEADER=md5_locl.h md5.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=md5_dgst.o md5_one.o 
+LIBSRC=md5_dgst.c md5_one.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+MD5_ASM_OBJ=
+SRC=md5_dgst.c md5_one.c
+TEST=md5test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/sha
+ALL=Makefile sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha_locl.h sha.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=sha
+EXHEADER=sha.h
+GENERAL=Makefile
+HEADER=sha_locl.h sha.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o 
+LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SHA1_ASM_OBJ=
+SRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
+TEST=shatest.c sha1test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/mdc2
+ALL=Makefile mdc2dgst.c mdc2_one.c mdc2.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=mdc2
+EXHEADER=mdc2.h
+GENERAL=Makefile
+HEADER=mdc2.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=mdc2dgst.o mdc2_one.o
+LIBSRC=mdc2dgst.c mdc2_one.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=mdc2dgst.c mdc2_one.c
+TEST=mdc2test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/hmac
+ALL=Makefile hmac.c hmac.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=hmac
+EXHEADER=hmac.h
+GENERAL=Makefile
+HEADER=hmac.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=hmac.o
+LIBSRC=hmac.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=hmac.c
+TEST=hmactest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/ripemd
+ALL=Makefile rmd_dgst.c rmd_one.c rmd_locl.h rmdconst.h ripemd.h
+APPS=rmd160.c
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+CPP=cc -E
+DIR=ripemd
+EXHEADER=ripemd.h
+GENERAL=Makefile
+HEADER=rmd_locl.h rmdconst.h ripemd.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=rmd_dgst.o rmd_one.o 
+LIBSRC=rmd_dgst.c rmd_one.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+RIP_ASM_OBJ=
+SRC=rmd_dgst.c rmd_one.c
+TEST=rmdtest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/des
+ALL=Makefile des.org des_locl.org 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 des_locl.h rpc_des.h podd.h sk.h spr.h des_ver.h des.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+CPP=cc -E
+DES_ENC=des_enc.o fcrypt_b.o
+DIR=des
+EXHEADER=des.h
+GENERAL=Makefile des.org des_locl.org
+HEADER=des_locl.h rpc_des.h podd.h sk.h spr.h des_ver.h des.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+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.o fcrypt_b.o read2pwd.o fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o cbc_cksm.o supp.o
+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
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=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
+TEST=destest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/rc2
+ALL=Makefile rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c rc2_locl.h rc2.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=rc2
+EXHEADER=rc2.h
+GENERAL=Makefile
+HEADER=rc2_locl.h rc2.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=rc2_ecb.o rc2_skey.o rc2_cbc.o rc2cfb64.o rc2ofb64.o
+LIBSRC=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+TEST=rc2test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/rc4
+ALL=Makefile rc4_skey.c rc4_enc.c rc4.h rc4_locl.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=rc4
+EXHEADER=rc4.h
+GENERAL=Makefile
+HEADER=rc4.h rc4_locl.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=rc4_skey.o rc4_enc.o
+LIBSRC=rc4_skey.c rc4_enc.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+RC4_ENC=rc4_enc.o
+SRC=rc4_skey.c rc4_enc.c
+TEST=rc4test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/rc5
+ALL=Makefile rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c rc5_locl.h rc5.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+CPP=cc -E
+DIR=rc5
+EXHEADER=rc5.h
+GENERAL=Makefile
+HEADER=rc5_locl.h rc5.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=rc5_skey.o rc5_ecb.o rc5_enc.o rc5cfb64.o rc5ofb64.o
+LIBSRC=rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+RC5_ENC=rc5_enc.o
+SRC=rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c
+TEST=rc5test.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/idea
+ALL=Makefile i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c idea_lcl.h idea.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=idea
+EXHEADER=idea.h
+GENERAL=Makefile
+HEADER=idea_lcl.h idea.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=i_cbc.o i_cfb64.o i_ofb64.o i_ecb.o i_skey.o
+LIBSRC=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
+TEST=ideatest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/bf
+ALL=Makefile bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c bf_pi.h bf_locl.h blowfish.h
+APPS=
+AR=ar r
+BF_ENC=bf_enc.o
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+CPP=cc -E
+DIR=bf
+EXHEADER=blowfish.h
+GENERAL=Makefile
+HEADER=bf_pi.h bf_locl.h blowfish.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=bf_skey.o bf_ecb.o bf_enc.o bf_cfb64.o bf_ofb64.o
+LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
+TEST=bftest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/cast
+ALL=Makefile c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c cast_s.h cast_lcl.h cast.h
+APPS=
+AR=ar r
+CAST_ENC=c_enc.o
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+CPP=cc -E
+DIR=cast
+EXHEADER=cast.h
+GENERAL=Makefile
+HEADER=cast_s.h cast_lcl.h cast.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=c_skey.o c_ecb.o c_enc.o c_cfb64.o c_ofb64.o
+LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
+TEST=casttest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/bn
+ALL=Makefile 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 bn_err.c bn_sqr.c bn_mulw.c bn_recp.c bn_mont.c bn_mpi.c bn_lcl.h bn_prime.h bn.h
+APPS=
+AR=ar r
+BN_MULW=bn_mulw.o
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=bn
+ERR=bn
+ERRC=bn_err
+EXHEADER=bn.h
+GENERAL=Makefile
+HEADER=bn_lcl.h bn_prime.h bn.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+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 bn_err.o bn_sqr.o bn_mulw.o bn_recp.o bn_mont.o bn_mpi.o
+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 bn_err.c bn_sqr.c bn_mulw.c bn_recp.c bn_mont.c bn_mpi.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=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 bn_err.c bn_sqr.c bn_mulw.c bn_recp.c bn_mont.c bn_mpi.c
+TEST=bntest.c exptest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/rsa
+ALL=Makefile rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c rsa_none.c rsa.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=rsa
+ERR=rsa
+ERRC=rsa_err
+EXHEADER=rsa.h
+GENERAL=Makefile
+HEADER=rsa.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o rsa_pk1.o rsa_ssl.o rsa_none.o
+LIBSRC=rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c rsa_none.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c rsa_none.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/dsa
+ALL=Makefile dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c dsa_sign.c dsa_err.c dsa.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=dsa
+ERR=dsa
+ERRC=dsa_err
+EXHEADER=dsa.h
+GENERAL=Makefile
+HEADER=dsa.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=dsa_gen.o dsa_key.o dsa_lib.o dsa_vrf.o dsa_sign.o dsa_err.o
+LIBSRC=dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c dsa_sign.c dsa_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c dsa_sign.c dsa_err.c
+TEST=dsatest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/dh
+ALL=Makefile dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=dh
+ERR=dh
+ERRC=dh_err
+EXHEADER=dh.h
+GENERAL=Makefile
+HEADER=dh.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o
+LIBSRC=dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c
+TEST=dhtest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/buffer
+ALL=Makefile buffer.c buf_err.c buffer.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=buffer
+ERR=buffer
+ERRC=buf_err
+EXHEADER=buffer.h
+GENERAL=Makefile
+HEADER=buffer.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=buffer.o buf_err.o
+LIBSRC=buffer.c buf_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=buffer.c buf_err.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/bio
+ALL=Makefile bio_lib.c bio_cb.c bio_err.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 bio.h bss_file.c
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=bio
+ERR=bio
+ERRC=bio_err
+EXHEADER=bio.h bss_file.c
+GENERAL=Makefile
+HEADER=bio.h bss_file.c
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=bio_lib.o bio_cb.o bio_err.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
+LIBSRC=bio_lib.c bio_cb.c bio_err.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
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=bio_lib.c bio_cb.c bio_err.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
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/stack
+ALL=Makefile stack.c stack.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=stack
+EXHEADER=stack.h
+GENERAL=Makefile
+HEADER=stack.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=stack.o
+LIBSRC=stack.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=stack.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/lhash
+ALL=Makefile lhash.c lh_stats.c lhash.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=lhash
+EXHEADER=lhash.h
+GENERAL=Makefile
+HEADER=lhash.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=lhash.o lh_stats.o
+LIBSRC=lhash.c lh_stats.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=lhash.c lh_stats.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/rand
+ALL=Makefile md_rand.c randfile.c rand.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=rand
+EXHEADER=rand.h
+GENERAL=Makefile
+HEADER=rand.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=md_rand.o randfile.o
+LIBSRC=md_rand.c randfile.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=md_rand.c randfile.c
+TEST=randtest.c
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/err
+ALL=Makefile err.c err_all.c err_prn.c err.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=err
+EXHEADER=err.h
+GENERAL=Makefile
+HEADER=err.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=err.o err_all.o err_prn.o
+LIBSRC=err.c err_all.c err_prn.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=err.c err_all.c err_prn.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/objects
+ALL=Makefile README obj_dat.c obj_lib.c obj_err.c objects.h obj_dat.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=objects
+ERR=objects
+ERRC=obj_err
+EXHEADER=objects.h
+GENERAL=Makefile README
+HEADER=objects.h obj_dat.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=obj_dat.o obj_lib.o obj_err.o
+LIBSRC=obj_dat.c obj_lib.c obj_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=obj_dat.c obj_lib.c obj_err.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/evp
+ALL=Makefile 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 evp_err.c e_null.c c_all.c evp_lib.c evp.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=evp
+ERR=evp
+ERRC=evp_err
+EXHEADER=evp.h
+GENERAL=Makefile
+HEADER=evp.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+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 evp_err.o e_null.o c_all.o evp_lib.o
+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 evp_err.c e_null.c c_all.c evp_lib.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=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 evp_err.c e_null.c c_all.c evp_lib.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/pem
+ALL=Makefile pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c pem.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+CTX_SIZE=ctx_size
+DIR=pem
+ERR=pem
+ERRC=pem_err
+EXHEADER=pem.h
+GENERAL=Makefile
+HEADER=pem.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o
+LIBSRC=pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/asn1
+ALL=Makefile README 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 asn1_err.c a_meth.c a_bytes.c evp_asn1.c asn1.h asn1_mac.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=asn1
+ERR=asn1
+ERRC=asn1_err
+EXHEADER=asn1.h asn1_mac.h
+GENERAL=Makefile README
+HEADER=asn1.h asn1_mac.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+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 asn1_err.o a_meth.o a_bytes.o evp_asn1.o
+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 asn1_err.c a_meth.c a_bytes.c evp_asn1.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=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 asn1_err.c a_meth.c a_bytes.c evp_asn1.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/x509
+ALL=Makefile README 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 x509_err.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 x509.h x509_vfy.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=x509
+ERR=x509
+ERRC=x509_err
+EXHEADER=x509.h x509_vfy.h
+GENERAL=Makefile README
+HEADER=x509.h x509_vfy.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+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 x509_err.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
+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 x509_err.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
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=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 x509_err.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
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/conf
+ALL=Makefile conf.c conf_err.c conf_lcl.h conf.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=conf
+ERR=conf
+ERRC=conf_err
+EXHEADER=conf.h
+GENERAL=Makefile
+HEADER=conf_lcl.h conf.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=conf.o conf_err.o
+LIBSRC=conf.c conf_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=conf.c conf_err.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/txt_db
+ALL=Makefile txt_db.c txt_db.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS= -g
+DIR=txt_db
+EXHEADER=txt_db.h
+GENERAL=Makefile
+HEADER=txt_db.h
+INCLUDES=
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=txt_db.o
+LIBSRC=txt_db.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=txt_db.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=crypto/pkcs7
+ALL=Makefile README pk7_lib.c pkcs7err.c pk7_doit.c pkcs7.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=pkcs7
+ERR=pkcs7
+ERRC=pkcs7err
+EXHEADER=pkcs7.h
+GENERAL=Makefile README
+HEADER=pkcs7.h
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+LIB=../../libcrypto.a
+LIBOBJ=pk7_lib.o pkcs7err.o pk7_doit.o
+LIBSRC=pk7_lib.c pkcs7err.c pk7_doit.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=pk7_lib.c pkcs7err.c pk7_doit.c
+TEST=
+TOP=../..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=ssl
+ALL=Makefile README s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c bio_ssl.c ssl_err.c ssl.h ssl2.h ssl3.h ssl23.h tls1.h ssl_locl.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I../crypto -I../include -g
+DIR=ssl
+ERR=ssl
+ERRC=ssl_err
+EXHEADER=ssl.h ssl2.h ssl3.h ssl23.h tls1.h
+GENERAL=Makefile README
+HEADER=ssl.h ssl2.h ssl3.h ssl23.h tls1.h ssl_locl.h
+INCLUDES=-I../crypto -I../include
+INSTALLTOP=/usr/local/ssl
+LIB=../libssl.a
+LIBOBJ=s2_meth.o s2_srvr.o s2_clnt.o s2_lib.o s2_enc.o s2_pkt.o s3_meth.o s3_srvr.o s3_clnt.o s3_lib.o s3_enc.o s3_pkt.o s3_both.o s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o ssl_ciph.o ssl_stat.o ssl_rsa.o ssl_asn1.o ssl_txt.o ssl_algs.o bio_ssl.o ssl_err.o
+LIBSRC=s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c bio_ssl.c ssl_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c ssl_ciph.c ssl_stat.c ssl_rsa.c ssl_asn1.c ssl_txt.c ssl_algs.c bio_ssl.c ssl_err.c
+TEST=ssltest.c
+TOP=..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=rsaref
+ALL=Makefile rsaref.c rsar_err.c  rsaref.h
+APPS=
+AR=ar r
+CC=cc
+CFLAG=-g
+CFLAGS=-I../crypto -I../include -g
+DIR=rsaref
+ERR=rsaref
+ERRC=rsar_err
+EXHEADER=
+GENERAL=Makefile
+HEADER= rsaref.h
+INCLUDES=-I../crypto -I../include
+INSTALLTOP=/usr/local/ssl
+LIB=../libRSAglue.a
+LIBOBJ=rsaref.o rsar_err.o
+LIBSRC=rsaref.c rsar_err.c
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+SRC=rsaref.c rsar_err.c
+TEST=
+TOP=..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=apps
+ALL=Makefile verify.c asn1pars.c req.c dgst.c dh.c enc.c gendh.c errstr.c ca.c pkcs7.c crl2p7.c crl.c rsa.c dsa.c dsaparam.c x509.c genrsa.c s_server.c s_client.c speed.c s_time.c apps.c s_cb.c s_socket.c version.c sess_id.c ciphers.c apps.h progs.h s_apps.h testdsa.h testrsa.h 
+A_OBJ=apps.o
+A_SRC=apps.c
+CC=cc
+CFLAG=-g -static
+CFLAGS=-DMONOLITH -I../include -g -static
+DIR=apps
+DLIBCRYPTO=../libcrypto.a
+DLIBSSL=../libssl.a
+EXE=ssleay
+EXHEADER=
+EX_LIBS=
+E_EXE=verify asn1pars req dgst dh enc gendh errstr ca crl rsa dsa dsaparam x509 genrsa s_server s_client speed s_time version pkcs7 crl2pkcs7 sess_id ciphers
+E_OBJ=verify.o asn1pars.o req.o dgst.o dh.o enc.o gendh.o errstr.o ca.o pkcs7.o crl2p7.o crl.o rsa.o dsa.o dsaparam.o x509.o genrsa.o s_server.o s_client.o speed.o s_time.o apps.o s_cb.o s_socket.o version.o sess_id.o ciphers.o
+E_SRC=verify.c asn1pars.c req.c dgst.c dh.c enc.c gendh.c errstr.c ca.c pkcs7.c crl2p7.c crl.c rsa.c dsa.c dsaparam.c x509.c genrsa.c s_server.c s_client.c speed.c s_time.c apps.c s_cb.c s_socket.c version.c sess_id.c ciphers.c
+GENERAL=Makefile
+HEADER=apps.h progs.h s_apps.h testdsa.h testrsa.h 
+INCLUDES=-I../include
+INSTALLTOP=/usr/local/ssl
+LIBCRYPTO=-L.. -lcrypto
+LIBSSL=-L.. -lssl
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+PEX_LIBS=
+PROGS=ssleay.c
+RM=/bin/rm -f
+SCRIPTS=CA.sh der_chop
+SRC=verify.c asn1pars.c req.c dgst.c dh.c enc.c gendh.c errstr.c ca.c pkcs7.c crl2p7.c crl.c rsa.c dsa.c dsaparam.c x509.c genrsa.c s_server.c s_client.c speed.c s_time.c apps.c s_cb.c s_socket.c version.c sess_id.c ciphers.c
+SSLEAY=ssleay
+S_OBJ=s_cb.o s_socket.o
+S_SRC=s_cb.c s_socket.c
+TOP=..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=test
+ALL=Makefile.ssl bntest.c ideatest.c md2test.c md5test.c hmactest.c rc2test.c rc4test.c rc5test.c destest.c shatest.c sha1test.c mdc2test.c rmdtest.c randtest.c dhtest.c casttest.c bftest.c ssltest.c dsatest.c exptest.c 
+BFTEST=bftest
+BNTEST=bntest
+CASTTEST=casttest
+CC=cc
+CFLAG=-g
+CFLAGS=-I../include -g
+DESTEST=destest
+DHTEST=dhtest
+DIR=test
+DLIBCRYPTO=../libcrypto.a
+DLIBSSL=../libssl.a
+DSATEST=dsatest
+EXE=bntest ideatest md2test md5test hmactest rc2test rc4test rc5test destest shatest sha1test mdc2test rmdtest randtest dhtest bftest casttest ssltest exptest dsatest
+EXHEADER=
+EXPTEST=exptest
+EX_LIBS=
+GENERAL=Makefile.ssl
+HEADER=
+HMACTEST=hmactest
+IDEATEST=ideatest
+INCLUDES=-I../include
+INSTALLTOP=/usr/local/ssl
+LIBCRYPTO=-L.. -lcrypto
+LIBSSL=-L.. -lssl
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -fMakefile.ssl
+MAKEFILE=Makefile.ssl
+MD2TEST=md2test
+MD5TEST=md5test
+MDC2TEST=mdc2test
+METHTEST=methtest
+OBJ=bntest.o ideatest.o md2test.o md5test.o hmactest.o rc2test.o rc4test.o rc5test.o destest.o shatest.o sha1test.o mdc2test.o rmdtest.o randtest.o dhtest.o casttest.o bftest.o ssltest.o dsatest.o exptest.o
+PEX_LIBS=
+RANDTEST=randtest
+RC2TEST=rc2test
+RC4TEST=rc4test
+RC5TEST=rc5test
+RMDTEST=rmdtest
+SHA1TEST=sha1test
+SHATEST=shatest
+SRC=bntest.c ideatest.c md2test.c md5test.c hmactest.c rc2test.c rc4test.c rc5test.c destest.c shatest.c sha1test.c mdc2test.c rmdtest.c randtest.c dhtest.c casttest.c bftest.c ssltest.c dsatest.c exptest.c
+SSLTEST=ssltest
+TOP=..
+RELATIVE_DIRECTORY=
+RELATIVE_DIRECTORY=tools
+APPS=c_hash c_info c_issuer c_name c_rehash
+CC=cc
+CFLAG=-g
+CFLAGS=-I.. -I../../include -g
+DIR=tools
+GENERAL=Makefile.ssl
+INCLUDES=-I.. -I../../include
+INSTALLTOP=/usr/local/ssl
+MAKE=make -f Makefile.ssl
+MAKEDEPEND=makedepend -f Makefile.ssl
+MAKEFILE=Makefile.ssl
+TEST=
+TOP=..
+RELATIVE_DIRECTORY=
diff --git a/src/lib/libssl/src/Makefile.ssl b/src/lib/libssl/src/Makefile.ssl
new file mode 100644
index 0000000000..da7f885985
--- /dev/null
+++ b/src/lib/libssl/src/Makefile.ssl
@@ -0,0 +1,331 @@
+#
+# Makefile for all the SSL related library routines and utilities
+VERSION = 0.9.0a
+#
+# make install will install:
+#   libraries into $INSTALLTOP/lib
+#   headers   into $INSTALLTOP/include
+#   utilities into $INSTALLTOP/bin
+#
+# By default INSTALLTOP is set to /usr/local/ssl
+# If you want things install elsewere, consider running
+# perl util/ssldir.pl /new/path
+#
+# Interesting Mailing Lists:
+#     ssl-bugs@mincom.oz.au
+#     ssl-users@mincom.oz.au
+#
+# To join the Mailing Lists:
+#     ssl-bugs-request@mincom.oz.au
+#     ssl-users-request@mincom.oz.au
+#
+# If you must get hold of people directly (we much prefer the above
+# lists to be used if the question is of general interest!):
+#       Eric Young <eay@cryptsoft.com>
+#       Tim Hudson <tjh@cryptsoft.com>
+#       or both    <ssleay@cryptsoft.com>
+#
+# The primary distribution of SSLeay is from
+# ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL
+#
+# NOCONST - Define for C compilers that don't like the const key word.
+# NOPROTO - Define in if your compiler does not support prototypes.
+# RSAref  - Define if we are to link with RSAref.
+# NO_IDEA - Define to build without the IDEA algorithm
+# NO_RC4  - Define to build without the RC4 algorithm
+# NO_RC2  - Define to build without the RC2 algorithm
+# THREADS - Define when building with threads, you will probably also need any
+#           system defines as well, i.e. _REENTERANT for Solaris 2.[34]
+# TERMIO  - Define the termio terminal subsystem, needed if sgtty is missing.
+# TERMIOS - Define the termios terminal subsystem, Silicon Graphics.
+# LONGCRYPT - Define to use HPUX 10.x's long password modification to crypt(3).
+# DEVRANDOM - Give this the value of the 'random device' if your OS supports
+#           one.  32 bytes will be read from this when the random
+#           number generator is initalised.
+# SSL_ALLOW_ADH - define if you want the server to be able to use the
+#           SSLv3 anon-DH ciphers.
+# SSL_ALLOW_ENULL - define if you want the server to be able to use the
+#           NULL encryption ciphers.
+#
+# LOCK_DEBUG - turns on lots of lock debug output :-)
+# REF_CHECK - turn on some xyz_free() assertions.
+# REF_PRINT - prints some stuff on structure free.
+# CRYPTO_MDEBUG - turns on my 'memory leak' detecting stuff
+# MFUNC - Make all Malloc/Free/Realloc calls call
+#       CRYPTO_malloc/CRYPTO_free/CRYPTO_realloc which can be setup to
+#       call application defined callbacks via CRYPTO_set_mem_functions()
+# MD5_ASM needs to be defined to use the x86 assembler for MD5
+# SHA1_ASM needs to be defined to use the x86 assembler for SHA1
+# RMD160_ASM needs to be defined to use the x86 assembler for RIPEMD160
+
+
+CC= gcc
+#CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
+CFLAG= -DNO_IDEA -DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+PEX_LIBS= -L. -L.. -L../.. -L../../..
+EX_LIBS= 
+AR=ar r
+
+# Set BN_MULW to bn_mulw.o if you want to use the C version
+BN_MULW= asm/bn86-out.o
+#BN_MULW= bn_mulw.o
+#BN_MULW= asm/bn86-elf.o        # elf, linux-elf
+#BN_MULW= asm/bn86-sol.o        # solaris
+#BN_MULW= asm/bn86-out.o        # a.out, FreeBSD
+#BN_MULW= asm/bn86bsdi.o        # bsdi
+#BN_MULW= asm/alpha.o           # DEC Alpha
+#BN_MULW= asm/pa-risc2.o        # HP-UX PA-RISC
+#BN_MULW= asm/r3000.o           # SGI MIPS cpu
+#BN_MULW= asm/sparc.o           # Sun solaris/SunOS
+#BN_MULW= asm/bn-win32.o                # Windows 95/NT
+#BN_MULW= asm/x86w16.o          # 16 bit code for Windows 3.1/DOS
+#BN_MULW= asm/x86w32.o          # 32 bit code for Windows 3.1
+
+# Set DES_ENC to des_enc.o if you want to use the C version
+#There are 4 x86 assember options.
+DES_ENC= asm/dx86-out.o asm/yx86-out.o
+#DES_ENC= des_enc.o fcrypt_b.o          # C
+#DES_ENC= asm/dx86-elf.o asm/yx86-elf.o # elf
+#DES_ENC= asm/dx86-sol.o asm/yx86-sol.o # solaris
+#DES_ENC= asm/dx86-out.o asm/yx86-out.o # a.out, FreeBSD
+#DES_ENC= asm/dx86bsdi.o asm/yx86bsdi.o # bsdi
+
+# Set BF_ENC to bf_enc.o if you want to use the C version
+#There are 4 x86 assember options.
+BF_ENC= asm/bx86-out.o
+#BF_ENC= bf_enc.o
+#BF_ENC= asm/bx86-elf.o # elf
+#BF_ENC= asm/bx86-sol.o # solaris
+#BF_ENC= asm/bx86-out.o # a.out, FreeBSD
+#BF_ENC= asm/bx86bsdi.o # bsdi
+
+# Set CAST_ENC to c_enc.o if you want to use the C version
+#There are 4 x86 assember options.
+CAST_ENC= asm/cx86-out.o
+#CAST_ENC= c_enc.o
+#CAST_ENC= asm/cx86-elf.o # elf
+#CAST_ENC= asm/cx86-sol.o # solaris
+#CAST_ENC= asm/cx86-out.o # a.out, FreeBSD
+#CAST_ENC= asm/cx86bsdi.o # bsdi
+
+# Set RC4_ENC to rc4_enc.o if you want to use the C version
+#There are 4 x86 assember options.
+RC4_ENC= asm/rx86-out.o
+#RC4_ENC= rc4_enc.o
+#RC4_ENC= asm/rx86-elf.o # elf
+#RC4_ENC= asm/rx86-sol.o # solaris
+#RC4_ENC= asm/rx86-out.o # a.out, FreeBSD
+#RC4_ENC= asm/rx86bsdi.o # bsdi
+
+# Set RC5_ENC to rc5_enc.o if you want to use the C version
+#There are 4 x86 assember options.
+RC5_ENC= asm/r586-out.o
+#RC5_ENC= rc5_enc.o
+#RC5_ENC= asm/r586-elf.o # elf
+#RC5_ENC= asm/r586-sol.o # solaris
+#RC5_ENC= asm/r586-out.o # a.out, FreeBSD
+#RC5_ENC= asm/r586bsdi.o # bsdi
+
+# Also need MD5_ASM defined
+MD5_ASM_OBJ= asm/mx86-out.o
+#MD5_ASM_OBJ= asm/mx86-elf.o        # elf
+#MD5_ASM_OBJ= asm/mx86-sol.o        # solaris
+#MD5_ASM_OBJ= asm/mx86-out.o        # a.out, FreeBSD
+#MD5_ASM_OBJ= asm/mx86bsdi.o        # bsdi
+
+# Also need SHA1_ASM defined
+SHA1_ASM_OBJ= asm/sx86-out.o
+#SHA1_ASM_OBJ= asm/sx86-elf.o       # elf
+#SHA1_ASM_OBJ= asm/sx86-sol.o       # solaris
+#SHA1_ASM_OBJ= asm/sx86-out.o       # a.out, FreeBSD
+#SHA1_ASM_OBJ= asm/sx86bsdi.o       # bsdi
+
+# Also need RMD160_ASM defined
+RMD160_ASM_OBJ= asm/rm86-out.o
+#RMD160_ASM_OBJ= asm/rm86-elf.o       # elf
+#RMD160_ASM_OBJ= asm/rm86-sol.o       # solaris
+#RMD160_ASM_OBJ= asm/rm86-out.o       # a.out, FreeBSD
+#RMD160_ASM_OBJ= asm/rm86bsdi.o       # bsdi
+
+DIRS=   crypto ssl rsaref apps test tools
+# dirs in crypto to build
+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 asn1 x509 conf txt_db pkcs7
+
+# If you change the INSTALLTOP, make sure to also change the values
+# in crypto/location.h
+INSTALLTOP=/usr/ssl
+
+MAKEFILE= Makefile.ssl
+MAKE=     make -f Makefile.ssl
+
+MAN1=1
+MAN3=3
+SHELL=/bin/sh
+
+TOP=    .
+ONEDIRS=out tmp
+EDIRS=  times doc bugs util include certs ms shlib mt demos perl dep
+MISC=   COPYRIGHT Configure HISTORY.066 INSTALL Makefile.ssl Makefile \
+        README TODO HISTORY README.066 README.080 README.090 \
+        VERSION PROBLEMS MINFO makefile.one e_os.h \
+        MICROSOFT makevms.com config PATENTS
+WDIRS=  windows
+LIBS=   libcrypto.a libssl.a 
+
+GENERAL=        Makefile
+BASENAME=       SSLeay
+NAME=           $(BASENAME)-$(VERSION)
+TARFILE=        $(NAME).tar
+WTARFILE=       $(NAME)-win.tar
+EXHEADER=       e_os.h
+HEADER=         e_os.h
+
+all:
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making $$i..."; \
+        $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_MULW='${BN_MULW}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' all ); \
+        done;
+
+sub_all:
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making $$i..."; \
+        $(MAKE) CC='${CC}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_MULW='${BN_MULW}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' all ); \
+        done;
+
+clean:
+        /bin/rm -f shlib/*.o *.o core a.out fluff *.map
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "cleaning $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' clean ); \
+        /bin/rm -f $(LIBS); \
+        done;
+        /bin/rm -f *.a *.o speed.* *.map *.so .pure core
+        /bin/rm -f $(TARFILE)
+        @for i in $(ONEDIRS) ;\
+        do \
+        /bin/rm -fr $$i/*; \
+        done
+
+makefile.one: files
+        perl util/mk1mf.pl >makefile.one; \
+        sh util/do_ms.sh
+
+files:  MINFO
+        perl $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making 'files' in $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' files ); \
+        done;
+
+links:
+        /bin/rm -f Makefile;
+        ./util/point.sh Makefile.ssl Makefile;
+        $(TOP)/util/mklink.sh include $(EXHEADER) ;
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making links in $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' links ); \
+        done;
+        # @(cd apps; sh ./mklinks)
+        @( SSLEAY="`pwd`/apps/ssleay"; export SSLEAY; sh tools/c_rehash certs )
+
+dclean:
+        /bin/rm -f *.bak
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "undoing makedepend in $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' dclean ); \
+        done;
+
+rehash:
+        @(PATH="`pwd`/apps:${PATH}"; sh tools/c_rehash certs)
+
+test:   tests
+
+tests:
+        (cd test; echo "testing $$i..."; \
+        $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_MULW='${BN_MULW}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
+        @apps/ssleay version -a
+
+depend:
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making dependancies $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' depend ); \
+        done;
+
+lint:
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making lint $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' lint ); \
+        done;
+
+tags:
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making tags $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' tags ); \
+        done;
+
+errors:
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "making errors in $$i..."; \
+        $(MAKE) SDIRS='${SDIRS}' errors ); \
+        done;
+
+tar:
+        @(cd ..;\
+        mv $(BASENAME) $(NAME); \
+        export STUFF; \
+        for i in $(MISC) $(DIRS) $(EDIRS) $(ONEDIRS) ;\
+        do \
+                STUFF="$$STUFF $(NAME)/$$i"; \
+        done; \
+        tar cf $(NAME)/$(TARFILE) $$STUFF; \
+        mv $(NAME) $(BASENAME) ) 
+        gzip -f $(TARFILE)
+
+dist:   
+        perl Configure dist
+        perl util/up_ver.pl ${VERSION}
+        @$(MAKE) dist_pem_h
+        @$(MAKE) SDIRS='${SDIRS}' clean
+        @$(MAKE) SDIRS='${SDIRS}' dclean
+        @(cd apps; sh ./rmlinks)
+        @$(MAKE) makefile.one
+        @$(MAKE) tar
+
+dist_pem_h:
+        (cd crypto/pem; $(MAKE) SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+
+install: all
+        @-mkdir -p $(INSTALLTOP)/bin 2>/dev/null
+        @-mkdir -p $(INSTALLTOP)/lib 2>/dev/null
+        @-mkdir -p $(INSTALLTOP)/include 2>/dev/null
+        @-mkdir -p $(INSTALLTOP)/certs 2>/dev/null
+        @-mkdir -p $(INSTALLTOP)/private 2>/dev/null
+        @for i in $(DIRS) ;\
+        do \
+        (cd $$i; echo "installing $$i..."; \
+        $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' install ); \
+        done
+        @for i in $(LIBS) ;\
+        do \
+        (       echo installing $$i; \
+                cp $$i $(INSTALLTOP)/lib; \
+                sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
+                chmod 644 $(INSTALLTOP)/lib/$$i ); \
+        done
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/PATENTS b/src/lib/libssl/src/PATENTS
new file mode 100644
index 0000000000..61423d03c8
--- /dev/null
+++ b/src/lib/libssl/src/PATENTS
@@ -0,0 +1,9 @@
+RSA Data Security holds software patents on the RSA and RC5 algorithms.
+If there ciphers are used used inside the USA (and Japan?), you must contact
+RSA Data Security for licencing conditions.
+
+The IDEA algorithm is patented by XXXX and they should be contacted if that
+algorithm is to be used.
+
+RC4 is a trademark of RSA Data Security, so use of this label should perhaps
+only me used with RSA Data Security's permission.
diff --git a/src/lib/libssl/src/README.066 b/src/lib/libssl/src/README.066
new file mode 100644
index 0000000000..d8e086d0b4
--- /dev/null
+++ b/src/lib/libssl/src/README.066
@@ -0,0 +1,27 @@
+
+SSLeay 0.6.6 13-Jan-1997
+
+The main additions are
+
+- assember for x86 DES improvments.
+  From 191,000 per second on a pentium 100, I now get 281,000.  The inner
+  loop and the IP/FP modifications are from
+  Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>.  Many thanks for his
+  contribution.
+- The 'DES macros' introduced in 0.6.5 now have 3 types.
+  DES_PTR1, DES_PTR2 and 'normal'.  As per before, des_opts reports which
+  is best and there is a summery of mine in crypto/des/options.txt
+- A few bug fixes.
+- Added blowfish.  It is not used by SSL but all the other stuff that
+  deals with ciphers can use it in either ecb, cbc, cfb64 or ofb64 modes.
+  There are 3 options for optimising Blowfish.  BF_PTR, BF_PTR2 and 'normal'.
+  BF_PTR2 is pentium/x86 specific.  The correct option is setup in
+  the 'Configure' script.
+- There is now a 'get client certificate' callback which can be
+  'non-blocking'.  If more details are required, let me know.  It will
+  documented more in SSLv3 when I finish it.
+- Bug fixes from 0.6.5 including the infamous 'ca' bug.  The 'make test'
+  now tests the ca program.
+- Lots of little things modified and tweaked.
+
+eric
diff --git a/src/lib/libssl/src/README.080 b/src/lib/libssl/src/README.080
new file mode 100644
index 0000000000..155ce1c712
--- /dev/null
+++ b/src/lib/libssl/src/README.080
@@ -0,0 +1,147 @@
+This version of SSLeay has quite a lot of things different from the
+previous version.
+
+Basically check all callback parameters, I will be producing documentation
+about how to use things in th future.  Currently I'm just getting 080 out
+the door.  Please not that there are several ways to do everything, and
+most of the applications in the apps directory are hybrids, some using old
+methods and some using new methods.
+
+Have a look in demos/bio for some very simple programs and
+apps/s_client.c and apps/s_server.c for some more advanced versions.
+Notes are definitly needed but they are a week or so away.
+
+Anyway, some quick nots from Tim Hudson (tjh@cryptsoft.com)
+---
+Quick porting notes for moving from SSLeay-0.6.x to SSLeay-0.8.x to
+get those people that want to move to using the new code base off to
+a quick start.
+
+Note that Eric has tidied up a lot of the areas of the API that were
+less than desirable and renamed quite a few things (as he had to break
+the API in lots of places anyrate). There are a whole pile of additional
+functions for making dealing with (and creating) certificates a lot
+cleaner.
+
+01-Jul-97
+Tim Hudson
+tjh@cryptsoft.com
+
+---8<---
+
+To maintain code that uses both SSLeay-0.6.x and SSLeay-0.8.x you could
+use something like the following (assuming you #include "crypto.h" which
+is something that you really should be doing).
+
+#if SSLEAY_VERSION_NUMBER >= 0x0800
+#define SSLEAY8
+#endif
+
+buffer.h -> splits into buffer.h and bio.h so you need to include bio.h
+            too if you are working with BIO internal stuff (as distinct
+            from simply using the interface in an opaque manner)
+
+#include "bio.h"        - required along with "buffer.h" if you write
+                          your own BIO routines as the buffer and bio
+                          stuff that was intermixed has been separated
+                          out 
+                        
+envelope.h -> evp.h  (which should have been done ages ago)
+
+Initialisation ... don't forget these or you end up with code that
+is missing the bits required to do useful things (like ciphers):
+
+SSLeay_add_ssl_algorithms()
+(probably also want SSL_load_error_strings() too but you should have
+ already had that call in place)
+
+SSL_CTX_new()   - requires an extra method parameter
+                      SSL_CTX_new(SSLv23_method()) 
+                      SSL_CTX_new(SSLv2_method()) 
+                      SSL_CTX_new(SSLv3_method()) 
+
+                  OR to only have the server or the client code
+                      SSL_CTX_new(SSLv23_server_method()) 
+                      SSL_CTX_new(SSLv2_server_method()) 
+                      SSL_CTX_new(SSLv3_server_method()) 
+                  or  
+                      SSL_CTX_new(SSLv23_client_method()) 
+                      SSL_CTX_new(SSLv2_client_method()) 
+                      SSL_CTX_new(SSLv3_client_method()) 
+
+SSL_set_default_verify_paths() ... renamed to the more appropriate
+SSL_CTX_set_default_verify_paths()
+
+If you want to use client certificates then you have to add in a bit
+of extra stuff in that a SSLv3 server sends a list of those CAs that
+it will accept certificates from ... so you have to provide a list to
+SSLeay otherwise certain browsers will not send client certs.
+
+SSL_CTX_set_client_CA_list(ctx,SSL_load_client_CA_file(s_cert_file));
+
+
+X509_NAME_oneline(X)    -> X509_NAME_oneline(X,NULL,0)  
+                           or provide a buffer and size to copy the
+                           result into
+
+X509_add_cert ->  X509_STORE_add_cert (and you might want to read the
+                  notes on X509_NAME structure changes too)
+
+
+VERIFICATION CODE
+=================
+
+The codes have all be renamed from VERIFY_ERR_* to X509_V_ERR_* to
+more accurately reflect things.
+
+The verification callback args are now packaged differently so that
+extra fields for verification can be added easily in future without
+having to break things by adding extra parameters each release :-)
+
+X509_cert_verify_error_string -> X509_verify_cert_error_string
+
+
+BIO INTERNALS
+=============
+
+Eric has fixed things so that extra flags can be introduced in
+the BIO layer in future without having to play with all the BIO
+modules by adding in some macros.
+
+The ugly stuff using 
+        b->flags ~= (BIO_FLAGS_RW|BIO_FLAGS_SHOULD_RETRY)
+becomes
+        BIO_clear_retry_flags(b)
+
+        b->flags |= (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY)
+becomes
+        BIO_set_retry_read(b)
+
+Also ... BIO_get_retry_flags(b), BIO_set_flags(b)
+
+
+
+OTHER THINGS
+============
+
+X509_NAME has been altered so that it isn't just a STACK ... the STACK
+is now in the "entries" field ... and there are a pile of nice functions
+for getting at the details in a much cleaner manner.
+
+SSL_CTX has been altered ... "cert" is no longer a direct member of this
+structure ... things are now down under "cert_store" (see x509_vfy.h) and
+things are no longer in a CERTIFICATE_CTX but instead in a X509_STORE.
+If your code "knows" about this level of detail then it will need some 
+surgery.
+
+If you depending on the incorrect spelling of a number of the error codes
+then you will have to change your code as these have been fixed.
+
+ENV_CIPHER "type" got renamed to "nid" and as that is what it actually
+has been all along so this makes things clearer.
+ify_cert_error_string(ctx->error));
+
+SSL_R_NO_CIPHER_WE_TRUST -> SSL_R_NO_CIPHER_LIST
+                        and SSL_R_REUSE_CIPHER_LIST_NOT_ZERO
+
+
diff --git a/src/lib/libssl/src/README.090 b/src/lib/libssl/src/README.090
new file mode 100644
index 0000000000..634870d5f1
--- /dev/null
+++ b/src/lib/libssl/src/README.090
@@ -0,0 +1,71 @@
+10-Apr-1998
+I said the next version would go out at easter, and so it shall.
+I expect a 0.9.1 will follow with portability fixes in the next few weeks.
+
+This is a quick, meet the deadline.  Look to ssl-users for comments on what
+is new etc.
+
+The state of play
+- TLSv1 - I need to do some explaining about how the methods interact.
+  The bad news is that SSLeay 0.8.x application will not roll back to
+  SSLv3, I suffed up.  0.8.x is rather pedantic about the '3.0' version
+  number.  Look at the 'no-tls' options in applications in the apps directory.
+- The perl5 stuff is very rough.  The SSL part does not work due to
+  reference count hassles in the BIO stuff.  I just have not had time to
+  look at it.  The cipher, digest and bignum stuff works though.  I just
+  need to clean up the API.
+- Lots of x86 assember.  I now have it for des, 3des, rc4, rc5, blowfish,
+  cast, md5, sha1 and ripemd160.  It has been tested on win32, linux (elf)
+  and FreeBSD (a.out).
+- As mentioned above, cast, rc5 and ripemd160 have been added.
+- A simple HMAC set of functions.
+- EX_DATA strucutre, which can be used by applications or other libraries
+  to tack arbitarty data against strucutures that include it.
+  You will probably have to see examples to see how to use it, and I will
+  elaberate on the ssl-users mailing list
+- RSA blinding.  If you fear timing attacks on RSA, you can turn on
+  blinding which defeats it.
+- From Tim Hudson, try running 'sh config' instead of 'perl Configure'.
+  I makes an educated guess as to what you are and then runs 'perl Configure'
+- The error stuff has been modified so arbitary strings can be taged
+  against an error message.  It is used in a few places to elaberate on
+  parameters that caused the error.
+
+Areas of work
+- The 16bit big-num assember needs a routine added.  The WIN16 and
+  WIN32 stuff is ok, but MS-DOS or 286 builds need the update.
+- Most of the bignum assember will not work.  There will be a function
+  missing, bn_add_words().  I need people to send me the C compiler output
+  for platforms I don't already have.  Currently, the assember is correct for
+  x86, win32, win16(386+), linux elf, FreeBSD a.out and sparc.
+- PKCS7, I have delusions of s/MIME.  I need to do a BIO interface.
+- perl5, it needs finishing
+- X509v3 extension.  I have some ideas, I just need to
+  implement them :-)
+- Public key methods.  I need to clean up the library internally so
+  public key methods are loaded is a similar way to symetric ciphers
+  and digests.  I also need to seperate out the digests from public
+  key methods.  This stuff is needed to support sortware patents, smaller
+  code size and hardware tokens.
+
+Anyway, this release gets out the bug fixes and TLS, but be warned, until
+all those old SSLeay 0.8.x based server get upgraded, you will need to
+connect with SSLv3 if TLSv1 fails.
+
+eric (about to go bushwalking for the 4 day easter break :-)
+
+PS Common problems
+- For Win32 build, use /MD to specify your libraries, or build SSLeay with
+  the same flags as your application.  Visual C stuffs up the malloc routines
+  if memory allocated by one memory model is freed by another.  FILE pointers
+  are a major cause of these problem.
+- If you are trying to use non-blocking IO and it is not working,
+  try 'ssleay s_client -help' and see if the -nbio option is listed.
+  For unixware, it has the non-block IO define in 'differnt' header file
+  and SSLeay will silently build without non-blocking IO calls (but for
+  unixware, the special header has been included).
+- -DL_ENDIAN.  For the message digests, some code needs to be turned off
+  in the C code when assember is used.  For x86, this means the L_ENDIAN
+  needs to defined when x86 -DSHA1_ASM is defined.  The reasons this is
+  not automagically done is because non-x86 assember could be bigendian.
+  For pure C code builds, the B_ENDIAN/L_ENDIAN flags are optional.
diff --git a/src/lib/libssl/src/TODO b/src/lib/libssl/src/TODO
new file mode 100644
index 0000000000..1c3da41cdf
--- /dev/null
+++ b/src/lib/libssl/src/TODO
@@ -0,0 +1,28 @@
+- The loading of the netscape RC4 encrypted key is a crock of pig pellets.
+  It will be reworked along with a nice general mechanism for encrypting
+  ASN.1 stuff. [ Jun 96 ] I've cleaned up private keys internally but
+  still have not done PKCS#8 support.
+
+- Winsock support in s_client/s_server for windows nt/3.1 is a crock.
+  I will probably not get this fixed for a while, it is just there so
+  I could test things.
+
+- Be able to generate DSS certificates.
+
+- Add CRL to the X509 verification stuff, this will probably be added with
+  SSLv3.
+
++ X509 callback.  I need to callback the application to retrieve certificates
+  and CRL.
+
+*<- designates the things I'm activly working on.
++<- designates that which I have next in the queue.
+
+====
+
+X509v3 extensions
+verify certificate chains
+X509 cert lookup methods
+RSA/DSA/DH methods mostly for smart cards
+dsa cert generation
+
diff --git a/src/lib/libssl/src/VERSION b/src/lib/libssl/src/VERSION
new file mode 100644
index 0000000000..5555e9a3af
--- /dev/null
+++ b/src/lib/libssl/src/VERSION
@@ -0,0 +1,24 @@
+SSLeay 0.8.1
+        - Mostly bug fixes.  There is an Ephemeral DH cipher problem which
+          is fixed.
+
+SSLeay 0.8.0
+        - New release, for those that are wondering what happend to
+          0.7.x, call it our internal development version :-)
+        - There have been lots of changes, mostly the addition of SSLv3.
+        - There have been many additions from people and amongst
+          others, C2Net has assisted greatly.
+
+SSLeay 0.6.6
+        SSLeay 0.8.0 is not upward compatable with SSLeay 0.6.6, so
+        if your application requires 0.6.6, use it.  There have been
+        lots of bug fixes to 0.8.x that have not been applied to 0.6.6
+        so use 0.8.0+ in preference.
+
+PORTING 0.6.6 to 0.8.0
+        I'll be documenting this over the next few weeks but as
+        pressures have been increasing for making SSLv3 support
+        available I'm shipping it without this documentation as I
+        basically have not had time to write it (too busy earning a
+        living :-)
+
diff --git a/src/lib/libssl/src/apps/Makefile.ssl b/src/lib/libssl/src/apps/Makefile.ssl
new file mode 100644
index 0000000000..1cace40ab7
--- /dev/null
+++ b/src/lib/libssl/src/apps/Makefile.ssl
@@ -0,0 +1,144 @@
+#
+# SSLeay/apps/Makefile.ssl
+#
+
+DIR=            apps
+TOP=            ..
+CC=             cc
+INCLUDES=       -I../include
+CFLAG=          -g -static
+INSTALLTOP=     /usr/local/ssl
+MAKE=           make -f Makefile.ssl
+MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEFILE=       Makefile.ssl
+RM=             /bin/rm -f
+
+PEX_LIBS=
+EX_LIBS= 
+
+CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+
+DLIBCRYPTO=../libcrypto.a
+DLIBSSL=../libssl.a
+LIBCRYPTO=-L.. -lcrypto
+LIBSSL=-L.. -lssl
+
+SSLEAY= ssleay
+
+SCRIPTS=CA.sh der_chop
+
+EXE= $(SSLEAY)
+
+E_EXE=  verify asn1pars req dgst dh enc gendh errstr ca crl \
+        rsa dsa dsaparam \
+        x509 genrsa s_server s_client speed \
+        s_time version pkcs7 crl2pkcs7 sess_id ciphers
+
+PROGS= $(SSLEAY).c
+
+A_OBJ=apps.o
+A_SRC=apps.c
+S_OBJ=  s_cb.o s_socket.o
+S_SRC=  s_cb.c s_socket.c
+
+E_OBJ=  verify.o asn1pars.o req.o dgst.o dh.o enc.o gendh.o errstr.o ca.o \
+        pkcs7.o crl2p7.o crl.o \
+        rsa.o dsa.o dsaparam.o \
+        x509.o genrsa.o s_server.o s_client.o speed.o \
+        s_time.o $(A_OBJ) $(S_OBJ) version.o sess_id.o \
+        ciphers.o
+
+#       pem_mail.o
+
+E_SRC=  verify.c asn1pars.c req.c dgst.c dh.c enc.c gendh.c errstr.c ca.c \
+        pkcs7.c crl2p7.c crl.c \
+        rsa.c dsa.c dsaparam.c \
+        x509.c genrsa.c s_server.c s_client.c speed.c \
+        s_time.c $(A_SRC) $(S_SRC) version.c sess_id.c \
+        ciphers.c
+
+#       pem_mail.c
+
+SRC=$(E_SRC)
+
+EXHEADER=
+HEADER= apps.h progs.h s_apps.h \
+        testdsa.h testrsa.h \
+        $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        @(cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all:    exe
+
+exe:    $(EXE)
+
+req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
+        $(CC) -o req $(CFLAG) sreq.o $(A_OBJ) $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+sreq.o: req.c 
+        $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+install: mklinks
+        @for i in $(EXE) $(SCRIPTS) mklinks; \
+        do  \
+        (echo installing $$i; \
+         cp $$i $(INSTALLTOP)/bin/$$i; \
+         chmod 755 $(INSTALLTOP)/bin/$$i ); \
+         done; \
+        cp ssleay.cnf $(INSTALLTOP)/lib
+        chmod 644 $(INSTALLTOP)/lib/ssleay.cnf
+        cd $(INSTALLTOP)/bin; \
+        /bin/sh ./mklinks; \
+        /bin/rm -f ./mklinks
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+
+dclean:
+        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+errors:
+
+clean:
+        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
+        /bin/rm -f req
+
+$(DLIBSSL):
+        (cd ../ssl; $(MAKE))
+
+$(DLIBCRYPTO):
+        (cd ../crypto; $(MAKE))
+
+$(SSLEAY): progs.h $(E_OBJ) $(SSLEAY).o $(DLIBCRYPTO) $(DLIBSSL)
+        $(RM) $(SSLEAY)
+        $(CC) -o $(SSLEAY) $(CFLAGS) $(SSLEAY).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+
+progs.h:
+        perl ./g_ssleay.pl $(E_EXE) >progs.h
+        $(RM) $(SSLEAY).o
+
+mklinks:
+        perl ./g_ssleay.pl $(E_EXE) >progs.h
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/apps/der_chop b/src/lib/libssl/src/apps/der_chop
new file mode 100644
index 0000000000..4639330c10
--- /dev/null
+++ b/src/lib/libssl/src/apps/der_chop
@@ -0,0 +1,305 @@
+#!/usr/local/bin/perl
+#
+# der_chop ... this is one total hack that Eric is really not proud of
+#              so don't look at it and don't ask for support
+#
+# The "documentation" for this (i.e. all the comments) are my fault --tjh
+#
+# This program takes the "raw" output of derparse/asn1parse and 
+# converts it into tokens and then runs regular expression matches
+# to try to figure out what to grab to get the things that are needed
+# and it is possible that this will do the wrong thing as it is a *hack*
+#
+# SSLeay 0.5.2+ should have direct read support for x509 (via -inform NET)
+# [I know ... promises promises :-)]
+#
+# To convert a Netscape Certificate:
+#    der_chop < ServerCert.der > cert.pem
+# To convert a Netscape Key (and encrypt it again to protect it)
+#    rsa -inform NET -in ServerKey.der -des > key.pem
+#
+# 23-Apr-96 eay    Added the extra ASN.1 string types, I still think this
+#                  is an evil hack.  If nothing else the parsing should
+#                  be relative, not absolute.
+# 19-Apr-96 tjh    hacked (with eay) into 0.5.x format
+#
+# Tim Hudson
+# tjh@cryptsoft.com
+#
+
+
+require 'getopts.pl';
+
+$debug=0;
+
+# this was the 0.4.x way of doing things ...
+$cmd="derparse";
+$x509_cmd="x509";
+$crl_cmd="crl";
+$rc4_cmd="rc4";
+$md2_cmd="md2";
+$md4_cmd="md4";
+$rsa_cmd="rsa -des -inform der ";
+
+# this was the 0.5.x way of doing things ...
+$cmd="ssleay asn1parse";
+$x509_cmd="ssleay x509";
+$crl_cmd="ssleay crl";
+$rc4_cmd="ssleay rc4";
+$md2_cmd="ssleay md2";
+$md4_cmd="ssleay md4";
+$rsa_cmd="ssleay rsa -des -inform der ";
+
+&Getopts('vd:') || die "usage:$0 [-v] [-d num] file";
+$depth=($opt_d =~ /^\d+$/)?$opt_d:0;
+
+&init_der();
+
+if ($#ARGV != -1)
+        {
+        foreach $file (@ARGV)
+                {
+                print STDERR "doing $file\n";
+                &dofile($file);
+                }
+        }
+else
+        {
+        $file="/tmp/a$$.DER";
+        open(OUT,">$file") || die "unable to open $file:$!\n";
+        for (;;)
+                {
+                $i=sysread(STDIN,$b,1024*10);
+                last if ($i <= 0);
+                $i=syswrite(OUT,$b,$i);
+                }
+        &dofile($file);
+        unlink($file);
+        }
+        
+sub dofile
+        {
+        local($file)=@_;
+        local(@p);
+
+        $b=&load_file($file);
+        @p=&load_file_parse($file);
+
+        foreach $_ (@p)
+                {
+                ($off,$d,$hl,$len)=&parse_line($_);
+                $d-=$depth;
+                next if ($d != 0);
+                next if ($len == 0);
+
+                $o=substr($b,$off,$len+$hl);
+                ($str,@data)=&der_str($o);
+                print "$str\n" if ($opt_v);
+                if ($str =~ /^$crl/)
+                        {
+                        open(OUT,"|$crl_cmd -inform d -hash -issuer") ||
+                                die "unable to run $crl_cmd:$!\n";
+                        print OUT $o;
+                        close(OUT);
+                        }
+                elsif ($str =~ /^$x509/)
+                        {
+                        open(OUT,"|$x509_cmd -inform d -hash -subject -issuer")
+                                || die "unable to run $x509_cmd:$!\n";
+                        print OUT $o;
+                        close(OUT);
+                        }
+                elsif ($str =~ /^$rsa/)
+                        {
+                        ($type)=($data[3] =~ /OBJECT_IDENTIFIER :(.*)\s*$/);
+                        next unless ($type eq "rsaEncryption");
+                        ($off,$d,$hl,$len)=&parse_line($data[5]);
+                        $os=substr($o,$off+$hl,$len);
+                        open(OUT,"|$rsa_cmd")
+                                || die "unable to run $rsa_cmd:$!\n";
+                        print OUT $os;
+                        close(OUT);
+                        }
+                elsif ($str =~ /^0G-1D-1G/)
+                        {
+                        ($off,$d,$hl,$len)=&parse_line($data[1]);
+                        $os=substr($o,$off+$hl,$len);
+                        print STDERR "<$os>\n" if $opt_v;
+                        &do_certificate($o,@data)
+                                if (($os eq "certificate") &&
+                                    ($str =! /^0G-1D-1G-2G-3F-3E-2D/));
+                        &do_private_key($o,@data)
+                                if (($os eq "private-key") &&
+                                    ($str =! /^0G-1D-1G-2G-3F-3E-2D/));
+                        }
+                }
+        }
+
+sub der_str
+        {
+        local($str)=@_;
+        local(*OUT,*IN,@a,$t,$d,$ret);
+        local($file)="/tmp/b$$.DER";
+        local(@ret);
+
+        open(OUT,">$file");
+        print OUT $str;
+        close(OUT);
+        open(IN,"$cmd -inform 'd' -in $file |") ||
+                die "unable to run $cmd:$!\n";
+        $ret="";
+        while (<IN>)
+                {
+                chop;
+                push(@ret,$_);
+
+                print STDERR "$_\n" if ($debug);
+
+                @a=split(/\s*:\s*/);
+                ($d)=($a[1] =~ /d=\s*(\d+)/);
+                $a[2] =~ s/\s+$//;
+                $t=$DER_s2i{$a[2]};
+                $ret.="$d$t-";
+                }
+        close(IN);
+        unlink($file);
+        chop $ret;
+        $ret =~ s/(-3H(-4G-5F-5[IJKMQRS])+)+/-NAME/g;
+        $ret =~ s/(-3G-4B-4L)+/-RCERT/g;
+        return($ret,@ret);
+        }
+
+sub init_der
+        {
+        $crl= "0G-1G-2G-3F-3E-2G-NAME-2L-2L-2G-RCERT-1G-2F-2E-1C";
+        $x509="0G-1G-2B-2G-3F-3E-2G-NAME-2G-3L-3L-2G-NAME-2G-3G-4F-4E-3C-1G-2F-2E-1C";
+        $rsa= "0G-1B-1G-2F-2E-1D";
+
+        %DER_i2s=(
+                # SSLeay 0.4.x has this list
+                "A","EOC",
+                "B","INTEGER",
+                "C","BIT STRING",
+                "D","OCTET STRING",
+                "E","NULL",
+                "F","OBJECT",
+                "G","SEQUENCE",
+                "H","SET",
+                "I","PRINTABLESTRING",
+                "J","T61STRING",
+                "K","IA5STRING",
+                "L","UTCTIME",
+                "M","NUMERICSTRING",
+                "N","VIDEOTEXSTRING",
+                "O","GENERALIZEDTIME",
+                "P","GRAPHICSTRING",
+                "Q","ISO64STRING",
+                "R","GENERALSTRING",
+                "S","UNIVERSALSTRING",
+
+                # SSLeay 0.5.x changed some things ... and I'm
+                # leaving in the old stuff but adding in these
+                # to handle the new as well --tjh
+                # - Well I've just taken them out and added the extra new
+                # ones :-) - eay
+                );
+
+        foreach (keys %DER_i2s)
+                { $DER_s2i{$DER_i2s{$_}}=$_; }
+        }
+
+sub parse_line
+        {
+        local($_)=@_;
+
+        return(/\s*(\d+):d=\s*(\d+)\s+hl=\s*(\d+)\s+l=\s*(\d+|inf)\s/);
+        }
+
+#  0:d=0 hl=4 l=377 cons: univ: SEQUENCE          
+#  4:d=1 hl=2 l= 11 prim: univ: OCTET_STRING      
+# 17:d=1 hl=4 l=360 cons: univ: SEQUENCE          
+# 21:d=2 hl=2 l= 12 cons: univ: SEQUENCE          
+# 23:d=3 hl=2 l=  8 prim: univ: OBJECT_IDENTIFIER :rc4
+# 33:d=3 hl=2 l=  0 prim: univ: NULL              
+# 35:d=2 hl=4 l=342 prim: univ: OCTET_STRING
+sub do_private_key
+        {
+        local($data,@struct)=@_;
+        local($file)="/tmp/b$$.DER";
+        local($off,$d,$hl,$len,$_,$b,@p,$s);
+
+        ($type)=($struct[4] =~ /OBJECT_IDENTIFIER :(.*)\s*$/);
+        if ($type eq "rc4")
+                {
+                ($off,$d,$hl,$len)=&parse_line($struct[6]);
+                open(OUT,"|$rc4_cmd >$file") ||
+                        die "unable to run $rc4_cmd:$!\n";
+                print OUT substr($data,$off+$hl,$len);
+                close(OUT);
+
+                $b=&load_file($file);
+                unlink($file);
+
+                ($s,@p)=&der_str($b);
+                die "unknown rsa key type\n$s\n"
+                        if ($s ne '0G-1B-1G-2F-2E-1D');
+                local($off,$d,$hl,$len)=&parse_line($p[5]);
+                $b=substr($b,$off+$hl,$len);
+                ($s,@p)=&der_str($b);
+                open(OUT,"|$rsa_cmd") || die "unable to run $rsa_cmd:$!\n";
+                print OUT $b;
+                close(OUT);
+                }
+        else
+                {
+                print "'$type' is unknown\n";
+                exit(1);
+                }
+        }
+
+sub do_certificate
+        {
+        local($data,@struct)=@_;
+        local($file)="/tmp/b$$.DER";
+        local($off,$d,$hl,$len,$_,$b,@p,$s);
+
+        ($off,$d,$hl,$len)=&parse_line($struct[2]);
+        $b=substr($data,$off,$len+$hl);
+
+        open(OUT,"|$x509_cmd -inform d") || die "unable to run $x509_cmd:$!\n";
+        print OUT $b;
+        close(OUT);
+        }
+
+sub load_file
+        {
+        local($file)=@_;
+        local(*IN,$r,$b,$i);
+
+        $r="";
+        open(IN,"<$file") || die "unable to open $file:$!\n";
+        for (;;)
+                {
+                $i=sysread(IN,$b,10240);
+                last if ($i <= 0);
+                $r.=$b;
+                }
+        close(IN);
+        return($r);
+        }
+
+sub load_file_parse
+        {
+        local($file)=@_;
+        local(*IN,$r,@ret,$_,$i,$n,$b);
+
+        open(IN,"$cmd -inform d -in $file|")
+                || die "unable to run der_parse\n";
+        while (<IN>)
+                {
+                chop;
+                push(@ret,$_);
+                }
+        return($r,@ret);
+        }
+
diff --git a/src/lib/libssl/src/apps/eay.c b/src/lib/libssl/src/apps/eay.c
new file mode 100644
index 0000000000..37d5dcbd30
--- /dev/null
+++ b/src/lib/libssl/src/apps/eay.c
@@ -0,0 +1,130 @@
+/* apps/eay.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MONOLITH
+#define USE_SOCKETS
+#include "../e_os.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 "err.h"
+
+#include "x509.h"
+#include "pkcs7.h"
+#include "pem.h"
+#include "asn1.h"
+#include "objects.h"
+
+#define MONOLITH
+
+#include "ssleay.c"
+#include "apps.c"
+#include "asn1pars.c"
+#ifndef NO_RSA
+#include "ca.c"
+#include "genrsa.c"
+#include "req.c"
+#include "rsa.c"
+#endif
+#ifndef NO_DH
+#include "gendh.c"
+#include "dh.c"
+#endif
+#include "crl.c"
+#include "crl2p7.c"
+#include "dgst.c"
+#include "enc.c"
+#include "errstr.c"
+#if !defined(NO_SSL2) || !defined(NO_SSL3)
+#ifndef NO_SOCK
+#include "s_cb.c"
+#include "s_client.c"
+#include "s_server.c"
+#include "s_socket.c"
+#include "s_time.c"
+#endif
+#endif
+#include "speed.c"
+#include "verify.c"
+#include "version.c"
+#include "x509.c"
+#include "ciphers.c"
+#include "sess_id.c"
+#include "pkcs7.c"
+#ifndef NO_DSA
+#include "dsaparam.c"
+#include "dsa.c"
+#include "gendsa.c"
+#endif
+
diff --git a/src/lib/libssl/src/apps/ext.v3 b/src/lib/libssl/src/apps/ext.v3
new file mode 100644
index 0000000000..87ee8e6173
--- /dev/null
+++ b/src/lib/libssl/src/apps/ext.v3
@@ -0,0 +1,2 @@
+2.99999.3       SET.ex3         SET x509v3 extension 3
+
diff --git a/src/lib/libssl/src/apps/g_ssleay.pl b/src/lib/libssl/src/apps/g_ssleay.pl
new file mode 100644
index 0000000000..bd5621dcab
--- /dev/null
+++ b/src/lib/libssl/src/apps/g_ssleay.pl
@@ -0,0 +1,114 @@
+#!/usr/bin/perl
+
+$mkprog='mklinks';
+$rmprog='rmlinks';
+
+print "#ifndef NOPROTO\n";
+
+grep(s/^asn1pars$/asn1parse/,@ARGV);
+
+foreach (@ARGV)
+        { printf "extern int %s_main(int argc,char *argv[]);\n",$_; }
+print "#else\n";
+foreach (@ARGV)
+        { printf "extern int %s_main();\n",$_; }
+print "#endif\n";
+
+
+print <<'EOF';
+
+#ifdef SSLEAY_SRC
+
+#define FUNC_TYPE_GENERAL       1
+#define FUNC_TYPE_MD            2
+#define FUNC_TYPE_CIPHER        3
+
+typedef struct {
+        int type;
+        char *name;
+        int (*func)();
+        } FUNCTION;
+
+FUNCTION functions[] = {
+EOF
+
+foreach (@ARGV)
+        {
+        push(@files,$_);
+        $str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
+        if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
+                { print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3))\n${str}#endif\n"; } 
+        elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) ||
+                ($_ =~ /^req$/) || ($_ =~ /^ca$/) || ($_ =~ /^x509$/))
+                { print "#ifndef NO_RSA\n${str}#endif\n";  }
+        elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
+                { print "#ifndef NO_DSA\n${str}#endif\n"; }
+        elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/))
+                { print "#ifndef NO_DH\n${str}#endif\n"; }
+        else
+                { print $str; }
+        }
+
+foreach ("md2","md5","sha","sha1","mdc2")
+        {
+        push(@files,$_);
+        printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
+        }
+
+foreach (
+        "base64",
+        "des", "des3", "desx", "idea", "rc4", "rc2","bf","cast","rc5",
+        "des-ecb", "des-ede",    "des-ede3",
+        "des-cbc", "des-ede-cbc","des-ede3-cbc",
+        "des-cfb", "des-ede-cfb","des-ede3-cfb",
+        "des-ofb", "des-ede-ofb","des-ede3-ofb",
+        "idea-cbc","idea-ecb",   "idea-cfb", "idea-ofb",
+        "rc2-cbc", "rc2-ecb",    "rc2-cfb",  "rc2-ofb",
+        "bf-cbc",  "bf-ecb",     "bf-cfb",   "bf-ofb",
+        "cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
+        "cast-cbc", "rc5-cbc",   "rc5-ecb",  "rc5-cfb",  "rc5-ofb")
+        {
+        push(@files,$_);
+
+        $t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);
+        if    ($_ =~ /des/)  { $t="#ifndef NO_DES\n${t}#endif\n"; }
+        elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; }
+        elsif ($_ =~ /rc4/)  { $t="#ifndef NO_RC4\n${t}#endif\n"; }
+        elsif ($_ =~ /rc2/)  { $t="#ifndef NO_RC2\n${t}#endif\n"; }
+        elsif ($_ =~ /bf/)   { $t="#ifndef NO_BLOWFISH\n${t}#endif\n"; }
+        elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; }
+        elsif ($_ =~ /rc5/)  { $t="#ifndef NO_RC5\n${t}#endif\n"; }
+        print $t;
+        }
+
+print "\t{0,NULL,NULL}\n\t};\n";
+print "#endif\n\n";
+
+open(OUT,">$mkprog") || die "unable to open '$prog':$!\n";
+print OUT "#!/bin/sh\nfor i in ";
+foreach (@files)
+        { print OUT $_." "; }
+print OUT <<'EOF';
+
+do
+echo making symlink for $i
+/bin/rm -f $i
+ln -s ssleay $i
+done
+EOF
+close(OUT);
+chmod(0755,$mkprog);
+
+open(OUT,">$rmprog") || die "unable to open '$prog':$!\n";
+print OUT "#!/bin/sh\nfor i in ";
+foreach (@files)
+        { print OUT $_." "; }
+print OUT <<'EOF';
+
+do
+echo removing $i
+/bin/rm -f $i
+done
+EOF
+close(OUT);
+chmod(0755,$rmprog);
diff --git a/src/lib/libssl/src/apps/mklinks b/src/lib/libssl/src/apps/mklinks
new file mode 100644
index 0000000000..55a56b399e
--- /dev/null
+++ b/src/lib/libssl/src/apps/mklinks
@@ -0,0 +1,7 @@
+#!/bin/sh
+for i in verify asn1parse req dgst dh enc gendh errstr ca crl rsa dsa dsaparam x509 genrsa s_server s_client speed s_time version pkcs7 crl2pkcs7 sess_id ciphers md2 md5 sha sha1 mdc2 base64 des des3 desx idea rc4 rc2 bf cast rc5 des-ecb des-ede des-ede3 des-cbc des-ede-cbc des-ede3-cbc des-cfb des-ede-cfb des-ede3-cfb des-ofb des-ede-ofb des-ede3-ofb idea-cbc idea-ecb idea-cfb idea-ofb rc2-cbc rc2-ecb rc2-cfb rc2-ofb bf-cbc bf-ecb bf-cfb bf-ofb cast5-cbc cast5-ecb cast5-cfb cast5-ofb cast-cbc rc5-cbc rc5-ecb rc5-cfb rc5-ofb 
+do
+echo making symlink for $i
+/bin/rm -f $i
+ln -s ssleay $i
+done
diff --git a/src/lib/libssl/src/apps/pem_mail.c b/src/lib/libssl/src/apps/pem_mail.c
new file mode 100644
index 0000000000..64e04acb52
--- /dev/null
+++ b/src/lib/libssl/src/apps/pem_mail.c
@@ -0,0 +1,170 @@
+/* apps/pem_mail.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 "rsa.h"
+#include "evp.h"
+#include "objects.h"
+#include "x509.h"
+#include "err.h"
+#include "pem.h"
+#include "apps.h"
+
+#undef PROG
+#define PROG    pem_mail_main
+
+static char *usage[]={
+"usage: pem_mail args\n",
+"\n",
+" -in arg         - input file - default stdin\n",
+" -out arg        - output file - default stdout\n",
+" -cert arg       - the certificate to use\n",
+" -key arg        - the private key to use\n",
+" -MIC           - sign the message\n",
+" -enc arg        - encrypt with one of cbc-des\n",
+NULL
+};
+
+
+typedef struct lines_St
+        {
+        char *line;
+        struct lines_st *next;
+        } LINES;
+
+int main(argc, argv)
+int argc;
+char **argv;
+        {
+        FILE *in;
+        RSA *rsa=NULL;
+        EVP_MD_CTX ctx;
+        unsigned int mic=0,i,n;
+        unsigned char buf[1024*15];
+        char *prog,*infile=NULL,*outfile=NULL,*key=NULL;
+        int badops=0;
+
+        apps_startup();
+
+        prog=argv[0];
+        argc--;
+        argv++;
+        while (argc >= 1)
+                {
+                if (strcmp(*argv,"-key") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        key= *(++argv);
+                        }
+                else if (strcmp(*argv,"-in") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        infile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-out") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        outfile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-mic") == 0)
+                        mic=1;
+                else
+                        {
+                        BIO_printf(bio_err,"unknown option %s\n",*argv);
+                        badops=1;
+                        break;
+                        }
+                argc--;
+                argv++;
+                }
+
+        if (badops)
+                {
+bad:
+                BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+                BIO_printf(bio_err,"where options  are\n");
+                EXIT(1);
+                }
+
+        if (key == NULL)
+                { BIO_printf(bio_err,"you need to specify a key\n"); EXIT(1); }
+        in=fopen(key,"r");
+        if (in == NULL) { perror(key); EXIT(1); }
+        rsa=PEM_read_RSAPrivateKey(in,NULL,NULL);
+        if (rsa == NULL)
+                {
+                BIO_printf(bio_err,"unable to load Private Key\n");
+                ERR_print_errors(bio_err);
+                EXIT(1);
+                }
+        fclose(in);
+
+        PEM_SignInit(&ctx,EVP_md5());
+        for (;;)
+                {
+                i=fread(buf,1,1024*10,stdin);
+                if (i <= 0) break;
+                PEM_SignUpdate(&ctx,buf,i);
+                }
+        if (!PEM_SignFinal(&ctx,buf,&n,rsa)) goto err;
+        BIO_printf(bio_err,"%s\n",buf);
+        EXIT(0);
+err:
+        ERR_print_errors(bio_err);
+        EXIT(1);
+        }
diff --git a/src/lib/libssl/src/apps/rmlinks b/src/lib/libssl/src/apps/rmlinks
new file mode 100644
index 0000000000..7c4f8983ba
--- /dev/null
+++ b/src/lib/libssl/src/apps/rmlinks
@@ -0,0 +1,6 @@
+#!/bin/sh
+for i in verify asn1parse req dgst dh enc gendh errstr ca crl rsa dsa dsaparam x509 genrsa s_server s_client speed s_time version pkcs7 crl2pkcs7 sess_id ciphers md2 md5 sha sha1 mdc2 base64 des des3 desx idea rc4 rc2 bf cast rc5 des-ecb des-ede des-ede3 des-cbc des-ede-cbc des-ede3-cbc des-cfb des-ede-cfb des-ede3-cfb des-ofb des-ede-ofb des-ede3-ofb idea-cbc idea-ecb idea-cfb idea-ofb rc2-cbc rc2-ecb rc2-cfb rc2-ofb bf-cbc bf-ecb bf-cfb bf-ofb cast5-cbc cast5-ecb cast5-cfb cast5-ofb cast-cbc rc5-cbc rc5-ecb rc5-cfb rc5-ofb 
+do
+echo removing $i
+/bin/rm -f $i
+done
diff --git a/src/lib/libssl/src/apps/ssleay.c b/src/lib/libssl/src/apps/ssleay.c
new file mode 100644
index 0000000000..eac411b854
--- /dev/null
+++ b/src/lib/libssl/src/apps/ssleay.c
@@ -0,0 +1,342 @@
+/* apps/ssleay.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 DEBUG
+#undef DEBUG
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "bio.h"
+#include "crypto.h"
+#include "lhash.h"
+#include "conf.h"
+#include "x509.h"
+#include "pem.h"
+#include "ssl.h"
+#define SSLEAY  /* turn off a few special case MONOLITH macros */
+#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#define SSLEAY_SRC
+#include "apps.h"
+#include "s_apps.h"
+#include "err.h"
+
+/*
+#ifdef WINDOWS
+#include "bss_file.c"
+#endif
+*/
+
+#ifndef NOPROTO
+static unsigned long MS_CALLBACK hash(FUNCTION *a);
+static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);
+static LHASH *prog_init(void );
+static int do_cmd(LHASH *prog,int argc,char *argv[]);
+#else
+static unsigned long MS_CALLBACK hash();
+static int MS_CALLBACK cmp();
+static LHASH *prog_init();
+static int do_cmd();
+#endif
+
+LHASH *config=NULL;
+char *default_config_file=NULL;
+
+#ifdef DEBUG
+static void sig_stop(i)
+int i;
+        {
+        char *a=NULL;
+
+        *a='\0';
+        }
+#endif
+
+/* Make sure there is only one when MONOLITH is defined */
+#ifdef MONOLITH
+BIO *bio_err=NULL;
+#endif
+
+int main(Argc,Argv)
+int Argc;
+char *Argv[];
+        {
+        ARGS arg;
+#define PROG_NAME_SIZE  16
+        char pname[PROG_NAME_SIZE];
+        FUNCTION f,*fp;
+        MS_STATIC char *prompt,buf[1024],config_name[256];
+        int n,i,ret=0;
+        int argc;
+        char **argv,*p;
+        LHASH *prog=NULL;
+        long errline;
+ 
+        arg.data=NULL;
+        arg.count=0;
+
+        /* SSLeay_add_ssl_algorithms(); is called in apps_startup() */
+        apps_startup();
+
+#if defined(DEBUG) && !defined(WINDOWS) && !defined(MSDOS)
+#ifdef SIGBUS
+        signal(SIGBUS,sig_stop);
+#endif
+#ifdef SIGSEGV
+        signal(SIGSEGV,sig_stop);
+#endif
+#endif
+
+        if (bio_err == NULL)
+                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+
+        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+        ERR_load_crypto_strings();
+
+        /* Lets load up our environment a little */
+        p=getenv("SSLEAY_CONF");
+        if (p == NULL)
+                {
+                strcpy(config_name,X509_get_default_cert_area());
+                strcat(config_name,"/lib/");
+                strcat(config_name,SSLEAY_CONF);
+                p=config_name;
+                }
+
+        default_config_file=p;
+
+        config=CONF_load(config,p,&errline);
+        if (config == NULL) ERR_clear_error();
+
+        prog=prog_init();
+
+        /* first check the program name */
+        program_name(Argv[0],pname,PROG_NAME_SIZE);
+
+        f.name=pname;
+        fp=(FUNCTION *)lh_retrieve(prog,(char *)&f);
+        if (fp != NULL)
+                {
+                Argv[0]=pname;
+                ret=fp->func(Argc,Argv);
+                goto end;
+                }
+
+        /* ok, now check that there are not arguments, if there are,
+         * run with them, shifting the ssleay off the front */
+        if (Argc != 1)
+                {
+                Argc--;
+                Argv++;
+                ret=do_cmd(prog,Argc,Argv);
+                if (ret < 0) ret=0;
+                goto end;
+                }
+
+        /* ok, lets enter the old 'SSLeay>' mode */
+        
+        for (;;)
+                {
+                ret=0;
+                p=buf;
+                n=1024;
+                i=0;
+                for (;;)
+                        {
+                        p[0]='\0';
+                        if (i++)
+                                prompt=">";
+                        else    prompt="SSLeay>";
+                        fputs(prompt,stdout);
+                        fflush(stdout);
+                        fgets(p,n,stdin);
+                        if (p[0] == '\0') goto end;
+                        i=strlen(p);
+                        if (i <= 1) break;
+                        if (p[i-2] != '\\') break;
+                        i-=2;
+                        p+=i;
+                        n-=i;
+                        }
+                if (!chopup_args(&arg,buf,&argc,&argv)) break;
+
+                ret=do_cmd(prog,argc,argv);
+                if (ret < 0)
+                        {
+                        ret=0;
+                        goto end;
+                        }
+                if (ret != 0)
+                        BIO_printf(bio_err,"error in %s\n",argv[0]);
+                BIO_flush(bio_err);
+                }
+        BIO_printf(bio_err,"bad exit\n");
+        ret=1;
+end:
+        if (config != NULL)
+                {
+                CONF_free(config);
+                config=NULL;
+                }
+        if (prog != NULL) lh_free(prog);
+        if (arg.data != NULL) Free(arg.data);
+        ERR_remove_state(0);
+
+        EVP_cleanup();
+
+        CRYPTO_mem_leaks(bio_err);
+        if (bio_err != NULL)
+                {
+                BIO_free(bio_err);
+                bio_err=NULL;
+                }
+        EXIT(ret);
+        }
+
+static int do_cmd(prog,argc,argv)
+LHASH *prog;
+int argc;
+char *argv[];
+        {
+        FUNCTION f,*fp;
+        int i,ret=1,tp,nl;
+
+        if ((argc <= 0) || (argv[0] == NULL))
+                { ret=0; goto end; }
+        f.name=argv[0];
+        fp=(FUNCTION *)lh_retrieve(prog,(char *)&f);
+        if (fp != NULL)
+                {
+                ret=fp->func(argc,argv);
+                }
+        else if ((strcmp(argv[0],"quit") == 0) ||
+                (strcmp(argv[0],"q") == 0) ||
+                (strcmp(argv[0],"exit") == 0) ||
+                (strcmp(argv[0],"bye") == 0))
+                {
+                ret= -1;
+                goto end;
+                }
+        else
+                {
+                BIO_printf(bio_err,"'%s' is a bad command, valid commands are",
+                        argv[0]);
+                i=0;
+                fp=functions;
+                tp=0;
+                for (fp=functions; fp->name != NULL; fp++)
+                        {
+                        nl=0;
+                        if (((i++) % 5) == 0)
+                                {
+                                BIO_printf(bio_err,"\n");
+                                nl=1;
+                                }
+                        if (fp->type != tp)
+                                {
+                                tp=fp->type;
+                                if (!nl) BIO_printf(bio_err,"\n");
+                                if (tp == FUNC_TYPE_MD)
+                                        {
+                                        i=1;
+                                        BIO_printf(bio_err,
+                                                "Message Digest commands - see the dgst command for more details\n");
+                                        }
+                                else if (tp == FUNC_TYPE_CIPHER)
+                                        {
+                                        i=1;
+                                        BIO_printf(bio_err,"Cipher commands - see the enc command for more details\n");
+                                        }
+                                }
+                        BIO_printf(bio_err,"%-15s",fp->name);
+                        }
+                BIO_printf(bio_err,"\nquit\n");
+                ret=0;
+                }
+end:
+        return(ret);
+        }
+
+static LHASH *prog_init()
+        {
+        LHASH *ret;
+        FUNCTION *f;
+
+        if ((ret=lh_new(hash,cmp)) == NULL) return(NULL);
+
+        for (f=functions; f->name != NULL; f++)
+                lh_insert(ret,(char *)f);
+        return(ret);
+        }
+
+static int MS_CALLBACK cmp(a,b)
+FUNCTION *a,*b;
+        {
+        return(strncmp(a->name,b->name,8));
+        }
+
+static unsigned long MS_CALLBACK hash(a)
+FUNCTION *a;
+        {
+        return(lh_strhash(a->name));
+        }
+
+#undef SSLEAY
diff --git a/src/lib/libssl/src/apps/ssleay.cnf b/src/lib/libssl/src/apps/ssleay.cnf
new file mode 100644
index 0000000000..0b3bfa64f8
--- /dev/null
+++ b/src/lib/libssl/src/apps/ssleay.cnf
@@ -0,0 +1,116 @@
+#
+# SSLeay example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+RANDFILE                = $ENV::HOME/.rnd
+
+####################################################################
+[ ca ]
+default_ca      = CA_default            # The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir             = ./demoCA              # Where everything is kept
+certs           = $dir/certs            # Where the issued certs are kept
+crl_dir         = $dir/crl              # Where the issued crl are kept
+database        = $dir/index.txt        # database index file.
+new_certs_dir   = $dir/newcerts         # default place for new certs.
+
+certificate     = $dir/cacert.pem       # The CA certificate
+serial          = $dir/serial           # The current serial number
+crl             = $dir/crl.pem          # The current CRL
+private_key     = $dir/private/cakey.pem# The private key
+RANDFILE        = $dir/private/.rand    # private random number file
+
+x509_extensions = x509v3_extensions     # The extentions to add to the cert
+default_days    = 365                   # how long to certify for
+default_crl_days= 30                    # how long before next CRL
+default_md      = md5                   # which md to use.
+preserve        = no                    # keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy          = policy_match
+
+# For the CA policy
+[ policy_match ]
+countryName             = match
+stateOrProvinceName     = match
+organizationName        = match
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName             = optional
+stateOrProvinceName     = optional
+localityName            = optional
+organizationName        = optional
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+####################################################################
+[ req ]
+default_bits            = 1024
+default_keyfile         = privkey.pem
+distinguished_name      = req_distinguished_name
+attributes              = req_attributes
+
+[ req_distinguished_name ]
+countryName                     = Country Name (2 letter code)
+countryName_default             = AU
+countryName_min                 = 2
+countryName_max                 = 2
+
+stateOrProvinceName             = State or Province Name (full name)
+stateOrProvinceName_default     = Some-State
+
+localityName                    = Locality Name (eg, city)
+
+0.organizationName              = Organization Name (eg, company)
+0.organizationName_default      = Internet Widgits Pty Ltd
+
+# we can do this but it is not needed normally :-)
+#1.organizationName             = Second Organization Name (eg, company)
+#1.organizationName_default     = CryptSoft Pty Ltd
+
+organizationalUnitName          = Organizational Unit Name (eg, section)
+#organizationalUnitName_default =
+
+commonName                      = Common Name (eg, YOUR name)
+commonName_max                  = 64
+
+emailAddress                    = Email Address
+emailAddress_max                = 40
+
+[ req_attributes ]
+challengePassword               = A challenge password
+challengePassword_min           = 4
+challengePassword_max           = 20
+
+unstructuredName                = An optional company name
+
+[ x509v3_extensions ]
+
+nsCaRevocationUrl               = http://www.cryptsoft.com/ca-crl.pem
+nsComment                       = "This is a comment"
+
+# under ASN.1, the 0 bit would be encoded as 80
+nsCertType                      = 0x40
+
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+#nsCertSequence
+#nsCertExt
+#nsDataType
+
diff --git a/src/lib/libssl/src/apps/tkca b/src/lib/libssl/src/apps/tkca
new file mode 100644
index 0000000000..bdaf21606a
--- /dev/null
+++ b/src/lib/libssl/src/apps/tkca
@@ -0,0 +1,66 @@
+#!/usr/local/bin/perl5
+#
+# This is only something I'm playing with, it does not work :-)
+#
+
+use Tk;
+
+my $main=MainWindow->new();
+my $f=$main->Frame(-relief => "ridge", -borderwidth => 2);
+$f->pack(-fill => 'x');
+
+my $ff=$f->Frame;
+$ff->pack(-fill => 'x');
+my $l=$ff->Label(-text => "TkCA - SSLeay",
+        -relief => "ridge", -borderwidth => 2);
+$l->pack(-fill => 'x', -ipady => 5);
+
+my $l=$ff->Button(-text => "Certify");
+$l->pack(-fill => 'x', -ipady => 5);
+
+my $l=$ff->Button(-text => "Review");
+$l->pack(-fill => 'x', -ipady => 5);
+
+my $l=$ff->Button(-text => "Revoke");
+$l->pack(-fill => 'x', -ipady => 5);
+
+my $l=$ff->Button(-text => "Generate CRL");
+$l->pack(-fill => 'x', -ipady => 5);
+
+my($db)=&load_db("demoCA/index.txt");
+
+MainLoop;
+
+sub load_db
+        {
+        my(%ret);
+        my($file)=@_;
+        my(*IN);
+        my(%db_serial,%db_name,@f,@db_s);
+
+        $ret{'serial'}=\%db_serial;
+        $ret{'name'}=\%db_name;
+
+        open(IN,"<$file") || die "unable to open $file:$!\n";
+        while (<IN>)
+                {
+                chop;
+                s/([^\\])\t/\1\t\t/g;
+                my(@f)=split(/\t\t/);
+                die "wrong number of fields in $file, line $.\n"
+                        if ($#f != 5);
+
+                my(%f);
+                $f{'type'}=$f[0];
+                $f{'exp'}=$f[1];
+                $f{'rev'}=$f[2];
+                $f{'serial'}=$f[3];
+                $f{'file'}=$f[4];
+                $f{'name'}=$f[5];
+                die "serial number $f{'serial'} appears twice (line $.)\n"
+                        if (defined($db{$f{'serial'}}))
+                $db_serial{$f{'serial'}}=\%f;
+                $db_name{$f{'name'}}.=$f{'serial'}." ";
+                }
+        return \%ret;
+        }
diff --git a/src/lib/libssl/src/certs/ICE-CA.pem b/src/lib/libssl/src/certs/ICE-CA.pem
new file mode 100644
index 0000000000..75652366c2
--- /dev/null
+++ b/src/lib/libssl/src/certs/ICE-CA.pem
@@ -0,0 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: O=European ICE-TEL project, OU=V3-Certification Authority
+        Validity
+            Not Before: Apr  2 17:35:53 1997 GMT
+            Not After : Apr  2 17:35:53 1998 GMT
+        Subject: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt
+        Subject Public Key Info:
+            Public Key Algorithm: rsa
+            RSA Public Key: (512 bit)
+                Modulus (512 bit):
+                    00:82:75:ba:f6:d1:60:b5:f9:15:b3:6a:dd:29:8f:
+                    8b:a4:6f:1a:88:e0:50:43:40:0b:79:41:d5:d3:16:
+                    44:7d:74:65:17:42:06:52:0b:e9:50:c8:10:cd:24:
+                    e2:ae:8d:22:30:73:e6:b4:b7:93:1f:e5:6e:a2:ae:
+                    49:11:a5:c9:45
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Authority Key Identifier: 
+                0.........z.."p......e..
+            X509v3 Subject Key Identifier: 
+                ..~r..:..B.44fu......3
+            X509v3 Key Usage: critical
+                ....
+            X509v3 Certificate Policies: critical
+                0.0...*...
+            X509v3 Subject Alternative Name: 
+                0!..secude-support@darmstadt.gmd.de
+            X509v3 Issuer Alternative Name: 
+                0I..ice-tel-ca@darmstadt.gmd.de.*http://www.darmstadt.gmd.de/ice-tel/euroca
+            X509v3 Basic Constraints: critical
+                0....
+            X509v3 CRL Distribution Points: 
+                0200...,.*http://www.darmstadt.gmd.de/ice-tel/euroca
+    Signature Algorithm: md5WithRSAEncryption
+        17:a2:88:b7:99:5a:05:41:e4:13:34:67:e6:1f:3e:26:ec:4b:
+        69:f9:3e:28:22:be:9d:1c:ab:41:6f:0c:00:85:fe:45:74:f6:
+        98:f0:ce:9b:65:53:4a:50:42:c7:d4:92:bd:d7:a2:a8:3d:98:
+        88:73:cd:60:28:79:a3:fc:48:7a
+-----BEGIN CERTIFICATE-----
+MIICzDCCAnagAwIBAgIBATANBgkqhkiG9w0BAQQFADBIMSEwHwYDVQQKExhFdXJv
+cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MB4XDTk3MDQwMjE3MzU1M1oXDTk4MDQwMjE3MzU1M1owXDEhMB8G
+A1UEChMYRXVyb3BlYW4gSUNFLVRFTCBwcm9qZWN0MSMwIQYDVQQLExpWMy1DZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTESMBAGA1UEBxMJRGFybXN0YWR0MFkwCgYEVQgB
+AQICAgADSwAwSAJBAIJ1uvbRYLX5FbNq3SmPi6RvGojgUENAC3lB1dMWRH10ZRdC
+BlIL6VDIEM0k4q6NIjBz5rS3kx/lbqKuSRGlyUUCAwEAAaOCATgwggE0MB8GA1Ud
+IwQYMBaAFIr3yNUOx3ro1yJw4AuJ1bbsZbzPMB0GA1UdDgQWBBR+cvL4OoacQog0
+NGZ1w9T80aIRMzAOBgNVHQ8BAf8EBAMCAfYwFAYDVR0gAQH/BAowCDAGBgQqAwQF
+MCoGA1UdEQQjMCGBH3NlY3VkZS1zdXBwb3J0QGRhcm1zdGFkdC5nbWQuZGUwUgYD
+VR0SBEswSYEbaWNlLXRlbC1jYUBkYXJtc3RhZHQuZ21kLmRlhipodHRwOi8vd3d3
+LmRhcm1zdGFkdC5nbWQuZGUvaWNlLXRlbC9ldXJvY2EwDwYDVR0TAQH/BAUwAwEB
+/zA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vd3d3LmRhcm1zdGFkdC5nbWQuZGUv
+aWNlLXRlbC9ldXJvY2EwDQYJKoZIhvcNAQEEBQADQQAXooi3mVoFQeQTNGfmHz4m
+7Etp+T4oIr6dHKtBbwwAhf5FdPaY8M6bZVNKUELH1JK916KoPZiIc81gKHmj/Eh6
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/ICE-root.pem b/src/lib/libssl/src/certs/ICE-root.pem
new file mode 100644
index 0000000000..fa991599c9
--- /dev/null
+++ b/src/lib/libssl/src/certs/ICE-root.pem
@@ -0,0 +1,48 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: O=European ICE-TEL project, OU=V3-Certification Authority
+        Validity
+            Not Before: Apr  2 17:33:36 1997 GMT
+            Not After : Apr  2 17:33:36 1998 GMT
+        Subject: O=European ICE-TEL project, OU=V3-Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsa
+            RSA Public Key: (512 bit)
+                Modulus (512 bit):
+                    00:80:3e:eb:ae:47:a9:fe:10:54:0b:81:8b:9c:2b:
+                    82:ab:3a:61:36:65:8b:f3:73:9f:ac:ac:7a:15:a7:
+                    13:8f:b4:c4:ba:a3:0f:bc:a5:58:8d:cc:b1:93:31:
+                    9e:81:9e:8c:19:61:86:fa:52:73:54:d1:97:76:22:
+                    e7:c7:9f:41:cd
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                ........z.."p......e..
+            X509v3 Key Usage: critical
+                ....
+            X509v3 Subject Alternative Name: 
+                0I.*http://www.darmstadt.gmd.de/ice-tel/euroca..ice-tel-ca@darmstadt.gmd.de
+            X509v3 Basic Constraints: critical
+                0....
+    Signature Algorithm: md5WithRSAEncryption
+        76:69:61:db:b7:cf:8b:06:9e:d8:8c:96:53:d2:4d:a8:23:a6:
+        03:44:e8:8f:24:a5:c0:84:a8:4b:77:d4:2d:2b:7d:37:91:67:
+        f2:2c:ce:02:31:4c:6b:cc:ce:f2:68:a6:11:11:ab:7d:88:b8:
+        7e:22:9f:25:06:60:bd:79:30:3d
+-----BEGIN CERTIFICATE-----
+MIICFjCCAcCgAwIBAgIBADANBgkqhkiG9w0BAQQFADBIMSEwHwYDVQQKExhFdXJv
+cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MB4XDTk3MDQwMjE3MzMzNloXDTk4MDQwMjE3MzMzNlowSDEhMB8G
+A1UEChMYRXVyb3BlYW4gSUNFLVRFTCBwcm9qZWN0MSMwIQYDVQQLExpWMy1DZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTBZMAoGBFUIAQECAgIAA0sAMEgCQQCAPuuuR6n+
+EFQLgYucK4KrOmE2ZYvzc5+srHoVpxOPtMS6ow+8pViNzLGTMZ6BnowZYYb6UnNU
+0Zd2IufHn0HNAgMBAAGjgZcwgZQwHQYDVR0OBBYEFIr3yNUOx3ro1yJw4AuJ1bbs
+ZbzPMA4GA1UdDwEB/wQEAwIB9jBSBgNVHREESzBJhipodHRwOi8vd3d3LmRhcm1z
+dGFkdC5nbWQuZGUvaWNlLXRlbC9ldXJvY2GBG2ljZS10ZWwtY2FAZGFybXN0YWR0
+LmdtZC5kZTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA0EAdmlh27fP
+iwae2IyWU9JNqCOmA0TojySlwISoS3fULSt9N5Fn8izOAjFMa8zO8mimERGrfYi4
+fiKfJQZgvXkwPQ==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/ICE-user.pem b/src/lib/libssl/src/certs/ICE-user.pem
new file mode 100644
index 0000000000..28065fd37d
--- /dev/null
+++ b/src/lib/libssl/src/certs/ICE-user.pem
@@ -0,0 +1,63 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt
+        Validity
+            Not Before: Apr  2 17:35:59 1997 GMT
+            Not After : Apr  2 17:35:59 1998 GMT
+        Subject: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt, CN=USER
+        Subject Public Key Info:
+            Public Key Algorithm: rsa
+            RSA Public Key: (512 bit)
+                Modulus (512 bit):
+                    00:a8:a8:53:63:49:1b:93:c3:c3:0b:6c:88:11:55:
+                    de:7e:6a:e2:f9:52:a0:dc:69:25:c4:c8:bf:55:e1:
+                    31:a8:ce:e4:a9:29:85:99:8a:15:9a:de:f6:2f:e1:
+                    b4:50:5f:5e:04:75:a6:f4:76:dc:3c:0e:39:dc:3a:
+                    be:3e:a4:61:8b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Authority Key Identifier: 
+                0...~r..:..B.44fu......3
+            X509v3 Subject Key Identifier: 
+                ...... .*...1.*.......
+            X509v3 Key Usage: critical
+                ....
+            X509v3 Certificate Policies: critical
+                0.0...*...0.......
+            X509v3 Subject Alternative Name: 
+                0:..user@darmstadt.gmd.de.!http://www.darmstadt.gmd.de/~user
+            X509v3 Issuer Alternative Name: 
+                0....gmdca@gmd.de..http://www.gmd.de..saturn.darmstadt.gmd.de.\1!0...U.
+..European ICE-TEL project1#0!..U....V3-Certification Authority1.0...U....Darmstadt..141.12.62.26
+            X509v3 Basic Constraints: critical
+                0.
+            X509v3 CRL Distribution Points: 
+                0.0.......gmdca@gmd.de
+    Signature Algorithm: md5WithRSAEncryption
+        69:0c:e1:b7:a7:f2:d8:fb:e8:69:c0:13:cd:37:ad:21:06:22:
+        4d:e8:c6:db:f1:04:0b:b7:e0:b3:d6:0c:81:03:ce:c3:6a:3e:
+        c7:e7:24:24:a4:92:64:c2:83:83:06:42:53:0e:6f:09:1e:84:
+        9a:f7:6f:63:9b:94:99:83:d6:a4
+-----BEGIN CERTIFICATE-----
+MIIDTzCCAvmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBcMSEwHwYDVQQKExhFdXJv
+cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MRIwEAYDVQQHEwlEYXJtc3RhZHQwHhcNOTcwNDAyMTczNTU5WhcN
+OTgwNDAyMTczNTU5WjBrMSEwHwYDVQQKExhFdXJvcGVhbiBJQ0UtVEVMIHByb2pl
+Y3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24gQXV0aG9yaXR5MRIwEAYDVQQH
+EwlEYXJtc3RhZHQxDTALBgNVBAMTBFVTRVIwWTAKBgRVCAEBAgICAANLADBIAkEA
+qKhTY0kbk8PDC2yIEVXefmri+VKg3GklxMi/VeExqM7kqSmFmYoVmt72L+G0UF9e
+BHWm9HbcPA453Dq+PqRhiwIDAQABo4IBmDCCAZQwHwYDVR0jBBgwFoAUfnLy+DqG
+nEKINDRmdcPU/NGiETMwHQYDVR0OBBYEFJfc4B8gjSoRmLUx4Sq/ucIYiMrPMA4G
+A1UdDwEB/wQEAwIB8DAcBgNVHSABAf8EEjAQMAYGBCoDBAUwBgYECQgHBjBDBgNV
+HREEPDA6gRV1c2VyQGRhcm1zdGFkdC5nbWQuZGWGIWh0dHA6Ly93d3cuZGFybXN0
+YWR0LmdtZC5kZS9+dXNlcjCBsQYDVR0SBIGpMIGmgQxnbWRjYUBnbWQuZGWGEWh0
+dHA6Ly93d3cuZ21kLmRlghdzYXR1cm4uZGFybXN0YWR0LmdtZC5kZaRcMSEwHwYD
+VQQKExhFdXJvcGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MRIwEAYDVQQHEwlEYXJtc3RhZHSHDDE0MS4xMi42
+Mi4yNjAMBgNVHRMBAf8EAjAAMB0GA1UdHwQWMBQwEqAQoA6BDGdtZGNhQGdtZC5k
+ZTANBgkqhkiG9w0BAQQFAANBAGkM4ben8tj76GnAE803rSEGIk3oxtvxBAu34LPW
+DIEDzsNqPsfnJCSkkmTCg4MGQlMObwkehJr3b2OblJmD1qQ=
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/ICE.crl b/src/lib/libssl/src/certs/ICE.crl
new file mode 100644
index 0000000000..21939e8cc4
--- /dev/null
+++ b/src/lib/libssl/src/certs/ICE.crl
@@ -0,0 +1,9 @@
+-----BEGIN X509 CRL-----
+MIIBNDCBnjANBgkqhkiG9w0BAQIFADBFMSEwHwYDVQQKExhFdXJvcGVhbiBJQ0Ut
+VEVMIFByb2plY3QxIDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05
+NzA2MDkxNDQyNDNaFw05NzA3MDkxNDQyNDNaMCgwEgIBChcNOTcwMzAzMTQ0MjU0
+WjASAgEJFw05NjEwMDIxMjI5MjdaMA0GCSqGSIb3DQEBAgUAA4GBAH4vgWo2Tej/
+i7kbiw4Imd30If91iosjClNpBFwvwUDBclPEeMuYimHbLOk4H8Nofc0fw11+U/IO
+KSNouUDcqG7B64oY7c4SXKn+i1MWOb5OJiWeodX3TehHjBlyWzoNMWCnYA8XqFP1
+mOKp8Jla1BibEZf14+/HqCi2hnZUiEXh
+-----END X509 CRL-----
diff --git a/src/lib/libssl/src/certs/ca-cert.pem b/src/lib/libssl/src/certs/ca-cert.pem
new file mode 100644
index 0000000000..6dd974d70d
--- /dev/null
+++ b/src/lib/libssl/src/certs/ca-cert.pem
@@ -0,0 +1,31 @@
+issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
+subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
+-----BEGIN CERTIFICATE-----
+MIICJjCCAY8CAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
+BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
+VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTc0M1oXDTAxMDYw
+OTEzNTc0M1owWzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
+BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYDVQQDExJUZXN0IENBICgxMDI0
+IGJpdCkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKO7o8t116VP6cgybTsZ
+DCZhr95nYlZuya3aCi1IKoztqwWnjbmDFIriOqGFPrZQ+moMETC9D59iRW/dFXSv
+1F65ka/XY2hLh9exCCo7XuUcDs53Qp3bI3AmMqHjgzE8oO3ajyJAzJkTTOUecQU2
+mw/gI4tMM0LqWMQS7luTy4+xAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAM7achv3v
+hLQJcv/65eGEpBXM40ZDVoFQFFJWaY5p883HTqLB1x4FdzsXHH0QKBTcKpWwqyu4
+YDm3fb8oDugw72bCzfyZK/zVZPR/hVlqI/fvU109Qoc+7oPvIXWky71HfcK6ZBCA
+q30KIqGM/uoM60INq97qjDmCJapagcNBGQs=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCju6PLddelT+nIMm07GQwmYa/eZ2JWbsmt2gotSCqM7asFp425
+gxSK4jqhhT62UPpqDBEwvQ+fYkVv3RV0r9ReuZGv12NoS4fXsQgqO17lHA7Od0Kd
+2yNwJjKh44MxPKDt2o8iQMyZE0zlHnEFNpsP4COLTDNC6ljEEu5bk8uPsQIDAQAB
+AoGAVZmpFZsDZfr0l2S9tLLwpjRWNOlKATQkno6q2WesT0eGLQufTciY+c8ypfU6
+hyio8r5iUl/VhhdjhAtKx1mRpiotftHo/eYf8rtsrnprOnWG0bWjLjtIoMbcxGn2
+J3bN6LJmbJMjDs0eJ3KnTu646F3nDUw2oGAwmpzKXA1KAP0CQQDRvQhxk2D3Pehs
+HvG665u2pB5ipYQngEFlZO7RHJZzJOZEWSLuuMqaF/7pTfA5jiBvWqCgJeCRRInL
+21ru4dlPAkEAx9jj7BgKn5TYnMoBSSe0afjsV9oApVpN1Nacb1YDtCwy+scp3++s
+nFxlv98wxIlSdpwMUn+AUWfjiWR7Tu/G/wJBAJ/KjwZIrFVxewP0x2ILYsTRYLzz
+MS4PDsO7FB+I0i7DbBOifXS2oNSpd3I0CNMwrxFnUHzynpbOStVfN3ZL5w0CQQCa
+pwFahxBRhkJKsxhjoFJBX9yl75JoY4Wvm5Tbo9ih6UJaRx3kqfkN14L2BKYcsZgb
+KY9vmDOYy6iNfjDeWTfJAkBkfPUb8oTJ/nSP5zN6sqGxSY4krc4xLxpRmxoJ8HL2
+XfhqXkTzbU13RX9JJ/NZ8vQN9Vm2NhxRGJocQkmcdVtJ
+-----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/src/certs/dsa-ca.pem b/src/lib/libssl/src/certs/dsa-ca.pem
new file mode 100644
index 0000000000..9eb08f3ddd
--- /dev/null
+++ b/src/lib/libssl/src/certs/dsa-ca.pem
@@ -0,0 +1,43 @@
+-----BEGIN DSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,C5B6C7CC9E1FE2C0
+
+svCXBcBRhMuU22UXOfiKZA+thmz6KYXpt1Yg5Rd+TYQcQ1MdvNy0B0tkP1SxzDq0
+Xh1eMeTML9/9/0rKakgNXXXbpi5RB8t6BmwRSyej89F7nn1mtR3qzoyPRpp15SDl
+Tn67C+2v+HDF3MFk88hiNCYkNbcmi7TWvChsl8N1r7wdZwtIox56yXdgxw6ZIpa/
+par0oUCzN7fiavPgCWz1kfPNSaBQSdxwH7TZi5tMHAr0J3C7a7QRnZfE09R59Uqr
+zslrq+ndIw1BZAxoY0SlBu+iFOVaBVlwToC4AsHkv7j7l8ITtr7f42YbBa44D9TO
+uOhONmkk/v3Fso4RaOEzdKZC+hnmmzvHs6TiTWm6yzJgSFwyOUK0eGmKEeVxpcH5
+rUOlHOwzen+FFtocZDZAfdFnb7QY7L/boQvyA5A+ZbRG4DUpmBQeQsSaICHM5Rxx
+1QaLF413VNPXTLPbW0ilSc2H8x2iZTIVKfd33oSO6NhXPtSYQgfecEF4BvNHY5c4
+HovjT4mckbK95bcBzoCHu43vuSQkmZzdYo/ydSZt6zoPavbBLueTpgSbdXiDi827
+MVqOsYxGCb+kez0FoDSTgw==
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE REQUEST-----
+MIICUjCCAhECAQAwUjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAxMCQ0Ew
+ggG0MIIBKQYFKw4DAgwwggEeAoGBAKc/boW/QWopffCfRxkwkJoJHdpqMx7FPYaW
+sxXgUy6P4FmCc5A+dTGZR3pS+4Xk2aZ7OJtoioSbh8YetX6GS1NbWc9xZRmIbs5m
+rmuINvvsKNzC16W75Sw5JkvamnAYlTeVEFYj9hXtugRe3jlP/bdDH7WkZW/NgBHk
+cJVbUM1JAhUA9wcx7fpsBgPVhYocrJxl51BmZW8CgYBN30wDppGK9RlvUEYlmeVo
+bzDjaeHls12YuyiGSPzemQQ/X4gMnHMkDSBduSqaPxiWJ+Rih8F7dGJT/GEnqHqR
+CZ228U2cVA9YBu5JdAfOVX4jzhb2ytxaYQF+yXG1TfbcNCmHaPZeIJOz2/XkCWxB
+F5WS6wG1c6Vqftgy7Q4CuAOBhAACgYAapll6iqz9XrZFlk2GCVcB+KihxWnH7IuH
+vSLw9YUrJahcBHmbpvt494lF4gC5w3WPM+vXJofbusk4GoQEEsQNMDaah4m49uUq
+AylOVFJJJXuirVJ+o+0TtOFDITEAl+YZZariXOD7tdOSOl9RLMPC6+daHKS9e68u
+3enxhqnDGaAAMAkGBSsOAwIbBQADMAAwLQIVAJGVuFsG/0DBuSZ0jF7ypdU0/G0v
+AhQfeF5BoMMDbX/kidUVpQ6gadPlZA==
+-----END CERTIFICATE REQUEST-----
+-----BEGIN CERTIFICATE-----
+MIIBrjCCAWwCAQswCQYFKw4DAhsFADBTMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
+U29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQww
+CgYDVQQDEwNQQ0EwHhcNOTcwNjE1MDIxNDI5WhcNOTcwNzE1MDIxNDI5WjBSMQsw
+CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMQswCQYDVQQDEwJDQTCBkjAJBgUrDgMCDAUAA4GE
+AAKBgBqmWXqKrP1etkWWTYYJVwH4qKHFacfsi4e9IvD1hSslqFwEeZum+3j3iUXi
+ALnDdY8z69cmh9u6yTgahAQSxA0wNpqHibj25SoDKU5UUkkle6KtUn6j7RO04UMh
+MQCX5hllquJc4Pu105I6X1Esw8Lr51ocpL17ry7d6fGGqcMZMAkGBSsOAwIbBQAD
+MQAwLgIVAJ4wtQsANPxHo7Q4IQZYsL12SKdbAhUAjJ9n38zxT+iai2164xS+LIfa
+C1Q=
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/certs/dsa-pca.pem b/src/lib/libssl/src/certs/dsa-pca.pem
new file mode 100644
index 0000000000..e3641ad47e
--- /dev/null
+++ b/src/lib/libssl/src/certs/dsa-pca.pem
@@ -0,0 +1,49 @@
+-----BEGIN DSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,F80EEEBEEA7386C4
+
+GZ9zgFcHOlnhPoiSbVi/yXc9mGoj44A6IveD4UlpSEUt6Xbse3Fr0KHIUyQ3oGnS
+mClKoAp/eOTb5Frhto85SzdsxYtac+X1v5XwdzAMy2KowHVk1N8A5jmE2OlkNPNt
+of132MNlo2cyIRYaa35PPYBGNCmUm7YcYS8O90YtkrQZZTf4+2C4kllhMcdkQwkr
+FWSWC8YOQ7w0LHb4cX1FejHHom9Nd/0PN3vn3UyySvfOqoR7nbXkrpHXmPIr0hxX
+RcF0aXcV/CzZ1/nfXWQf4o3+oD0T22SDoVcZY60IzI0oIc3pNCbDV3uKNmgekrFd
+qOUJ+QW8oWp7oefRx62iBfIeC8DZunohMXaWAQCU0sLQOR4yEdeUCnzCSywe0bG1
+diD0KYaEe+Yub1BQH4aLsBgDjardgpJRTQLq0DUvw0/QGO1irKTJzegEDNVBKrVn
+V4AHOKT1CUKqvGNRP1UnccUDTF6miOAtaj/qpzra7sSk7dkGBvIEeFoAg84kfh9h
+hVvF1YyzC9bwZepruoqoUwke/WdNIR5ymOVZ/4Liw0JdIOcq+atbdRX08niqIRkf
+dsZrUj4leo3zdefYUQ7w4N2Ns37yDFq7
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE REQUEST-----
+MIICVTCCAhMCAQAwUzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEMMAoGA1UEAxMDUENB
+MIIBtTCCASkGBSsOAwIMMIIBHgKBgQCnP26Fv0FqKX3wn0cZMJCaCR3aajMexT2G
+lrMV4FMuj+BZgnOQPnUxmUd6UvuF5NmmezibaIqEm4fGHrV+hktTW1nPcWUZiG7O
+Zq5riDb77Cjcwtelu+UsOSZL2ppwGJU3lRBWI/YV7boEXt45T/23Qx+1pGVvzYAR
+5HCVW1DNSQIVAPcHMe36bAYD1YWKHKycZedQZmVvAoGATd9MA6aRivUZb1BGJZnl
+aG8w42nh5bNdmLsohkj83pkEP1+IDJxzJA0gXbkqmj8YlifkYofBe3RiU/xhJ6h6
+kQmdtvFNnFQPWAbuSXQHzlV+I84W9srcWmEBfslxtU323DQph2j2XiCTs9v15Als
+QReVkusBtXOlan7YMu0OArgDgYUAAoGBAKbtuR5AdW+ICjCFe2ixjUiJJzM2IKwe
+6NZEMXg39+HQ1UTPTmfLZLps+rZfolHDXuRKMXbGFdSF0nXYzotPCzi7GauwEJTZ
+yr27ZZjA1C6apGSQ9GzuwNvZ4rCXystVEagAS8OQ4H3D4dWS17Zg31ICb5o4E5r0
+z09o/Uz46u0VoAAwCQYFKw4DAhsFAAMxADAuAhUArRubTxsbIXy3AhtjQ943AbNB
+nSICFQCu+g1iW3jwF+gOcbroD4S/ZcvB3w==
+-----END CERTIFICATE REQUEST-----
+-----BEGIN CERTIFICATE-----
+MIIC0zCCApECAQAwCQYFKw4DAhsFADBTMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
+U29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQww
+CgYDVQQDEwNQQ0EwHhcNOTcwNjE0MjI1NDQ1WhcNOTcwNzE0MjI1NDQ1WjBTMQsw
+CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDEwNQQ0EwggG1MIIBKQYFKw4DAgww
+ggEeAoGBAKc/boW/QWopffCfRxkwkJoJHdpqMx7FPYaWsxXgUy6P4FmCc5A+dTGZ
+R3pS+4Xk2aZ7OJtoioSbh8YetX6GS1NbWc9xZRmIbs5mrmuINvvsKNzC16W75Sw5
+JkvamnAYlTeVEFYj9hXtugRe3jlP/bdDH7WkZW/NgBHkcJVbUM1JAhUA9wcx7fps
+BgPVhYocrJxl51BmZW8CgYBN30wDppGK9RlvUEYlmeVobzDjaeHls12YuyiGSPze
+mQQ/X4gMnHMkDSBduSqaPxiWJ+Rih8F7dGJT/GEnqHqRCZ228U2cVA9YBu5JdAfO
+VX4jzhb2ytxaYQF+yXG1TfbcNCmHaPZeIJOz2/XkCWxBF5WS6wG1c6Vqftgy7Q4C
+uAOBhQACgYEApu25HkB1b4gKMIV7aLGNSIknMzYgrB7o1kQxeDf34dDVRM9OZ8tk
+umz6tl+iUcNe5EoxdsYV1IXSddjOi08LOLsZq7AQlNnKvbtlmMDULpqkZJD0bO7A
+29nisJfKy1URqABLw5DgfcPh1ZLXtmDfUgJvmjgTmvTPT2j9TPjq7RUwCQYFKw4D
+AhsFAAMxADAuAhUAvtv6AkMolix1Jvy3UnVEIUqdCUICFQC+jq8P49mwrY9oJ24n
+5rKUjNBhSg==
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/certs/factory.pem b/src/lib/libssl/src/certs/factory.pem
new file mode 100644
index 0000000000..8e28b391b2
--- /dev/null
+++ b/src/lib/libssl/src/certs/factory.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICTTCCAbagAwIBAgIBADANBgkqhkiG9w0BAQQFADBMMQswCQYDVQQGEwJHQjEM
+MAoGA1UEChMDVUNMMRgwFgYDVQQLEw9JQ0UtVEVMIFByb2plY3QxFTATBgNVBAMT
+DFRydXN0RmFjdG9yeTAeFw05NzA0MjIxNDM5MTRaFw05ODA0MjIxNDM5MTRaMEwx
+CzAJBgNVBAYTAkdCMQwwCgYDVQQKEwNVQ0wxGDAWBgNVBAsTD0lDRS1URUwgUHJv
+amVjdDEVMBMGA1UEAxMMVHJ1c3RGYWN0b3J5MIGcMAoGBFUIAQECAgQAA4GNADCB
+iQKBgQCEieR8NcXkUW1f0G6aC6u0i8q/98JqS6RxK5YmHIGKCkuTWAUjzLfUa4dt
+U9igGCjTuxaDqlzEim+t/02pmiBZT9HaX++35MjQPUWmsChcYU5WyzGErXi+rQaw
+zlwS73zM8qiPj/97lXYycWhgL0VaiDSPxRXEUdWoaGruom4mNQIDAQABo0IwQDAd
+BgNVHQ4EFgQUHal1LZr7oVg5z6lYzrhTgZRCmcUwDgYDVR0PAQH/BAQDAgH2MA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAfaggfl6FZoioecjv0dq8
+/DXo/u11iMZvXn08gjX/zl2b4wtPbShOSY5FhkSm8GeySasz+/Nwb/uzfnIhokWi
+lfPZHtlCWtXbIy/TN51eJyq04ceDCQDWvLC2enVg9KB+GJ34b5c5VaPRzq8MBxsA
+S7ELuYGtmYgYm9NZOIr7yU0=
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/nortelCA.pem b/src/lib/libssl/src/certs/nortelCA.pem
new file mode 100644
index 0000000000..207f34ab3a
--- /dev/null
+++ b/src/lib/libssl/src/certs/nortelCA.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICajCCAdMCBDGA0QUwDQYJKoZIhvcNAQEEBQAwfTELMAkGA1UEBhMCQ2ExDzAN
+BgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmlsaXR5IEFjY2VwdGVkMR8w
+HQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRwwGgYDVQQDExNFbnRydXN0
+IERlbW8gV2ViIENBMB4XDTk2MDQyNjEzMzUwMVoXDTA2MDQyNjEzMzUwMVowfTEL
+MAkGA1UEBhMCQ2ExDzANBgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmls
+aXR5IEFjY2VwdGVkMR8wHQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRww
+GgYDVQQDExNFbnRydXN0IERlbW8gV2ViIENBMIGdMA0GCSqGSIb3DQEBAQUAA4GL
+ADCBhwKBgQCaroS7O1DA0hm4IefNYU1cx/nqOmzEnk291d1XqznDeF4wEgakbkCc
+zTKxK791yNpXG5RmngqH7cygDRTHZJ6mfCRn0wGC+AI00F2vYTGqPGRQL1N3lZT0
+YDKFC0SQeMMjFIZ1aeQigroFQnHo0VB3zWIMpNkka8PY9lxHZAmWwQIBAzANBgkq
+hkiG9w0BAQQFAAOBgQBAx0UMVA1s54lMQyXjMX5kj99FJN5itb8bK1Rk+cegPQPF
+cWO9SEWyEjjBjIkjjzAwBkaEszFsNGxemxtXvwjIm1xEUMTVlPEWTs2qnDvAUA9W
+YqhWbhH0toGT36236QAsqCZ76rbTRVSSX2BHyJwJMG2tCRv7kRJ//NIgxj3H4w==
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/certs/pca-cert.pem b/src/lib/libssl/src/certs/pca-cert.pem
new file mode 100644
index 0000000000..140e9a6b43
--- /dev/null
+++ b/src/lib/libssl/src/certs/pca-cert.pem
@@ -0,0 +1,31 @@
+issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
+subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
+-----BEGIN CERTIFICATE-----
+MIICJzCCAZACAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
+BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
+VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTczN1oXDTAxMDYw
+OTEzNTczN1owXDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
+BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYDVQQDExNUZXN0IFBDQSAoMTAy
+NCBiaXQpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdoWk/3+WcMlfjIrkg
+40ketmnQaEogQe1LLcuOJV6rKfUSAsPgwgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp
+22Jp85PmemiDzyUIStwk72qhp1imbANZvlmlCFKiQrjUyuDfu4TABmn+kkt3vR1Y
+BEOGt+IFye1UBVSATVdRJ2UVhwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABNA1u/S
+Cg/LJZWb7GliiKJsvuhxlE4E5JxQF2zMub/CSNbF97//tYSyj96sxeFQxZXbcjm9
+xt6mr/xNLA4szNQMJ4P+L7b5e/jC5DSqlwS+CUYJgaFs/SP+qJoCSu1bR3IM9XWO
+cRBpDmcBbYLkSyB92WURvsZ1LtjEcn+cdQVI
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCdoWk/3+WcMlfjIrkg40ketmnQaEogQe1LLcuOJV6rKfUSAsPg
+wgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp22Jp85PmemiDzyUIStwk72qhp1imbANZ
+vlmlCFKiQrjUyuDfu4TABmn+kkt3vR1YBEOGt+IFye1UBVSATVdRJ2UVhwIDAQAB
+AoGAba4fTtuap5l7/8ZsbE7Z1O32KJY4ZcOZukLOLUUhXxXduT+FTgGWujc0/rgc
+z9qYCLlNZHOouMYTgtSfYvuMuLZ11VIt0GYH+nRioLShE59Yy+zCRyC+gPigS1kz
+xvo14AsOIPYV14Tk/SsHyq6E0eTk7VzaIE197giiINUERPECQQDSKmtPTh/lRKw7
+HSZSM0I1mFWn/1zqrAbontRQY5w98QWIOe5qmzYyFbPXYT3d9BzlsMyhgiRNoBbD
+yvohSHXJAkEAwAHx6ezAZeWWzD5yXD36nyjpkVCw7Tk7TSmOceLJMWt1QcrCfqlS
+xA5jjpQ6Z8suU5DdtWAryM2sAir1WisYzwJAd6Zcx56jvAQ3xcPXsE6scBTVFzrj
+7FqZ6E+cclPzfLQ+QQsyOBE7bpI6e/FJppY26XGZXo3YGzV8IGXrt40oOQJALETG
+h86EFXo3qGOFbmsDy4pdP5nBERCu8X1xUCSfintiD4c2DInxgS5oGclnJeMcjTvL
+QjQoJCX3UJCi/OUO1QJBAKgcDHWjMvt+l1pjJBsSEZ0HX9AAIIVx0RQmbFGS+F2Q
+hhu5l77WnnZOQ9vvhV5u7NPCUF9nhU3jh60qWWO8mkc=
+-----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/src/certs/rsa-cca.pem b/src/lib/libssl/src/certs/rsa-cca.pem
new file mode 100644
index 0000000000..69f5c1c84c
--- /dev/null
+++ b/src/lib/libssl/src/certs/rsa-cca.pem
@@ -0,0 +1,19 @@
+subject=/C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
+issuer= /C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
+notBefore=941104185834Z
+notAfter =991103185834Z
+-----BEGIN X509 CERTIFICATE-----
+
+MIICIzCCAZACBQJBAAAWMA0GCSqGSIb3DQEBAgUAMFwxCzAJBgNVBAYTAlVTMSAw
+HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVy
+Y2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDQxODU4MzRaFw05
+OTExMDMxODU4MzRaMFwxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0YSBT
+ZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVyY2lhbCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCk+4Fie84QJ93o
+975sbsZwmdu41QUDaSiCnHJ/lj+O7Kwpkj+KFPhCdr69XQO5kNTQvAayUTNfxMK/
+touPmbZiImDd298ggrTKoi8tUO2UMt7gVY3UaOLgTNLNBRYulWZcYVI4HlGogqHE
+7yXpCuaLK44xZtn42f29O2nZ6wIDAQABMA0GCSqGSIb3DQEBAgUAA34AdrW2EP4j
+9/dZYkuwX5zBaLxJu7NJbyFHXSudVMQAKD+YufKKg5tgf+tQx6sFEC097TgCwaVI
+0v5loMC86qYjFmZsGySp8+x5NRhPJsjjr1BKx6cxa9B8GJ1Qv6km+iYrRpwUqbtb
+MJhCKLVLU7tDCZJAuqiqWqTGtotXTcU=
+-----END X509 CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/rsa-ssca.pem b/src/lib/libssl/src/certs/rsa-ssca.pem
new file mode 100644
index 0000000000..c9403212d1
--- /dev/null
+++ b/src/lib/libssl/src/certs/rsa-ssca.pem
@@ -0,0 +1,19 @@
+subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
+issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
+notBefore=941109235417Z
+notAfter =991231235417Z
+-----BEGIN X509 CERTIFICATE-----
+
+MIICKTCCAZYCBQJBAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw
+HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl
+IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDkyMzU0MTda
+Fw05OTEyMzEyMzU0MTdaMF8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0
+YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJlIFNlcnZlciBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCSznrB
+roM+WqqJg1esJQF2DK2ujiw3zus1eGRUA+WEQFHJv48I4oqCCNIWhjdV6bEhAq12
+aIGaBaJLyUslZiJWbIgHj/eBWW2EB2VwE3F2Ppt3TONQiVaYSLkdpykaEy5KEVmc
+HhXVSVQsczppgrGXOZxtcGdI5d0t1sgeewIDAQABMA0GCSqGSIb3DQEBAgUAA34A
+iNHReSHO4ovo+MF9NFM/YYPZtgs4F7boviGNjwC4i1N+RGceIr2XJ+CchcxK9oU7
+suK+ktPlDemvXA4MRpX/oRxePug2WHpzpgr4IhFrwwk4fia7c+8AvQKk8xQNMD9h
+cHsg/jKjn7P0Z1LctO6EjJY2IN6BCINxIYoPnqk=
+-----END X509 CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/timCA.pem b/src/lib/libssl/src/certs/timCA.pem
new file mode 100644
index 0000000000..9c8d5bf9c6
--- /dev/null
+++ b/src/lib/libssl/src/certs/timCA.pem
@@ -0,0 +1,16 @@
+Tims test GCI CA
+
+-----BEGIN CERTIFICATE-----
+MIIB8DCCAZoCAQAwDQYJKoZIhvcNAQEEBQAwgYIxCzAJBgNVBAYTAkFVMRMwEQYD
+VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
+cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2RldmVsb3BtZW50MRkwFwYDVQQDExBD
+cnlwdFNvZnQgRGV2IENBMB4XDTk3MDMyMjEzMzQwNFoXDTk4MDMyMjEzMzQwNFow
+gYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC
+cmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2Rl
+dmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQgRGV2IENBMFwwDQYJKoZIhvcN
+AQEBBQADSwAwSAJBAOAOAqogG5QwAmLhzyO4CoRnx/wVy4NZP4dxJy83O1EnL0rw
+OdsamJKvPOLHgSXo3gDu9uVyvCf/QJmZAmC5ml8CAwEAATANBgkqhkiG9w0BAQQF
+AANBADRRS/GVdd7rAqRW6SdmgLJduOU2yq3avBu99kRqbp9A/dLu6r6jU+eP4oOA
+TfdbFZtAAD2Hx9jUtY3tfdrJOb8= 
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/certs/tjhCA.pem b/src/lib/libssl/src/certs/tjhCA.pem
new file mode 100644
index 0000000000..67bee1b200
--- /dev/null
+++ b/src/lib/libssl/src/certs/tjhCA.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICVjCCAgACAQAwDQYJKoZIhvcNAQEEBQAwgbUxCzAJBgNVBAYTAkFVMRMwEQYD
+VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
+cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsTI1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9O
+IEFVVEhPUklUSUVTMTQwMgYDVQQDEytaRVJPIFZBTFVFIENBIC0gREVNT05TVFJB
+VElPTiBQVVJQT1NFUyBPTkxZMB4XDTk3MDQwMzEzMjI1NFoXDTk4MDQwMzEzMjI1
+NFowgbUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
+EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsT
+I1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9OIEFVVEhPUklUSUVTMTQwMgYDVQQDEyta
+RVJPIFZBTFVFIENBIC0gREVNT05TVFJBVElPTiBQVVJQT1NFUyBPTkxZMFwwDQYJ
+KoZIhvcNAQEBBQADSwAwSAJBAOZ7T7yqP/tyspcko3yPY1y0Cm2EmwNvzW4QgVXR
+Fjs3HmJ4xtSpXdo6mwcGezL3Abt/aQXaxv9PU8xt+Jr0OFUCAwEAATANBgkqhkiG
+9w0BAQQFAANBAOQpYmGgyCqCy1OljgJhCqQOu627oVlHzK1L+t9vBaMfn40AVUR4
+WzQVWO31KTgi5vTK1U+3h46fgUWqQ0h+6rU=
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/vsign2.pem b/src/lib/libssl/src/certs/vsign2.pem
new file mode 100644
index 0000000000..2386e149d0
--- /dev/null
+++ b/src/lib/libssl/src/certs/vsign2.pem
@@ -0,0 +1,31 @@
+ subject=/L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
+ issuer= /L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
+
+-----BEGIN CERTIFICATE-----
+MIIEkzCCA/ygAwIBAgIRANDTUpSRL3nTFeMrMayFSPAwDQYJKoZIhvcNAQECBQAw
+YjERMA8GA1UEBxMISW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQw
+MgYDVQQLEytWZXJpU2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3Jp
+YmVyMB4XDTk2MDYwNDAwMDAwMFoXDTk4MDYwNDIzNTk1OVowYjERMA8GA1UEBxMI
+SW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQwMgYDVQQLEytWZXJp
+U2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQC6A+2czKGRcYMfm8gdnk+0de99TDDzsqo0v5nb
+RsbUmMcdRQ7nsMbRWe0SAb/9QoLTZ/cJ0iOBqdrkz7UpqqKarVoTSdlSMVM92tWp
+3bJncZHQD1t4xd6lQVdI1/T6R+5J0T1ukOdsI9Jmf+F28S6g3R3L1SFwiHKeZKZv
+z+793wIDAQABo4ICRzCCAkMwggIpBgNVHQMBAf8EggIdMIICGTCCAhUwggIRBgtg
+hkgBhvhFAQcBATCCAgAWggGrVGhpcyBjZXJ0aWZpY2F0ZSBpbmNvcnBvcmF0ZXMg
+YnkgcmVmZXJlbmNlLCBhbmQgaXRzIHVzZSBpcyBzdHJpY3RseSBzdWJqZWN0IHRv
+LCB0aGUgVmVyaVNpZ24gQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQg
+KENQUyksIGF2YWlsYWJsZSBhdDogaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL0NQ
+Uy0xLjA7IGJ5IEUtbWFpbCBhdCBDUFMtcmVxdWVzdHNAdmVyaXNpZ24uY29tOyBv
+ciBieSBtYWlsIGF0IFZlcmlTaWduLCBJbmMuLCAyNTkzIENvYXN0IEF2ZS4sIE1v
+dW50YWluIFZpZXcsIENBIDk0MDQzIFVTQSBUZWwuICsxICg0MTUpIDk2MS04ODMw
+IENvcHlyaWdodCAoYykgMTk5NiBWZXJpU2lnbiwgSW5jLiAgQWxsIFJpZ2h0cyBS
+ZXNlcnZlZC4gQ0VSVEFJTiBXQVJSQU5USUVTIERJU0NMQUlNRUQgYW5kIExJQUJJ
+TElUWSBMSU1JVEVELqAOBgxghkgBhvhFAQcBAQGhDgYMYIZIAYb4RQEHAQECMC8w
+LRYraHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvQ1BTLTEuMDAU
+BglghkgBhvhCAQEBAf8EBAMCAgQwDQYJKoZIhvcNAQECBQADgYEApRJRkNBqLLgs
+53IR/d18ODdLOWMTZ+QOOxBrq460iBEdUwgF8vmPRX1ku7UiDeNzaLlurE6eFqHq
+2zPyK5j60zfTLVJMWKcQWwTJLjHtXrW8pxhNtFc6Fdvy5ZkHnC/9NIl7/t4U6WqB
+p4y+p7SdMIkEwIZfds0VbnQyX5MRUJY=
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/certs/vsign4.pem b/src/lib/libssl/src/certs/vsign4.pem
new file mode 100644
index 0000000000..b5bcef4d0d
--- /dev/null
+++ b/src/lib/libssl/src/certs/vsign4.pem
@@ -0,0 +1,16 @@
+ subject=/C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
+ issuer= /C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZoCBQKmAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
+Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
+biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0LJ1
+9njQrlpQ9OlQqZ+M1++RlHDo0iSQdomF1t+s5gEXMoDwnZNHvJplnR+Xrr/phnVj
+IIm9gFidBAydqMEk6QvlMXi9/C0MN2qeeIDpRnX57aP7E3vIwUzSo+/1PLBij0pd
+O92VZ48TucE81qcmm+zDO3rZTbxtm+gVAePwR6kCAwEAATANBgkqhkiG9w0BAQIF
+AAOBgQBT3dPwnCR+QKri/AAa19oM/DJhuBUNlvP6Vxt/M3yv6ZiaYch6s7f/sdyZ
+g9ysEvxwyR84Qu1E9oAuW2szaayc01znX1oYx7EteQSWQZGZQbE8DbqEOcY7l/Am
+yY7uvcxClf8exwI/VAx49byqYHwCaejcrOICdmHEPgPq0ook0Q==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/crypto/Makefile.ssl b/src/lib/libssl/src/crypto/Makefile.ssl
new file mode 100644
index 0000000000..efdbba38ac
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/Makefile.ssl b/src/lib/libssl/src/crypto/asn1/Makefile.ssl
new file mode 100644
index 0000000000..30751bd156
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/a_bmp.c b/src/lib/libssl/src/crypto/asn1/a_bmp.c
new file mode 100644
index 0000000000..774502b1fc
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/asn1.err b/src/lib/libssl/src/crypto/asn1/asn1.err
new file mode 100644
index 0000000000..c8b7011488
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/d2i_dhp.c b/src/lib/libssl/src/crypto/asn1/d2i_dhp.c
new file mode 100644
index 0000000000..616a308100
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/d2i_dsap.c b/src/lib/libssl/src/crypto/asn1/d2i_dsap.c
new file mode 100644
index 0000000000..2c8ac7bbcf
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/d2i_r_pr.c b/src/lib/libssl/src/crypto/asn1/d2i_r_pr.c
new file mode 100644
index 0000000000..0c53aa94bf
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/d2i_r_pu.c b/src/lib/libssl/src/crypto/asn1/d2i_r_pu.c
new file mode 100644
index 0000000000..778b792b1e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/d2i_s_pr.c b/src/lib/libssl/src/crypto/asn1/d2i_s_pr.c
new file mode 100644
index 0000000000..32ff8ba4b3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/d2i_s_pu.c b/src/lib/libssl/src/crypto/asn1/d2i_s_pu.c
new file mode 100644
index 0000000000..1002f41cd8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/f.c b/src/lib/libssl/src/crypto/asn1/f.c
new file mode 100644
index 0000000000..2ab3a262ac
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/i2d_dhp.c b/src/lib/libssl/src/crypto/asn1/i2d_dhp.c
new file mode 100644
index 0000000000..a454025ce3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/i2d_dsap.c b/src/lib/libssl/src/crypto/asn1/i2d_dsap.c
new file mode 100644
index 0000000000..94ecff1525
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/i2d_r_pr.c b/src/lib/libssl/src/crypto/asn1/i2d_r_pr.c
new file mode 100644
index 0000000000..aadbb92d8e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/i2d_r_pu.c b/src/lib/libssl/src/crypto/asn1/i2d_r_pu.c
new file mode 100644
index 0000000000..3c54f6709d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/i2d_s_pr.c b/src/lib/libssl/src/crypto/asn1/i2d_s_pr.c
new file mode 100644
index 0000000000..6e95305548
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/i2d_s_pu.c b/src/lib/libssl/src/crypto/asn1/i2d_s_pu.c
new file mode 100644
index 0000000000..5cf2877069
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_dgst.c b/src/lib/libssl/src/crypto/asn1/p7_dgst.c
new file mode 100644
index 0000000000..f71ed8eb1d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_enc.c b/src/lib/libssl/src/crypto/asn1/p7_enc.c
new file mode 100644
index 0000000000..874dd78389
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_enc_c.c b/src/lib/libssl/src/crypto/asn1/p7_enc_c.c
new file mode 100644
index 0000000000..2860d3e925
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_evp.c b/src/lib/libssl/src/crypto/asn1/p7_evp.c
new file mode 100644
index 0000000000..4db0a7fe62
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_i_s.c b/src/lib/libssl/src/crypto/asn1/p7_i_s.c
new file mode 100644
index 0000000000..9b00c556d9
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_lib.c b/src/lib/libssl/src/crypto/asn1/p7_lib.c
new file mode 100644
index 0000000000..2134e0974a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_recip.c b/src/lib/libssl/src/crypto/asn1/p7_recip.c
new file mode 100644
index 0000000000..f02233f5a8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_s_e.c b/src/lib/libssl/src/crypto/asn1/p7_s_e.c
new file mode 100644
index 0000000000..d344211456
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_signd.c b/src/lib/libssl/src/crypto/asn1/p7_signd.c
new file mode 100644
index 0000000000..40f9a44fa8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/p7_signi.c b/src/lib/libssl/src/crypto/asn1/p7_signi.c
new file mode 100644
index 0000000000..0da92169fc
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/pkcs8.c b/src/lib/libssl/src/crypto/asn1/pkcs8.c
new file mode 100644
index 0000000000..03fdadd51a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/x_cinf.c b/src/lib/libssl/src/crypto/asn1/x_cinf.c
new file mode 100644
index 0000000000..4fc2cc9f6e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bf/Makefile.ssl b/src/lib/libssl/src/crypto/bf/Makefile.ssl
new file mode 100644
index 0000000000..236671f238
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bf/Makefile.uni b/src/lib/libssl/src/crypto/bf/Makefile.uni
new file mode 100644
index 0000000000..9ba5b0c854
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bf/asm/b-win32.asm b/src/lib/libssl/src/crypto/bf/asm/b-win32.asm
new file mode 100644
index 0000000000..138c99d0aa
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bf/asm/bx86unix.cpp b/src/lib/libssl/src/crypto/bf/asm/bx86unix.cpp
new file mode 100644
index 0000000000..cdaa269378
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bf/bf_locl.org b/src/lib/libssl/src/crypto/bf/bf_locl.org
new file mode 100644
index 0000000000..a5663de8ca
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bio/Makefile.ssl b/src/lib/libssl/src/crypto/bio/Makefile.ssl
new file mode 100644
index 0000000000..42e11e1c94
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bio/bio.err b/src/lib/libssl/src/crypto/bio/bio.err
new file mode 100644
index 0000000000..6e2f2b63ca
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/Makefile.ssl b/src/lib/libssl/src/crypto/bn/Makefile.ssl
new file mode 100644
index 0000000000..9809d26cbc
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/asm/bn-win32.asm b/src/lib/libssl/src/crypto/bn/asm/bn-win32.asm
new file mode 100644
index 0000000000..017ea462b0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/asm/bn86unix.cpp b/src/lib/libssl/src/crypto/bn/asm/bn86unix.cpp
new file mode 100644
index 0000000000..64702201ea
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/asm/sparc.s b/src/lib/libssl/src/crypto/bn/asm/sparc.s
new file mode 100644
index 0000000000..f9e533caa8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/asm/x86w16.asm b/src/lib/libssl/src/crypto/bn/asm/x86w16.asm
new file mode 100644
index 0000000000..74a933a8cd
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/asm/x86w32.asm b/src/lib/libssl/src/crypto/bn/asm/x86w32.asm
new file mode 100644
index 0000000000..fc6f917714
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn.err b/src/lib/libssl/src/crypto/bn/bn.err
new file mode 100644
index 0000000000..7ccc247c41
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn.org b/src/lib/libssl/src/crypto/bn/bn.org
new file mode 100644
index 0000000000..66dde285d6
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_m.c b/src/lib/libssl/src/crypto/bn/bn_m.c
new file mode 100644
index 0000000000..5166daaeec
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_mulw.c b/src/lib/libssl/src/crypto/bn/bn_mulw.c
new file mode 100644
index 0000000000..abfc7e4d6c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_sub.c b/src/lib/libssl/src/crypto/bn/bn_sub.c
new file mode 100644
index 0000000000..bba80f8afb
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/buffer/Makefile.ssl b/src/lib/libssl/src/crypto/buffer/Makefile.ssl
new file mode 100644
index 0000000000..a5f150e523
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/buffer/buffer.err b/src/lib/libssl/src/crypto/buffer/buffer.err
new file mode 100644
index 0000000000..62b775e637
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cast/Makefile.ssl b/src/lib/libssl/src/crypto/cast/Makefile.ssl
new file mode 100644
index 0000000000..0143827ae5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cast/Makefile.uni b/src/lib/libssl/src/crypto/cast/Makefile.uni
new file mode 100644
index 0000000000..780073e75b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cast/asm/c-win32.asm b/src/lib/libssl/src/crypto/cast/asm/c-win32.asm
new file mode 100644
index 0000000000..a1d8a2671a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cast/asm/cx86unix.cpp b/src/lib/libssl/src/crypto/cast/asm/cx86unix.cpp
new file mode 100644
index 0000000000..035692a5af
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/conf/Makefile.ssl b/src/lib/libssl/src/crypto/conf/Makefile.ssl
new file mode 100644
index 0000000000..00e917aa44
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/conf/conf.c b/src/lib/libssl/src/crypto/conf/conf.c
new file mode 100644
index 0000000000..9e84300c5e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/conf/conf.err b/src/lib/libssl/src/crypto/conf/conf.err
new file mode 100644
index 0000000000..933d3d692a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/conf/conf_lcl.h b/src/lib/libssl/src/crypto/conf/conf_lcl.h
new file mode 100644
index 0000000000..4e5644ed79
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cryptall.h b/src/lib/libssl/src/crypto/cryptall.h
new file mode 100644
index 0000000000..65a46452a8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/crypto.c b/src/lib/libssl/src/crypto/crypto.c
new file mode 100644
index 0000000000..366e25c939
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/crypto.err b/src/lib/libssl/src/crypto/crypto.err
new file mode 100644
index 0000000000..4ea3385e73
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/date.h b/src/lib/libssl/src/crypto/date.h
new file mode 100644
index 0000000000..dbb71bd1b7
--- /dev/null
+++ b/src/lib/libssl/src/crypto/date.h
@@ -0,0 +1 @@
+#define DATE    "Sun Jul 12 21:04:32 MDT 1998"
diff --git a/src/lib/libssl/src/crypto/des/DES.pod b/src/lib/libssl/src/crypto/des/DES.pod
new file mode 100644
index 0000000000..8a739e7ca0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/FILES b/src/lib/libssl/src/crypto/des/FILES
new file mode 100644
index 0000000000..4c7ea2de7a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/MODES.DES b/src/lib/libssl/src/crypto/des/MODES.DES
new file mode 100644
index 0000000000..0cbc44f51d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/Makefile.PL b/src/lib/libssl/src/crypto/des/Makefile.PL
new file mode 100644
index 0000000000..b54a24387c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/Makefile.lit b/src/lib/libssl/src/crypto/des/Makefile.lit
new file mode 100644
index 0000000000..c09f6969da
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/Makefile.ssl b/src/lib/libssl/src/crypto/des/Makefile.ssl
new file mode 100644
index 0000000000..78b5189ee3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/Makefile.uni b/src/lib/libssl/src/crypto/des/Makefile.uni
new file mode 100644
index 0000000000..8f1759748a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/PC1 b/src/lib/libssl/src/crypto/des/PC1
new file mode 100644
index 0000000000..efb8348b72
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/PC2 b/src/lib/libssl/src/crypto/des/PC2
new file mode 100644
index 0000000000..2d560270ec
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/asm/d-win32.asm b/src/lib/libssl/src/crypto/des/asm/d-win32.asm
new file mode 100644
index 0000000000..9e3dc9cd87
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/asm/dx86unix.cpp b/src/lib/libssl/src/crypto/des/asm/dx86unix.cpp
new file mode 100644
index 0000000000..6fca9afa16
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/asm/y-win32.asm b/src/lib/libssl/src/crypto/des/asm/y-win32.asm
new file mode 100644
index 0000000000..af5c102422
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/asm/yx86unix.cpp b/src/lib/libssl/src/crypto/des/asm/yx86unix.cpp
new file mode 100644
index 0000000000..8719e38607
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/des.man b/src/lib/libssl/src/crypto/des/des.man
new file mode 100644
index 0000000000..7e06a1851a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/des.org b/src/lib/libssl/src/crypto/des/des.org
new file mode 100644
index 0000000000..a4cf5c8770
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/des.pl b/src/lib/libssl/src/crypto/des/des.pl
new file mode 100644
index 0000000000..935eacb504
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/des_crypt.man b/src/lib/libssl/src/crypto/des/des_crypt.man
new file mode 100644
index 0000000000..0ecc416877
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/des_locl.org b/src/lib/libssl/src/crypto/des/des_locl.org
new file mode 100644
index 0000000000..e2e503cbed
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/doIP b/src/lib/libssl/src/crypto/des/doIP
new file mode 100644
index 0000000000..18cf231303
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/doPC1 b/src/lib/libssl/src/crypto/des/doPC1
new file mode 100644
index 0000000000..096afd8c46
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/doPC2 b/src/lib/libssl/src/crypto/des/doPC2
new file mode 100644
index 0000000000..fa5cf74cf7
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/ede_enc.c b/src/lib/libssl/src/crypto/des/ede_enc.c
new file mode 100644
index 0000000000..9f75dd1037
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/podd.h b/src/lib/libssl/src/crypto/des/podd.h
new file mode 100644
index 0000000000..1b2bfe0843
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/ranlib.sh b/src/lib/libssl/src/crypto/des/ranlib.sh
new file mode 100644
index 0000000000..543f712c6b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/shifts.pl b/src/lib/libssl/src/crypto/des/shifts.pl
new file mode 100644
index 0000000000..d8a240c1ba
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/sk.h b/src/lib/libssl/src/crypto/des/sk.h
new file mode 100644
index 0000000000..f2ade88c7c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/supp.c b/src/lib/libssl/src/crypto/des/supp.c
new file mode 100644
index 0000000000..f8e5833f69
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/testdes.pl b/src/lib/libssl/src/crypto/des/testdes.pl
new file mode 100644
index 0000000000..67fbd47f36
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/vms.com b/src/lib/libssl/src/crypto/des/vms.com
new file mode 100644
index 0000000000..62ca1fbda4
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/dh/Makefile.ssl b/src/lib/libssl/src/crypto/dh/Makefile.ssl
new file mode 100644
index 0000000000..dfa7e4525d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/dh/dh.err b/src/lib/libssl/src/crypto/dh/dh.err
new file mode 100644
index 0000000000..a4fe746985
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/dsa/Makefile.ssl b/src/lib/libssl/src/crypto/dsa/Makefile.ssl
new file mode 100644
index 0000000000..2cc4ddb39e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/dsa/dsa.err b/src/lib/libssl/src/crypto/dsa/dsa.err
new file mode 100644
index 0000000000..1131e9fa74
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/err/Makefile.ssl b/src/lib/libssl/src/crypto/err/Makefile.ssl
new file mode 100644
index 0000000000..57c87eb041
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/err/err_code.pl b/src/lib/libssl/src/crypto/err/err_code.pl
new file mode 100644
index 0000000000..ebc8eef913
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/err/err_genc.pl b/src/lib/libssl/src/crypto/err/err_genc.pl
new file mode 100644
index 0000000000..a8e36c2f0c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/err/error.err b/src/lib/libssl/src/crypto/err/error.err
new file mode 100644
index 0000000000..f09557d8d9
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/err/ssleay.ec b/src/lib/libssl/src/crypto/err/ssleay.ec
new file mode 100644
index 0000000000..10b5dbb59d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/Makefile.ssl b/src/lib/libssl/src/crypto/evp/Makefile.ssl
new file mode 100644
index 0000000000..8bf2516458
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_3d.c b/src/lib/libssl/src/crypto/evp/e_cbc_3d.c
new file mode 100644
index 0000000000..5761bf186a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_bf.c b/src/lib/libssl/src/crypto/evp/e_cbc_bf.c
new file mode 100644
index 0000000000..be605f4a13
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_c.c b/src/lib/libssl/src/crypto/evp/e_cbc_c.c
new file mode 100644
index 0000000000..b50c7874b3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_d.c b/src/lib/libssl/src/crypto/evp/e_cbc_d.c
new file mode 100644
index 0000000000..c67706e3a0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_i.c b/src/lib/libssl/src/crypto/evp/e_cbc_i.c
new file mode 100644
index 0000000000..312ffcb721
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_r2.c b/src/lib/libssl/src/crypto/evp/e_cbc_r2.c
new file mode 100644
index 0000000000..4f8002f16d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cbc_r5.c b/src/lib/libssl/src/crypto/evp/e_cbc_r5.c
new file mode 100644
index 0000000000..f7d46ca91f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_3d.c b/src/lib/libssl/src/crypto/evp/e_cfb_3d.c
new file mode 100644
index 0000000000..e7e3419411
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_bf.c b/src/lib/libssl/src/crypto/evp/e_cfb_bf.c
new file mode 100644
index 0000000000..8aba2564b8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_c.c b/src/lib/libssl/src/crypto/evp/e_cfb_c.c
new file mode 100644
index 0000000000..936df55fd8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_d.c b/src/lib/libssl/src/crypto/evp/e_cfb_d.c
new file mode 100644
index 0000000000..9ae4558f51
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_i.c b/src/lib/libssl/src/crypto/evp/e_cfb_i.c
new file mode 100644
index 0000000000..9225efaa86
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_r2.c b/src/lib/libssl/src/crypto/evp/e_cfb_r2.c
new file mode 100644
index 0000000000..af5a39d1f4
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_cfb_r5.c b/src/lib/libssl/src/crypto/evp/e_cfb_r5.c
new file mode 100644
index 0000000000..a2fddaedc0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_3d.c b/src/lib/libssl/src/crypto/evp/e_ecb_3d.c
new file mode 100644
index 0000000000..908fc0760a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_bf.c b/src/lib/libssl/src/crypto/evp/e_ecb_bf.c
new file mode 100644
index 0000000000..142a9d3123
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_c.c b/src/lib/libssl/src/crypto/evp/e_ecb_c.c
new file mode 100644
index 0000000000..34e0c18296
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_d.c b/src/lib/libssl/src/crypto/evp/e_ecb_d.c
new file mode 100644
index 0000000000..7a409d6459
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_i.c b/src/lib/libssl/src/crypto/evp/e_ecb_i.c
new file mode 100644
index 0000000000..e24022a12c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_r2.c b/src/lib/libssl/src/crypto/evp/e_ecb_r2.c
new file mode 100644
index 0000000000..e35b06dc6d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ecb_r5.c b/src/lib/libssl/src/crypto/evp/e_ecb_r5.c
new file mode 100644
index 0000000000..08f4a82651
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_3d.c b/src/lib/libssl/src/crypto/evp/e_ofb_3d.c
new file mode 100644
index 0000000000..c3add18e93
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_bf.c b/src/lib/libssl/src/crypto/evp/e_ofb_bf.c
new file mode 100644
index 0000000000..492f9b9082
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_c.c b/src/lib/libssl/src/crypto/evp/e_ofb_c.c
new file mode 100644
index 0000000000..f1eef4469c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_d.c b/src/lib/libssl/src/crypto/evp/e_ofb_d.c
new file mode 100644
index 0000000000..09d4b4139d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_i.c b/src/lib/libssl/src/crypto/evp/e_ofb_i.c
new file mode 100644
index 0000000000..96c8afd9c8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_r2.c b/src/lib/libssl/src/crypto/evp/e_ofb_r2.c
new file mode 100644
index 0000000000..0f6d729988
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/e_ofb_r5.c b/src/lib/libssl/src/crypto/evp/e_ofb_r5.c
new file mode 100644
index 0000000000..db28d6c317
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/evp.err b/src/lib/libssl/src/crypto/evp/evp.err
new file mode 100644
index 0000000000..cfc17437bc
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/evp/pk_lib.c b/src/lib/libssl/src/crypto/evp/pk_lib.c
new file mode 100644
index 0000000000..08f9fabbae
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/hmac/Makefile.ssl b/src/lib/libssl/src/crypto/hmac/Makefile.ssl
new file mode 100644
index 0000000000..7a042b7261
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/idea/Makefile.ssl b/src/lib/libssl/src/crypto/idea/Makefile.ssl
new file mode 100644
index 0000000000..41b42ce03b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/lhash/Makefile.ssl b/src/lib/libssl/src/crypto/lhash/Makefile.ssl
new file mode 100644
index 0000000000..cb08547b4f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/libvms.com b/src/lib/libssl/src/crypto/libvms.com
new file mode 100644
index 0000000000..44f90c65b0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/md2/Makefile.ssl b/src/lib/libssl/src/crypto/md2/Makefile.ssl
new file mode 100644
index 0000000000..d8e7200c83
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/md2/md2.org b/src/lib/libssl/src/crypto/md2/md2.org
new file mode 100644
index 0000000000..9f39933790
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/md5/Makefile.ssl b/src/lib/libssl/src/crypto/md5/Makefile.ssl
new file mode 100644
index 0000000000..47e1ce05ca
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/md5/Makefile.uni b/src/lib/libssl/src/crypto/md5/Makefile.uni
new file mode 100644
index 0000000000..54685712db
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/md5/asm/m5-win32.asm b/src/lib/libssl/src/crypto/md5/asm/m5-win32.asm
new file mode 100644
index 0000000000..c2081da746
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/md5/asm/mx86unix.cpp b/src/lib/libssl/src/crypto/md5/asm/mx86unix.cpp
new file mode 100644
index 0000000000..5d399122b6
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/mdc2/Makefile.ssl b/src/lib/libssl/src/crypto/mdc2/Makefile.ssl
new file mode 100644
index 0000000000..495a2789a0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/objects/Makefile.ssl b/src/lib/libssl/src/crypto/objects/Makefile.ssl
new file mode 100644
index 0000000000..320523cea1
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/objects/objects.err b/src/lib/libssl/src/crypto/objects/objects.err
new file mode 100644
index 0000000000..8bec3eaea2
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pem/Makefile.ssl b/src/lib/libssl/src/crypto/pem/Makefile.ssl
new file mode 100644
index 0000000000..fc04a88fd9
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pem/ctx_size.c b/src/lib/libssl/src/crypto/pem/ctx_size.c
new file mode 100644
index 0000000000..87469bc4af
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pem/pem.err b/src/lib/libssl/src/crypto/pem/pem.err
new file mode 100644
index 0000000000..0e523abf82
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pem/pem.org b/src/lib/libssl/src/crypto/pem/pem.org
new file mode 100644
index 0000000000..38952509dd
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pkcs7/Makefile.ssl b/src/lib/libssl/src/crypto/pkcs7/Makefile.ssl
new file mode 100644
index 0000000000..a88359b320
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pkcs7/README b/src/lib/libssl/src/crypto/pkcs7/README
new file mode 100644
index 0000000000..27001c6970
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pkcs7/mf.p7 b/src/lib/libssl/src/crypto/pkcs7/mf.p7
new file mode 100644
index 0000000000..524335b4b3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pkcs7/p7.tst b/src/lib/libssl/src/crypto/pkcs7/p7.tst
new file mode 100644
index 0000000000..6d14dce163
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/pkcs7/pkcs7.err b/src/lib/libssl/src/crypto/pkcs7/pkcs7.err
new file mode 100644
index 0000000000..91413aae43
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rand/Makefile.ssl b/src/lib/libssl/src/crypto/rand/Makefile.ssl
new file mode 100644
index 0000000000..d04f0a9b43
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ranlib.sh b/src/lib/libssl/src/crypto/ranlib.sh
new file mode 100644
index 0000000000..543f712c6b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc2/Makefile.ssl b/src/lib/libssl/src/crypto/rc2/Makefile.ssl
new file mode 100644
index 0000000000..c5138f13e2
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc2/Makefile.uni b/src/lib/libssl/src/crypto/rc2/Makefile.uni
new file mode 100644
index 0000000000..e50b3f2d19
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc2/rc2.org b/src/lib/libssl/src/crypto/rc2/rc2.org
new file mode 100644
index 0000000000..37354cfa62
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc4/Makefile.ssl b/src/lib/libssl/src/crypto/rc4/Makefile.ssl
new file mode 100644
index 0000000000..19c1e980f3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc4/Makefile.uni b/src/lib/libssl/src/crypto/rc4/Makefile.uni
new file mode 100644
index 0000000000..79dc17b8d1
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc4/asm/r4-win32.asm b/src/lib/libssl/src/crypto/rc4/asm/r4-win32.asm
new file mode 100644
index 0000000000..70b0f7484c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc4/asm/rx86unix.cpp b/src/lib/libssl/src/crypto/rc4/asm/rx86unix.cpp
new file mode 100644
index 0000000000..ec1d72a110
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc4/rc4.org b/src/lib/libssl/src/crypto/rc4/rc4.org
new file mode 100644
index 0000000000..c558651af8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc4/rc4_locl.org b/src/lib/libssl/src/crypto/rc4/rc4_locl.org
new file mode 100644
index 0000000000..1ef4455fb7
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc5/Makefile.ssl b/src/lib/libssl/src/crypto/rc5/Makefile.ssl
new file mode 100644
index 0000000000..5e98ee2348
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc5/Makefile.uni b/src/lib/libssl/src/crypto/rc5/Makefile.uni
new file mode 100644
index 0000000000..e50b3f2d19
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc5/asm/r5-win32.asm b/src/lib/libssl/src/crypto/rc5/asm/r5-win32.asm
new file mode 100644
index 0000000000..f43d3711f0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc5/asm/r586unix.cpp b/src/lib/libssl/src/crypto/rc5/asm/r586unix.cpp
new file mode 100644
index 0000000000..a25dd5a9a4
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc5/asm/rc5-586.pl b/src/lib/libssl/src/crypto/rc5/asm/rc5-586.pl
new file mode 100644
index 0000000000..172bd9ee1b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ripemd/Makefile.ssl b/src/lib/libssl/src/crypto/ripemd/Makefile.ssl
new file mode 100644
index 0000000000..67d47ceb2c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ripemd/Makefile.uni b/src/lib/libssl/src/crypto/ripemd/Makefile.uni
new file mode 100644
index 0000000000..54685712db
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ripemd/asm/rm-win32.asm b/src/lib/libssl/src/crypto/ripemd/asm/rm-win32.asm
new file mode 100644
index 0000000000..bd38791c13
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ripemd/asm/rm86unix.cpp b/src/lib/libssl/src/crypto/ripemd/asm/rm86unix.cpp
new file mode 100644
index 0000000000..f90f6f2fd6
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rsa/Makefile.ssl b/src/lib/libssl/src/crypto/rsa/Makefile.ssl
new file mode 100644
index 0000000000..d52f2e609e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rsa/rsa.err b/src/lib/libssl/src/crypto/rsa/rsa.err
new file mode 100644
index 0000000000..5ded1b5fa2
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/sha/Makefile.ssl b/src/lib/libssl/src/crypto/sha/Makefile.ssl
new file mode 100644
index 0000000000..eeb545d140
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/sha/Makefile.uni b/src/lib/libssl/src/crypto/sha/Makefile.uni
new file mode 100644
index 0000000000..f3236755b2
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/sha/asm/s1-win32.asm b/src/lib/libssl/src/crypto/sha/asm/s1-win32.asm
new file mode 100644
index 0000000000..61335666b9
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/sha/asm/sx86unix.cpp b/src/lib/libssl/src/crypto/sha/asm/sx86unix.cpp
new file mode 100644
index 0000000000..8366664a39
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/sha/sha_sgst.c b/src/lib/libssl/src/crypto/sha/sha_sgst.c
new file mode 100644
index 0000000000..8a16801328
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/stack/Makefile.ssl b/src/lib/libssl/src/crypto/stack/Makefile.ssl
new file mode 100644
index 0000000000..0d232c08cf
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/txt_db/Makefile.ssl b/src/lib/libssl/src/crypto/txt_db/Makefile.ssl
new file mode 100644
index 0000000000..76e511534f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/Makefile.ssl b/src/lib/libssl/src/crypto/x509/Makefile.ssl
new file mode 100644
index 0000000000..1c1ca2ffa0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/attrib b/src/lib/libssl/src/crypto/x509/attrib
new file mode 100644
index 0000000000..37f6cd755f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/v3_net.c b/src/lib/libssl/src/crypto/x509/v3_net.c
new file mode 100644
index 0000000000..0c2d276d13
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/v3_x509.c b/src/lib/libssl/src/crypto/x509/v3_x509.c
new file mode 100644
index 0000000000..f685aa4c71
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/x509.doc b/src/lib/libssl/src/crypto/x509/x509.doc
new file mode 100644
index 0000000000..73cfc9f034
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/x509.err b/src/lib/libssl/src/crypto/x509/x509.err
new file mode 100644
index 0000000000..8d0862d7d1
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/x509pack.c b/src/lib/libssl/src/crypto/x509/x509pack.c
new file mode 100644
index 0000000000..846f125859
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509/x509v3.doc b/src/lib/libssl/src/crypto/x509/x509v3.doc
new file mode 100644
index 0000000000..1e760a9469
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509v3/format b/src/lib/libssl/src/crypto/x509v3/format
new file mode 100644
index 0000000000..3307978121
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509v3/header b/src/lib/libssl/src/crypto/x509v3/header
new file mode 100644
index 0000000000..3d791ca3dd
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/x509v3/v3_ku.c b/src/lib/libssl/src/crypto/x509v3/v3_ku.c
new file mode 100644
index 0000000000..87c7402f43
--- /dev/null
+++ b/src/lib/libssl/src/crypto/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);
+        }
+
diff --git a/src/lib/libssl/src/dep/crypto.txt b/src/lib/libssl/src/dep/crypto.txt
new file mode 100644
index 0000000000..9e5144fec6
--- /dev/null
+++ b/src/lib/libssl/src/dep/crypto.txt
@@ -0,0 +1,1043 @@
+ASN1_BIT_STRING_asn1_meth
+ASN1_BIT_STRING_get_bit
+ASN1_BIT_STRING_set_bit
+ASN1_HEADER_free
+ASN1_HEADER_new
+ASN1_IA5STRING_asn1_meth
+ASN1_INTEGER_get
+ASN1_INTEGER_set
+ASN1_INTEGER_to_BN
+ASN1_OBJECT_create
+ASN1_OBJECT_free
+ASN1_OBJECT_new
+ASN1_PRINTABLE_type
+ASN1_STRING_cmp
+ASN1_STRING_dup
+ASN1_STRING_free
+ASN1_STRING_new
+ASN1_STRING_print
+ASN1_STRING_set
+ASN1_STRING_type_new
+ASN1_TYPE_free
+ASN1_TYPE_get
+ASN1_TYPE_new
+ASN1_TYPE_set
+ASN1_UNIVERSALSTRING_to_string
+ASN1_UTCTIME_check
+ASN1_UTCTIME_print
+ASN1_UTCTIME_set
+ASN1_check_infinite_end
+ASN1_d2i_bio
+ASN1_d2i_fp
+ASN1_digest
+ASN1_dup
+ASN1_get_object
+ASN1_i2d_bio
+ASN1_i2d_fp
+ASN1_object_size
+ASN1_parse
+ASN1_put_object
+ASN1_sign
+ASN1_verify
+BF_cbc_encrypt
+BF_cfb64_encrypt
+BF_decrypt
+BF_ecb_encrypt
+BF_encrypt
+BF_ofb64_encrypt
+BF_options
+BF_set_key
+BIO_ACCEPT_free
+BIO_ACCEPT_new
+BIO_CONNECT_free
+BIO_CONNECT_new
+BIO_accept
+BIO_copy_next_retry
+BIO_ctrl
+BIO_ctrl_int
+BIO_debug_callback
+BIO_dump
+BIO_dup_chain
+BIO_f_base64
+BIO_f_buffer
+BIO_f_cipher
+BIO_f_md
+BIO_f_nbio_test
+BIO_f_null
+BIO_f_proxy_server
+BIO_fd_non_fatal_error
+BIO_fd_should_retry
+BIO_find_type
+BIO_free
+BIO_free_all
+BIO_get_accept_socket
+BIO_get_ex_data
+BIO_get_ex_new_index
+BIO_get_filter_bio
+BIO_get_host_ip
+BIO_get_port
+BIO_get_retry_BIO
+BIO_get_retry_reason
+BIO_gethostbyname
+BIO_gets
+BIO_ghbn_ctrl
+BIO_new
+BIO_new_accept
+BIO_new_connect
+BIO_new_fd
+BIO_new_file
+BIO_new_fp
+BIO_new_socket
+BIO_pop
+BIO_printf
+BIO_ptr_ctrl
+BIO_push
+BIO_puts
+BIO_read
+BIO_s_accept
+BIO_s_connect
+BIO_s_fd
+BIO_s_file
+BIO_s_mem
+BIO_s_null
+BIO_s_proxy_client
+BIO_s_socket
+BIO_set
+BIO_set_cipher
+BIO_set_ex_data
+BIO_set_tcp_ndelay
+BIO_sock_cleanup
+BIO_sock_error
+BIO_sock_init
+BIO_sock_non_fatal_error
+BIO_sock_should_retry
+BIO_socket_ioctl
+BIO_write
+BN_BLINDING_convert
+BN_BLINDING_free
+BN_BLINDING_invert
+BN_BLINDING_new
+BN_BLINDING_update
+BN_CTX_free
+BN_CTX_new
+BN_MONT_CTX_free
+BN_MONT_CTX_new
+BN_MONT_CTX_set
+BN_add
+BN_add_word
+BN_bin2bn
+BN_bn2bin
+BN_bn2dec
+BN_bn2hex
+BN_bn2mpi
+BN_clear
+BN_clear_bit
+BN_clear_free
+BN_cmp
+BN_copy
+BN_dec2bn
+BN_div
+BN_div_word
+BN_dup
+BN_exp
+BN_free
+BN_from_montgomery
+BN_gcd
+BN_generate_prime
+BN_get_word
+BN_hex2bn
+BN_is_bit_set
+BN_is_prime
+BN_lshift
+BN_lshift1
+BN_mask_bits
+BN_mod
+BN_mod_exp
+BN_mod_exp_mont
+BN_mod_exp_recp
+BN_mod_exp_simple
+BN_mod_inverse
+BN_mod_mul
+BN_mod_mul_montgomery
+BN_mod_mul_reciprocal
+BN_mod_word
+BN_mpi2bn
+BN_mul
+BN_mul_word
+BN_new
+BN_num_bits
+BN_num_bits_word
+BN_options
+BN_print
+BN_print_fp
+BN_rand
+BN_reciprocal
+BN_rshift
+BN_rshift1
+BN_set_bit
+BN_set_word
+BN_sqr
+BN_sub
+BN_sub_word
+BN_to_ASN1_INTEGER
+BN_ucmp
+BN_value_one
+BUF_MEM_free
+BUF_MEM_grow
+BUF_MEM_new
+BUF_strdup
+CAST_cbc_encrypt
+CAST_cfb64_encrypt
+CAST_decrypt
+CAST_ecb_encrypt
+CAST_encrypt
+CAST_ofb64_encrypt
+CAST_set_key
+CONF_free
+CONF_get_number
+CONF_get_section
+CONF_get_string
+CONF_load
+CRYPTO_add_lock
+CRYPTO_dbg_free
+CRYPTO_dbg_malloc
+CRYPTO_dbg_realloc
+CRYPTO_dbg_remalloc
+CRYPTO_dup_ex_data
+CRYPTO_free
+CRYPTO_free_ex_data
+CRYPTO_get_add_lock_callback
+CRYPTO_get_ex_data
+CRYPTO_get_ex_new_index
+CRYPTO_get_id_callback
+CRYPTO_get_lock_name
+CRYPTO_get_locking_callback
+CRYPTO_get_mem_functions
+CRYPTO_get_new_lockid
+CRYPTO_lock
+CRYPTO_malloc
+CRYPTO_mem_ctrl
+CRYPTO_mem_leaks
+CRYPTO_mem_leaks_cb
+CRYPTO_mem_leaks_fp
+CRYPTO_new_ex_data
+CRYPTO_realloc
+CRYPTO_remalloc
+CRYPTO_set_add_lock_callback
+CRYPTO_set_ex_data
+CRYPTO_set_id_callback
+CRYPTO_set_locking_callback
+CRYPTO_set_mem_functions
+CRYPTO_thread_id
+DH_check
+DH_compute_key
+DH_free
+DH_generate_key
+DH_generate_parameters
+DH_new
+DH_size
+DHparams_print
+DHparams_print_fp
+DSA_free
+DSA_generate_key
+DSA_generate_parameters
+DSA_is_prime
+DSA_new
+DSA_print
+DSA_print_fp
+DSA_sign
+DSA_sign_setup
+DSA_size
+DSA_verify
+DSAparams_print
+DSAparams_print_fp
+ERR_clear_error
+ERR_error_string
+ERR_free_strings
+ERR_func_error_string
+ERR_get_err_state_table
+ERR_get_error
+ERR_get_error_line
+ERR_get_next_error_library
+ERR_get_state
+ERR_get_string_table
+ERR_lib_error_string
+ERR_load_ASN1_strings
+ERR_load_BIO_strings
+ERR_load_BN_strings
+ERR_load_BUF_strings
+ERR_load_CONF_strings
+ERR_load_CRYPTO_strings
+ERR_load_DH_strings
+ERR_load_DSA_strings
+ERR_load_ERR_strings
+ERR_load_EVP_strings
+ERR_load_OBJ_strings
+ERR_load_PEM_strings
+ERR_load_PKCS7_strings
+ERR_load_PROXY_strings
+ERR_load_RSA_strings
+ERR_load_X509_strings
+ERR_load_crypto_strings
+ERR_load_strings
+ERR_peek_error
+ERR_peek_error_line
+ERR_print_errors
+ERR_print_errors_fp
+ERR_put_error
+ERR_reason_error_string
+ERR_remove_state
+EVP_BytesToKey
+EVP_CIPHER_CTX_cleanup
+EVP_CIPHER_CTX_init
+EVP_CipherFinal
+EVP_CipherInit
+EVP_CipherUpdate
+EVP_DecodeBlock
+EVP_DecodeFinal
+EVP_DecodeInit
+EVP_DecodeUpdate
+EVP_DecryptFinal
+EVP_DecryptInit
+EVP_DecryptUpdate
+EVP_DigestFinal
+EVP_DigestInit
+EVP_DigestUpdate
+EVP_EncodeBlock
+EVP_EncodeFinal
+EVP_EncodeInit
+EVP_EncodeUpdate
+EVP_EncryptFinal
+EVP_EncryptInit
+EVP_EncryptUpdate
+EVP_OpenFinal
+EVP_OpenInit
+EVP_PKEY_assign
+EVP_PKEY_bits
+EVP_PKEY_cmp_parameters
+EVP_PKEY_copy_parameters
+EVP_PKEY_free
+EVP_PKEY_missing_parameters
+EVP_PKEY_new
+EVP_PKEY_save_parameters
+EVP_PKEY_size
+EVP_PKEY_type
+EVP_SealFinal
+EVP_SealInit
+EVP_SignFinal
+EVP_VerifyFinal
+EVP_add_alias
+EVP_add_cipher
+EVP_add_digest
+EVP_bf_cbc
+EVP_bf_cfb
+EVP_bf_ecb
+EVP_bf_ofb
+EVP_cast5_cbc
+EVP_cast5_cfb
+EVP_cast5_ecb
+EVP_cast5_ofb
+EVP_cleanup
+EVP_delete_alias
+EVP_des_cbc
+EVP_des_cfb
+EVP_des_ecb
+EVP_des_ede
+EVP_des_ede3
+EVP_des_ede3_cbc
+EVP_des_ede3_cfb
+EVP_des_ede3_ofb
+EVP_des_ede_cbc
+EVP_des_ede_cfb
+EVP_des_ede_ofb
+EVP_des_ofb
+EVP_desx_cbc
+EVP_dss
+EVP_dss1
+EVP_enc_null
+EVP_get_cipherbyname
+EVP_get_digestbyname
+EVP_get_pw_prompt
+EVP_idea_cbc
+EVP_idea_cfb
+EVP_idea_ecb
+EVP_idea_ofb
+EVP_md2
+EVP_md5
+EVP_md_null
+EVP_mdc2
+EVP_rc2_40_cbc
+EVP_rc2_cbc
+EVP_rc2_cfb
+EVP_rc2_ecb
+EVP_rc2_ofb
+EVP_rc4
+EVP_rc4_40
+EVP_read_pw_string
+EVP_set_pw_prompt
+EVP_sha
+EVP_sha1
+HMAC
+HMAC_Final
+HMAC_Init
+HMAC_Update
+HMAC_cleanup
+MD2
+MD2_Final
+MD2_Init
+MD2_Update
+MD2_options
+MD5
+MD5_Final
+MD5_Init
+MD5_Transform
+MD5_Update
+MDC2
+MDC2_Final
+MDC2_Init
+MDC2_Update
+NETSCAPE_SPKAC_free
+NETSCAPE_SPKAC_new
+NETSCAPE_SPKI_free
+NETSCAPE_SPKI_new
+NETSCAPE_SPKI_sign
+NETSCAPE_SPKI_verify
+OBJ_add_object
+OBJ_bsearch
+OBJ_cleanup
+OBJ_cmp
+OBJ_create
+OBJ_create_objects
+OBJ_dup
+OBJ_ln2nid
+OBJ_new_nid
+OBJ_nid2ln
+OBJ_nid2obj
+OBJ_nid2sn
+OBJ_obj2nid
+OBJ_sn2nid
+OBJ_txt2nid
+PEM_ASN1_read
+PEM_ASN1_read_bio
+PEM_ASN1_write
+PEM_ASN1_write_bio
+PEM_SealFinal
+PEM_SealInit
+PEM_SealUpdate
+PEM_SignFinal
+PEM_SignInit
+PEM_SignUpdate
+PEM_X509_INFO_read
+PEM_X509_INFO_read_bio
+PEM_X509_INFO_write_bio
+PEM_dek_info
+PEM_do_header
+PEM_get_EVP_CIPHER_INFO
+PEM_proc_type
+PEM_read
+PEM_read_DHparams
+PEM_read_DSAPrivateKey
+PEM_read_DSAparams
+PEM_read_PKCS7
+PEM_read_PrivateKey
+PEM_read_RSAPrivateKey
+PEM_read_RSAPublicKey
+PEM_read_X509
+PEM_read_X509_CRL
+PEM_read_X509_REQ
+PEM_read_bio
+PEM_read_bio_DHparams
+PEM_read_bio_DSAPrivateKey
+PEM_read_bio_DSAparams
+PEM_read_bio_PKCS7
+PEM_read_bio_PrivateKey
+PEM_read_bio_RSAPrivateKey
+PEM_read_bio_RSAPublicKey
+PEM_read_bio_X509
+PEM_read_bio_X509_CRL
+PEM_read_bio_X509_REQ
+PEM_write
+PEM_write_DHparams
+PEM_write_DSAPrivateKey
+PEM_write_DSAparams
+PEM_write_PKCS7
+PEM_write_PrivateKey
+PEM_write_RSAPrivateKey
+PEM_write_RSAPublicKey
+PEM_write_X509
+PEM_write_X509_CRL
+PEM_write_X509_REQ
+PEM_write_bio
+PEM_write_bio_DHparams
+PEM_write_bio_DSAPrivateKey
+PEM_write_bio_DSAparams
+PEM_write_bio_PKCS7
+PEM_write_bio_PrivateKey
+PEM_write_bio_RSAPrivateKey
+PEM_write_bio_RSAPublicKey
+PEM_write_bio_X509
+PEM_write_bio_X509_CRL
+PEM_write_bio_X509_REQ
+PKCS7_DIGEST_free
+PKCS7_DIGEST_new
+PKCS7_ENCRYPT_free
+PKCS7_ENCRYPT_new
+PKCS7_ENC_CONTENT_free
+PKCS7_ENC_CONTENT_new
+PKCS7_ENVELOPE_free
+PKCS7_ENVELOPE_new
+PKCS7_ISSUER_AND_SERIAL_digest
+PKCS7_ISSUER_AND_SERIAL_free
+PKCS7_ISSUER_AND_SERIAL_new
+PKCS7_RECIP_INFO_free
+PKCS7_RECIP_INFO_new
+PKCS7_SIGNED_free
+PKCS7_SIGNED_new
+PKCS7_SIGNER_INFO_free
+PKCS7_SIGNER_INFO_new
+PKCS7_SIGNER_INFO_set
+PKCS7_SIGN_ENVELOPE_free
+PKCS7_SIGN_ENVELOPE_new
+PKCS7_add_certificate
+PKCS7_add_crl
+PKCS7_add_signature
+PKCS7_add_signer
+PKCS7_cert_from_signer_info
+PKCS7_content_free
+PKCS7_content_new
+PKCS7_ctrl
+PKCS7_dataInit
+PKCS7_dataSign
+PKCS7_dataVerify
+PKCS7_dup
+PKCS7_free
+PKCS7_get_signer_info
+PKCS7_new
+PKCS7_set_content
+PKCS7_set_type
+PROXY_ENTRY_add_noproxy
+PROXY_ENTRY_clear_noproxy
+PROXY_ENTRY_free
+PROXY_ENTRY_get_noproxy
+PROXY_ENTRY_new
+PROXY_ENTRY_set_server
+PROXY_add_noproxy
+PROXY_add_server
+PROXY_check_by_host
+PROXY_check_url
+PROXY_clear_noproxy
+PROXY_free
+PROXY_get_noproxy
+PROXY_get_proxies
+PROXY_get_proxy_entry
+PROXY_load_conf
+PROXY_new
+PROXY_print
+RAND_bytes
+RAND_cleanup
+RAND_file_name
+RAND_load_file
+RAND_seed
+RAND_write_file
+RC2_cbc_encrypt
+RC2_cfb64_encrypt
+RC2_decrypt
+RC2_ecb_encrypt
+RC2_encrypt
+RC2_ofb64_encrypt
+RC2_set_key
+RC4
+RC4_options
+RC4_set_key
+RC5_32_cbc_encrypt
+RC5_32_cfb64_encrypt
+RC5_32_decrypt
+RC5_32_ecb_encrypt
+RC5_32_encrypt
+RC5_32_ofb64_encrypt
+RC5_32_set_key
+RIPEMD160
+RIPEMD160_Final
+RIPEMD160_Init
+RIPEMD160_Transform
+RIPEMD160_Update
+RSAPrivateKey_asn1_meth
+RSAPrivateKey_dup
+RSAPublicKey_dup
+RSA_PKCS1_SSLeay
+RSA_blinding_off
+RSA_blinding_on
+RSA_flags
+RSA_free
+RSA_generate_key
+RSA_get_ex_data
+RSA_get_ex_new_index
+RSA_new
+RSA_new_method
+RSA_padding_add_PKCS1_type_1
+RSA_padding_add_PKCS1_type_2
+RSA_padding_add_SSLv23
+RSA_padding_add_none
+RSA_padding_check_PKCS1_type_1
+RSA_padding_check_PKCS1_type_2
+RSA_padding_check_SSLv23
+RSA_padding_check_none
+RSA_print
+RSA_print_fp
+RSA_private_decrypt
+RSA_private_encrypt
+RSA_public_decrypt
+RSA_public_encrypt
+RSA_set_default_method
+RSA_set_ex_data
+RSA_sign
+RSA_sign_ASN1_OCTET_STRING
+RSA_size
+RSA_verify
+RSA_verify_ASN1_OCTET_STRING
+SHA
+SHA1
+SHA1_Final
+SHA1_Init
+SHA1_Transform
+SHA1_Update
+SHA_Final
+SHA_Init
+SHA_Transform
+SHA_Update
+SSLeay
+SSLeay_add_all_algorithms
+SSLeay_add_all_ciphers
+SSLeay_add_all_digests
+SSLeay_version
+TXT_DB_create_index
+TXT_DB_free
+TXT_DB_get_by_index
+TXT_DB_insert
+TXT_DB_read
+TXT_DB_write
+X509_ALGOR_free
+X509_ALGOR_new
+X509_ATTRIBUTE_free
+X509_ATTRIBUTE_new
+X509_CINF_free
+X509_CINF_new
+X509_CRL_INFO_free
+X509_CRL_INFO_new
+X509_CRL_add_ext
+X509_CRL_cmp
+X509_CRL_delete_ext
+X509_CRL_dup
+X509_CRL_free
+X509_CRL_get_ext
+X509_CRL_get_ext_by_NID
+X509_CRL_get_ext_by_OBJ
+X509_CRL_get_ext_by_critical
+X509_CRL_get_ext_count
+X509_CRL_new
+X509_CRL_sign
+X509_CRL_verify
+X509_EXTENSION_create_by_NID
+X509_EXTENSION_create_by_OBJ
+X509_EXTENSION_dup
+X509_EXTENSION_free
+X509_EXTENSION_get_critical
+X509_EXTENSION_get_data
+X509_EXTENSION_get_object
+X509_EXTENSION_new
+X509_EXTENSION_set_critical
+X509_EXTENSION_set_data
+X509_EXTENSION_set_object
+X509_INFO_free
+X509_INFO_new
+X509_LOOKUP_by_alias
+X509_LOOKUP_by_fingerprint
+X509_LOOKUP_by_issuer_serial
+X509_LOOKUP_by_subject
+X509_LOOKUP_ctrl
+X509_LOOKUP_file
+X509_LOOKUP_free
+X509_LOOKUP_hash_dir
+X509_LOOKUP_init
+X509_LOOKUP_new
+X509_LOOKUP_shutdown
+X509_NAME_ENTRY_create_by_NID
+X509_NAME_ENTRY_create_by_OBJ
+X509_NAME_ENTRY_dup
+X509_NAME_ENTRY_free
+X509_NAME_ENTRY_get_data
+X509_NAME_ENTRY_get_object
+X509_NAME_ENTRY_new
+X509_NAME_ENTRY_set_data
+X509_NAME_ENTRY_set_object
+X509_NAME_add_entry
+X509_NAME_cmp
+X509_NAME_delete_entry
+X509_NAME_digest
+X509_NAME_dup
+X509_NAME_entry_count
+X509_NAME_free
+X509_NAME_get_entry
+X509_NAME_get_index_by_NID
+X509_NAME_get_index_by_OBJ
+X509_NAME_get_text_by_NID
+X509_NAME_get_text_by_OBJ
+X509_NAME_hash
+X509_NAME_new
+X509_NAME_oneline
+X509_NAME_print
+X509_NAME_set
+X509_OBJECT_free_contents
+X509_OBJECT_retrive_by_subject
+X509_OBJECT_up_ref_count
+X509_PKEY_free
+X509_PKEY_new
+X509_PUBKEY_free
+X509_PUBKEY_get
+X509_PUBKEY_new
+X509_PUBKEY_set
+X509_REQ_INFO_free
+X509_REQ_INFO_new
+X509_REQ_dup
+X509_REQ_free
+X509_REQ_get_pubkey
+X509_REQ_new
+X509_REQ_print
+X509_REQ_print_fp
+X509_REQ_set_pubkey
+X509_REQ_set_subject_name
+X509_REQ_set_version
+X509_REQ_sign
+X509_REQ_to_X509
+X509_REQ_verify
+X509_REVOKED_add_ext
+X509_REVOKED_delete_ext
+X509_REVOKED_free
+X509_REVOKED_get_ext
+X509_REVOKED_get_ext_by_NID
+X509_REVOKED_get_ext_by_OBJ
+X509_REVOKED_get_ext_by_critical
+X509_REVOKED_get_ext_count
+X509_REVOKED_new
+X509_SIG_free
+X509_SIG_new
+X509_STORE_CTX_cleanup
+X509_STORE_CTX_get_chain
+X509_STORE_CTX_get_current_cert
+X509_STORE_CTX_get_error
+X509_STORE_CTX_get_error_depth
+X509_STORE_CTX_get_ex_data
+X509_STORE_CTX_get_ex_new_index
+X509_STORE_CTX_init
+X509_STORE_CTX_set_cert
+X509_STORE_CTX_set_chain
+X509_STORE_CTX_set_error
+X509_STORE_CTX_set_ex_data
+X509_STORE_add_cert
+X509_STORE_add_crl
+X509_STORE_add_lookup
+X509_STORE_free
+X509_STORE_get_by_subject
+X509_STORE_load_locations
+X509_STORE_new
+X509_STORE_set_default_paths
+X509_VAL_free
+X509_VAL_new
+X509_add_ext
+X509_asn1_meth
+X509_certificate_type
+X509_check_private_key
+X509_cmp_current_time
+X509_delete_ext
+X509_digest
+X509_dup
+X509_find_by_issuer_and_serial
+X509_find_by_subject
+X509_free
+X509_get_default_cert_area
+X509_get_default_cert_dir
+X509_get_default_cert_dir_env
+X509_get_default_cert_file
+X509_get_default_cert_file_env
+X509_get_default_private_dir
+X509_get_ext
+X509_get_ext_by_NID
+X509_get_ext_by_OBJ
+X509_get_ext_by_critical
+X509_get_ext_count
+X509_get_issuer_name
+X509_get_pubkey
+X509_get_pubkey_parameters
+X509_get_serialNumber
+X509_get_subject_name
+X509_gmtime_adj
+X509_issuer_and_serial_cmp
+X509_issuer_and_serial_hash
+X509_issuer_name_cmp
+X509_issuer_name_hash
+X509_load_cert_file
+X509_load_crl_file
+X509_new
+X509_print
+X509_print_fp
+X509_set_issuer_name
+X509_set_notAfter
+X509_set_notBefore
+X509_set_pubkey
+X509_set_serialNumber
+X509_set_subject_name
+X509_set_version
+X509_sign
+X509_subject_name_cmp
+X509_subject_name_hash
+X509_to_X509_REQ
+X509_verify
+X509_verify_cert
+X509_verify_cert_error_string
+X509v3_add_ext
+X509v3_add_extension
+X509v3_add_netscape_extensions
+X509v3_add_standard_extensions
+X509v3_cleanup_extensions
+X509v3_data_type_by_NID
+X509v3_data_type_by_OBJ
+X509v3_delete_ext
+X509v3_get_ext
+X509v3_get_ext_by_NID
+X509v3_get_ext_by_OBJ
+X509v3_get_ext_by_critical
+X509v3_get_ext_count
+X509v3_get_key_usage
+X509v3_pack_string
+X509v3_pack_type_by_NID
+X509v3_pack_type_by_OBJ
+X509v3_set_key_usage
+X509v3_unpack_string
+_des_crypt
+a2d_ASN1_OBJECT
+a2i_ASN1_INTEGER
+a2i_ASN1_STRING
+a2i_X509v3_key_usage
+asn1_Finish
+asn1_GetSequence
+bn_add_words
+bn_div64
+bn_expand2
+bn_mul_add_words
+bn_mul_words
+bn_qadd
+bn_qsub
+bn_sqr_words
+crypt
+d2i_ASN1_BIT_STRING
+d2i_ASN1_BOOLEAN
+d2i_ASN1_HEADER
+d2i_ASN1_IA5STRING
+d2i_ASN1_INTEGER
+d2i_ASN1_OBJECT
+d2i_ASN1_OCTET_STRING
+d2i_ASN1_PRINTABLE
+d2i_ASN1_PRINTABLESTRING
+d2i_ASN1_SET
+d2i_ASN1_T61STRING
+d2i_ASN1_TYPE
+d2i_ASN1_UTCTIME
+d2i_ASN1_bytes
+d2i_ASN1_type_bytes
+d2i_DHparams
+d2i_DSAPrivateKey
+d2i_DSAPrivateKey_bio
+d2i_DSAPrivateKey_fp
+d2i_DSAPublicKey
+d2i_DSAparams
+d2i_NETSCAPE_SPKAC
+d2i_NETSCAPE_SPKI
+d2i_Netscape_RSA
+d2i_Netscape_RSA_2
+d2i_PKCS7
+d2i_PKCS7_DIGEST
+d2i_PKCS7_ENCRYPT
+d2i_PKCS7_ENC_CONTENT
+d2i_PKCS7_ENVELOPE
+d2i_PKCS7_ISSUER_AND_SERIAL
+d2i_PKCS7_RECIP_INFO
+d2i_PKCS7_SIGNED
+d2i_PKCS7_SIGNER_INFO
+d2i_PKCS7_SIGN_ENVELOPE
+d2i_PKCS7_bio
+d2i_PKCS7_fp
+d2i_PrivateKey
+d2i_PublicKey
+d2i_RSAPrivateKey
+d2i_RSAPrivateKey_bio
+d2i_RSAPrivateKey_fp
+d2i_RSAPublicKey
+d2i_RSAPublicKey_bio
+d2i_RSAPublicKey_fp
+d2i_X509
+d2i_X509_ALGOR
+d2i_X509_ATTRIBUTE
+d2i_X509_CINF
+d2i_X509_CRL
+d2i_X509_CRL_INFO
+d2i_X509_CRL_bio
+d2i_X509_CRL_fp
+d2i_X509_EXTENSION
+d2i_X509_NAME
+d2i_X509_NAME_ENTRY
+d2i_X509_PKEY
+d2i_X509_PUBKEY
+d2i_X509_REQ
+d2i_X509_REQ_INFO
+d2i_X509_REQ_bio
+d2i_X509_REQ_fp
+d2i_X509_REVOKED
+d2i_X509_SIG
+d2i_X509_VAL
+d2i_X509_bio
+d2i_X509_fp
+des_cbc_cksum
+des_cbc_encrypt
+des_cblock_print_file
+des_cfb64_encrypt
+des_cfb_encrypt
+des_decrypt3
+des_ecb3_encrypt
+des_ecb_encrypt
+des_ede3_cbc_encrypt
+des_ede3_cfb64_encrypt
+des_ede3_ofb64_encrypt
+des_enc_read
+des_enc_write
+des_encrypt
+des_encrypt2
+des_encrypt3
+des_fcrypt
+des_is_weak_key
+des_key_sched
+des_ncbc_encrypt
+des_ofb64_encrypt
+des_ofb_encrypt
+des_options
+des_pcbc_encrypt
+des_quad_cksum
+des_random_key
+des_random_seed
+des_read_2passwords
+des_read_password
+des_read_pw
+des_read_pw_string
+des_set_key
+des_set_odd_parity
+des_string_to_2keys
+des_string_to_key
+des_xcbc_encrypt
+des_xwhite_in2out
+fcrypt_body
+i2a_ASN1_INTEGER
+i2a_ASN1_OBJECT
+i2a_ASN1_STRING
+i2a_X509v3_key_usage
+i2d_ASN1_BIT_STRING
+i2d_ASN1_BOOLEAN
+i2d_ASN1_HEADER
+i2d_ASN1_IA5STRING
+i2d_ASN1_INTEGER
+i2d_ASN1_OBJECT
+i2d_ASN1_OCTET_STRING
+i2d_ASN1_PRINTABLE
+i2d_ASN1_SET
+i2d_ASN1_TYPE
+i2d_ASN1_UTCTIME
+i2d_ASN1_bytes
+i2d_DHparams
+i2d_DSAPrivateKey
+i2d_DSAPrivateKey_bio
+i2d_DSAPrivateKey_fp
+i2d_DSAPublicKey
+i2d_DSAparams
+i2d_NETSCAPE_SPKAC
+i2d_NETSCAPE_SPKI
+i2d_Netscape_RSA
+i2d_PKCS7
+i2d_PKCS7_DIGEST
+i2d_PKCS7_ENCRYPT
+i2d_PKCS7_ENC_CONTENT
+i2d_PKCS7_ENVELOPE
+i2d_PKCS7_ISSUER_AND_SERIAL
+i2d_PKCS7_RECIP_INFO
+i2d_PKCS7_SIGNED
+i2d_PKCS7_SIGNER_INFO
+i2d_PKCS7_SIGN_ENVELOPE
+i2d_PKCS7_bio
+i2d_PKCS7_fp
+i2d_PrivateKey
+i2d_PublicKey
+i2d_RSAPrivateKey
+i2d_RSAPrivateKey_bio
+i2d_RSAPrivateKey_fp
+i2d_RSAPublicKey
+i2d_RSAPublicKey_bio
+i2d_RSAPublicKey_fp
+i2d_X509
+i2d_X509_ALGOR
+i2d_X509_ATTRIBUTE
+i2d_X509_CINF
+i2d_X509_CRL
+i2d_X509_CRL_INFO
+i2d_X509_CRL_bio
+i2d_X509_CRL_fp
+i2d_X509_EXTENSION
+i2d_X509_NAME
+i2d_X509_NAME_ENTRY
+i2d_X509_PKEY
+i2d_X509_PUBKEY
+i2d_X509_REQ
+i2d_X509_REQ_INFO
+i2d_X509_REQ_bio
+i2d_X509_REQ_fp
+i2d_X509_REVOKED
+i2d_X509_SIG
+i2d_X509_VAL
+i2d_X509_bio
+i2d_X509_fp
+i2t_ASN1_OBJECT
+idea_cbc_encrypt
+idea_cfb64_encrypt
+idea_ecb_encrypt
+idea_encrypt
+idea_ofb64_encrypt
+idea_options
+idea_set_decrypt_key
+idea_set_encrypt_key
+lh_delete
+lh_doall
+lh_doall_arg
+lh_free
+lh_insert
+lh_new
+lh_node_stats
+lh_node_stats_bio
+lh_node_usage_stats
+lh_node_usage_stats_bio
+lh_retrieve
+lh_stats
+lh_stats_bio
+lh_strhash
+ripemd160_block
+sha1_block
+sha_block
+sk_delete
+sk_delete_ptr
+sk_dup
+sk_find
+sk_free
+sk_insert
+sk_new
+sk_pop
+sk_pop_free
+sk_push
+sk_set_cmp_func
+sk_shift
+sk_unshift
+sk_zero
diff --git a/src/lib/libssl/src/dep/files b/src/lib/libssl/src/dep/files
new file mode 100644
index 0000000000..8c5550c37c
--- /dev/null
+++ b/src/lib/libssl/src/dep/files
@@ -0,0 +1,574 @@
+./e_os.h
+
+./crypto/cryptall.h             CRYPTO
+./crypto/cryptlib.h             CRYPTO
+./crypto/crypto.c               CRYPTO
+./crypto/cversion.c             CRYPTO
+./crypto/date.h                 CRYPTO
+./crypto/mem.c                  CRYPTO
+./crypto/cpt_err.c              CRYPTO
+./crypto/ex_data.c              CRYPTO
+./crypto/crypto.h               CRYPTO
+./crypto/cryptlib.c             CRYPTO
+./crypto/tmdiff.c               CRYPTO
+
+./crypto/asn1/asn1.h            ASN1
+./crypto/asn1/asn1_mac.h        ASN1
+./crypto/asn1/asn1_err.c        ASN1
+./crypto/asn1/asn1_lib.c        ASN1
+./crypto/asn1/asn1_par.c        ASN1
+./crypto/asn1/a_bitstr.c        ASN1
+./crypto/asn1/a_bmp.c           ASN1
+./crypto/asn1/a_bool.c          ASN1
+./crypto/asn1/a_bytes.c         ASN1
+./crypto/asn1/a_d2i_fp.c        ASN1
+./crypto/asn1/a_digest.c        ASN1
+./crypto/asn1/a_dup.c           ASN1
+./crypto/asn1/a_hdr.c           ASN1
+./crypto/asn1/a_i2d_fp.c        ASN1
+./crypto/asn1/a_int.c           ASN1
+./crypto/asn1/a_meth.c          ASN1
+./crypto/asn1/a_object.c        ASN1
+./crypto/asn1/a_octet.c         ASN1
+./crypto/asn1/a_print.c         ASN1
+./crypto/asn1/a_set.c           ASN1
+./crypto/asn1/a_sign.c          ASN1
+./crypto/asn1/a_type.c          ASN1
+./crypto/asn1/a_utctm.c         ASN1
+./crypto/asn1/a_verify.c        ASN1
+./crypto/asn1/d2i_dhp.c         ASN1
+./crypto/asn1/d2i_dsap.c        ASN1
+./crypto/asn1/d2i_pr.c          ASN1
+./crypto/asn1/d2i_pu.c          ASN1
+./crypto/asn1/d2i_r_pr.c        ASN1
+./crypto/asn1/d2i_r_pu.c        ASN1
+./crypto/asn1/d2i_s_pr.c        ASN1
+./crypto/asn1/d2i_s_pu.c        ASN1
+./crypto/asn1/f_int.c           ASN1
+./crypto/asn1/f_string.c        ASN1
+./crypto/asn1/i2d_dhp.c         ASN1
+./crypto/asn1/i2d_dsap.c        ASN1
+./crypto/asn1/i2d_pr.c          ASN1
+./crypto/asn1/i2d_pu.c          ASN1
+./crypto/asn1/i2d_r_pr.c        ASN1
+./crypto/asn1/i2d_r_pu.c        ASN1
+./crypto/asn1/i2d_s_pr.c        ASN1
+./crypto/asn1/i2d_s_pu.c        ASN1
+./crypto/asn1/n_pkey.c          ASN1
+./crypto/asn1/p7_dgst.c         ASN1
+./crypto/asn1/p7_enc.c          ASN1
+./crypto/asn1/p7_enc_c.c        ASN1
+./crypto/asn1/p7_evp.c          ASN1
+./crypto/asn1/p7_i_s.c          ASN1
+./crypto/asn1/p7_lib.c          ASN1
+./crypto/asn1/p7_recip.c        ASN1
+./crypto/asn1/p7_signd.c        ASN1
+./crypto/asn1/p7_signi.c        ASN1
+./crypto/asn1/p7_s_e.c          ASN1
+./crypto/asn1/pk.c              ASN1
+./crypto/asn1/pkcs8.c           ASN1
+./crypto/asn1/t_pkey.c          ASN1
+./crypto/asn1/t_req.c           ASN1
+./crypto/asn1/t_x509.c          ASN1
+./crypto/asn1/x_algor.c         ASN1
+./crypto/asn1/x_attrib.c        ASN1
+./crypto/asn1/x_cinf.c          ASN1
+./crypto/asn1/x_crl.c           ASN1
+./crypto/asn1/x_exten.c         ASN1
+./crypto/asn1/x_info.c          ASN1
+./crypto/asn1/x_name.c          ASN1
+./crypto/asn1/x_pkey.c          ASN1
+./crypto/asn1/x_pubkey.c        ASN1
+./crypto/asn1/x_req.c           ASN1
+./crypto/asn1/x_sig.c           ASN1
+./crypto/asn1/x_spki.c          ASN1
+./crypto/asn1/x_val.c           ASN1
+./crypto/asn1/x_x509.c          ASN1
+
+./crypto/bf/blowfish.h          BF
+./crypto/bf/bf_pi.h             BF
+./crypto/bf/bf_locl.h           BF
+./crypto/bf/bfspeed.c           BF
+./crypto/bf/bftest.c            BF
+./crypto/bf/bf_cbc.c            BF
+./crypto/bf/bf_cfb64.c          BF
+./crypto/bf/bf_ecb.c            BF
+./crypto/bf/bf_enc.c            BF
+./crypto/bf/bf_ofb64.c          BF
+./crypto/bf/bf_opts.c           BF
+./crypto/bf/bf_skey.c           BF
+
+./crypto/bio/bio.h              BIO
+./crypto/bio/bf_buff.c          BIO
+./crypto/bio/bf_nbio.c          BIO
+./crypto/bio/bf_null.c          BIO
+./crypto/bio/bio_cb.c           BIO
+./crypto/bio/bio_err.c          BIO
+./crypto/bio/bio_lib.c          BIO
+./crypto/bio/bss_acpt.c         BIO
+./crypto/bio/bss_conn.c         BIO
+./crypto/bio/bss_fd.c           BIO
+./crypto/bio/bss_file.c         BIO
+./crypto/bio/bss_mem.c          BIO
+./crypto/bio/bss_null.c         BIO
+./crypto/bio/bss_rtcp.c         BIO
+./crypto/bio/bss_sock.c         BIO
+./crypto/bio/b_dump.c           BIO
+./crypto/bio/b_print.c          BIO
+./crypto/bio/b_sock.c           BIO
+
+./crypto/bn/bn.h                BN
+./crypto/bn/bn_lcl.h            BN
+./crypto/bn/bn_prime.h          BN
+./crypto/bn/bnspeed.c           BN
+./crypto/bn/bntest.c            BN
+./crypto/bn/bn_add.c            BN
+./crypto/bn/bn_bld.c            BN
+./crypto/bn/bn_blind.c          BN
+./crypto/bn/bn_div.c            BN
+./crypto/bn/bn_err.c            BN
+./crypto/bn/bn_exp.c            BN
+./crypto/bn/bn_gcd.c            BN
+./crypto/bn/bn_lib.c            BN
+./crypto/bn/bn_mod.c            BN
+./crypto/bn/bn_mont.c           BN
+./crypto/bn/bn_mul.c            BN
+./crypto/bn/bn_mulw.c           BN
+./crypto/bn/bn_prime.c          BN
+./crypto/bn/bn_print.c          BN
+./crypto/bn/bn_rand.c           BN
+./crypto/bn/bn_recp.c           BN
+./crypto/bn/bn_shift.c          BN
+./crypto/bn/bn_sqr.c            BN
+./crypto/bn/bn_sub.c            BN
+./crypto/bn/bn_word.c           BN
+./crypto/bn/bn_m.c              BN
+./crypto/bn/m.c                 BN
+./crypto/bn/expspeed.c          BN
+./crypto/bn/bn_mpi.c            BN
+./crypto/bn/exptest.c           BN
+
+./crypto/buffer/buffer.c        BUFF
+./crypto/buffer/buffer.h        BUFF
+./crypto/buffer/buf_err.c       BUFF
+
+./crypto/cast/cast.h            CAST
+./crypto/cast/castopts.c        CAST
+./crypto/cast/casttest.c        CAST
+./crypto/cast/cast_lcl.h        CAST
+./crypto/cast/cast_s.h          CAST
+./crypto/cast/cast_spd.c        CAST
+./crypto/cast/c_cfb64.c         CAST
+./crypto/cast/c_ecb.c           CAST
+./crypto/cast/c_enc.c           CAST
+./crypto/cast/c_ofb64.c         CAST
+./crypto/cast/c_skey.c          CAST
+
+./crypto/conf/conf_lcl.h        CONF
+./crypto/conf/cnf_save.c        CONF
+./crypto/conf/conf.c            CONF
+./crypto/conf/conf.h            CONF
+./crypto/conf/conf_err.c        CONF
+
+./crypto/des/des.h              DES
+./crypto/des/des_locl.h         DES
+./crypto/des/spr.h              DES
+./crypto/des/podd.h             DES
+./crypto/des/sk.h               DES
+./crypto/des/cbc3_enc.c         DES
+./crypto/des/cbc_cksm.c         DES
+./crypto/des/cbc_enc.c          DES
+./crypto/des/cfb64ede.c         DES
+./crypto/des/cfb64enc.c         DES
+./crypto/des/cfb_enc.c          DES
+./crypto/des/des.c              DES
+./crypto/des/destest.c          DES
+./crypto/des/des_enc.c          DES
+./crypto/des/des_opts.c         DES
+./crypto/des/des_ver.h          DES
+./crypto/des/ecb3_enc.c         DES
+./crypto/des/ecb_enc.c          DES
+./crypto/des/ede_enc.c          DES
+./crypto/des/enc_read.c         DES
+./crypto/des/enc_writ.c         DES
+./crypto/des/fcrypt.c           DES
+./crypto/des/fcrypt_b.c         DES
+./crypto/des/ncbc_enc.c         DES
+./crypto/des/ofb64ede.c         DES
+./crypto/des/ofb64enc.c         DES
+./crypto/des/ofb_enc.c          DES
+./crypto/des/pcbc_enc.c         DES
+./crypto/des/qud_cksm.c         DES
+./crypto/des/rand_key.c         DES
+./crypto/des/read2pwd.c         DES
+./crypto/des/read_pwd.c         DES
+./crypto/des/rpc_des.h          DES
+./crypto/des/rpc_enc.c          DES
+./crypto/des/rpw.c              DES
+./crypto/des/set_key.c          DES
+./crypto/des/str2key.c          DES
+./crypto/des/supp.c             DES
+./crypto/des/xcbc_enc.c         DES
+
+./crypto/dh/dh.h                DH
+./crypto/dh/dh_check.c          DH
+./crypto/dh/dh_err.c            DH
+./crypto/dh/dh_gen.c            DH
+./crypto/dh/dh_key.c            DH
+./crypto/dh/dh_lib.c            DH
+./crypto/dh/p1024.c             DH
+./crypto/dh/p192.c              DH
+./crypto/dh/p512.c              DH
+./crypto/dh/dhtest.c            DH
+
+./crypto/dsa/dsa.h              DSA
+./crypto/dsa/dsagen.c           DSA
+./crypto/dsa/dsa_err.c          DSA
+./crypto/dsa/dsa_gen.c          DSA
+./crypto/dsa/dsa_key.c          DSA
+./crypto/dsa/dsa_lib.c          DSA
+./crypto/dsa/dsa_sign.c         DSA
+./crypto/dsa/dsa_vrf.c          DSA
+./crypto/dsa/dsatest.c          DSA
+
+./crypto/err/err.c              ERR
+./crypto/err/err.h              ERR
+./crypto/err/err_all.c          ERR
+./crypto/err/err_prn.c          ERR
+
+./crypto/evp/evp.h              EVP
+./crypto/evp/bio_b64.c          EVP
+./crypto/evp/bio_enc.c          EVP
+./crypto/evp/bio_md.c           EVP
+./crypto/evp/c_all.c            EVP
+./crypto/evp/digest.c           EVP
+./crypto/evp/encode.c           EVP
+./crypto/evp/evp_enc.c          EVP
+./crypto/evp/evp_err.c          EVP
+./crypto/evp/evp_key.c          EVP
+./crypto/evp/e_cbc_3d.c         EVP
+./crypto/evp/e_cbc_bf.c         EVP
+./crypto/evp/e_cbc_c.c          EVP
+./crypto/evp/e_cbc_d.c          EVP
+./crypto/evp/e_cbc_i.c          EVP
+./crypto/evp/e_cbc_r2.c         EVP
+./crypto/evp/e_cfb_3d.c         EVP
+./crypto/evp/e_cfb_bf.c         EVP
+./crypto/evp/e_cfb_c.c          EVP
+./crypto/evp/e_cfb_d.c          EVP
+./crypto/evp/e_cfb_i.c          EVP
+./crypto/evp/e_cfb_r2.c         EVP
+./crypto/evp/e_dsa.c            EVP
+./crypto/evp/e_ecb_3d.c         EVP
+./crypto/evp/e_ecb_bf.c         EVP
+./crypto/evp/e_ecb_c.c          EVP
+./crypto/evp/e_ecb_d.c          EVP
+./crypto/evp/e_ecb_i.c          EVP
+./crypto/evp/e_ecb_r2.c         EVP
+./crypto/evp/e_null.c           EVP
+./crypto/evp/e_ofb_3d.c         EVP
+./crypto/evp/e_ofb_bf.c         EVP
+./crypto/evp/e_ofb_c.c          EVP
+./crypto/evp/e_ofb_d.c          EVP
+./crypto/evp/e_ofb_i.c          EVP
+./crypto/evp/e_ofb_r2.c         EVP
+./crypto/evp/e_rc4.c            EVP
+./crypto/evp/e_xcbc_d.c         EVP
+./crypto/evp/m_dss.c            EVP
+./crypto/evp/m_dss1.c           EVP
+./crypto/evp/m_md2.c            EVP
+./crypto/evp/m_md5.c            EVP
+./crypto/evp/m_mdc2.c           EVP
+./crypto/evp/m_null.c           EVP
+./crypto/evp/m_sha.c            EVP
+./crypto/evp/m_sha1.c           EVP
+./crypto/evp/names.c            EVP
+./crypto/evp/p_lib.c            EVP
+./crypto/evp/p_open.c           EVP
+./crypto/evp/p_seal.c           EVP
+./crypto/evp/p_sign.c           EVP
+./crypto/evp/p_verify.c         EVP
+
+./crypto/hmac/hmac.c            HMAC
+./crypto/hmac/hmac.h            HMAC
+./crypto/hmac/hmactest.c        HMAC
+
+./crypto/idea/ideatest.c        IDEA
+./crypto/idea/idea_lcl.h        IDEA
+./crypto/idea/idea_spd.c        IDEA
+./crypto/idea/i_cbc.c           IDEA
+./crypto/idea/i_cfb64.c         IDEA
+./crypto/idea/i_ecb.c           IDEA
+./crypto/idea/i_ofb64.c         IDEA
+./crypto/idea/i_skey.c          IDEA
+./crypto/idea/idea.h            IDEA
+
+./crypto/lhash/lhash.c          LHASH
+./crypto/lhash/lhash.h          LHASH
+./crypto/lhash/lh_stats.c       LHASH
+./crypto/lhash/lh_test.c        LHASH
+
+./crypto/md2/md2.c              MD2
+./crypto/md2/md2test.c          MD2
+./crypto/md2/md2_dgst.c         MD2
+./crypto/md2/md2_one.c          MD2
+./crypto/md2/md2.h              MD2
+
+./crypto/md5/md5.c              MD5
+./crypto/md5/md5.h              MD5
+./crypto/md5/md5test.c          MD5
+./crypto/md5/md5_dgst.c         MD5
+./crypto/md5/md5_locl.h         MD5
+./crypto/md5/md5_one.c          MD5
+
+./crypto/mdc2/mdc2.h            MDC2
+./crypto/mdc2/mdc2dgst.c        MDC2
+./crypto/mdc2/mdc2test.c        MDC2
+./crypto/mdc2/mdc2_one.c        MDC2
+
+./crypto/objects/objects.h      OBJ
+./crypto/objects/obj_dat.c      OBJ
+./crypto/objects/obj_dat.h      OBJ
+./crypto/objects/obj_err.c      OBJ
+./crypto/objects/obj_lib.c      OBJ
+
+./crypto/pem/ctx_size.c         PEM
+./crypto/pem/pem.h              PEM
+./crypto/pem/pem_all.c          PEM
+./crypto/pem/pem_err.c          PEM
+./crypto/pem/pem_info.c         PEM
+./crypto/pem/pem_lib.c          PEM
+./crypto/pem/pem_seal.c         PEM
+./crypto/pem/pem_sign.c         PEM
+
+./crypto/pkcs7/pk7_dgst.c       PKCS7
+./crypto/pkcs7/pk7_doit.c       PKCS7
+./crypto/pkcs7/pk7_enc.c        PKCS7
+./crypto/pkcs7/pk7_lib.c        PKCS7
+./crypto/pkcs7/pkcs7.h          PKCS7
+./crypto/pkcs7/pkcs7err.c       PKCS7
+./crypto/pkcs7/sign.c           PKCS7
+
+./crypto/proxy/bf_proxy.c       PROXY
+./crypto/proxy/p2test.c         PROXY
+./crypto/proxy/p3test.c         PROXY
+./crypto/proxy/paccept.c        PROXY
+./crypto/proxy/proxy.c          PROXY
+./crypto/proxy/proxy.h          PROXY
+./crypto/proxy/ptest.c          PROXY
+./crypto/proxy/pxy_conf.c       PROXY
+./crypto/proxy/pxy_err.c        PROXY
+./crypto/proxy/pxy_txt.c        PROXY
+
+./crypto/rand/md_rand.c         RAND
+./crypto/rand/rand.h            RAND
+./crypto/rand/randfile.c        RAND
+./crypto/rand/randtest.c        RAND
+
+./crypto/rc2/rc2cfb64.c         RC2
+./crypto/rc2/rc2ofb64.c         RC2
+./crypto/rc2/rc2speed.c         RC2
+./crypto/rc2/rc2test.c          RC2
+./crypto/rc2/rc2_cbc.c          RC2
+./crypto/rc2/rc2_ecb.c          RC2
+./crypto/rc2/rc2_locl.h         RC2
+./crypto/rc2/rc2_skey.c         RC2
+./crypto/rc2/rc2.h              RC2
+
+./crypto/rc4/rc4.c              RC4
+./crypto/rc4/rc4speed.c         RC4
+./crypto/rc4/rc4test.c          RC4
+./crypto/rc4/rc4_enc.c          RC4
+./crypto/rc4/rc4_skey.c         RC4
+./crypto/rc4/rc4.h              RC4
+./crypto/rc4/rc4_locl.h         RC4
+
+./crypto/rsa/rsa.h              RSA
+./crypto/rsa/rsa_eay.c          RSA
+./crypto/rsa/rsa_err.c          RSA
+./crypto/rsa/rsa_gen.c          RSA
+./crypto/rsa/rsa_lib.c          RSA
+./crypto/rsa/rsa_saos.c         RSA
+./crypto/rsa/rsa_sign.c         RSA
+./crypto/rsa/rsa_ssl.c          RSA
+./crypto/rsa/rsa_pk1.c          RSA
+./crypto/rsa/rsa_none.c         RSA
+
+./crypto/sha/sha.h              SHA
+./crypto/sha/sha_locl.h         SHA
+./crypto/sha/sha.c              SHA0
+./crypto/sha/sha_dgst.c         SHA0
+./crypto/sha/sha_one.c          SHA0
+./crypto/sha/sha_sgst.c         SHA0
+./crypto/sha/shatest.c          SHA0
+./crypto/sha/sha1.c             SHA1
+./crypto/sha/sha1dgst.c         SHA1
+./crypto/sha/sha1_one.c         SHA1
+./crypto/sha/sha1test.c         SHA1
+
+./crypto/stack/stack.c          STACK
+./crypto/stack/stack.h          STACK
+
+./crypto/txt_db/txt_db.c        TXTDB
+./crypto/txt_db/txt_db.h        TXTDB
+
+./crypto/x509/by_dir.c          X509
+./crypto/x509/by_file.c         X509
+./crypto/x509/v3_net.c          X509
+./crypto/x509/v3_x509.c         X509
+./crypto/x509/x509.h            X509
+./crypto/x509/x509name.c        X509
+./crypto/x509/x509pack.c        X509
+./crypto/x509/x509rset.c        X509
+./crypto/x509/x509type.c        X509
+./crypto/x509/x509_cmp.c        X509
+./crypto/x509/x509_d2.c         X509
+./crypto/x509/x509_def.c        X509
+./crypto/x509/x509_err.c        X509
+./crypto/x509/x509_ext.c        X509
+./crypto/x509/x509_lu.c         X509
+./crypto/x509/x509_obj.c        X509
+./crypto/x509/x509_r2x.c        X509
+./crypto/x509/x509_req.c        X509
+./crypto/x509/x509_set.c        X509
+./crypto/x509/x509_txt.c        X509
+./crypto/x509/x509_v3.c         X509
+./crypto/x509/x509_vfy.c        X509
+./crypto/x509/x_all.c           X509
+./crypto/x509/x509_vfy.h        X509
+./crypto/x509v3/v3_ku.c         X509
+./crypto/x509v3/x509v3.h        X509
+
+./crypto/threads/mttest.c       THREADS
+./crypto/threads/th-lock.c      THREADS
+
+./crypto/ripemd/rmdtest.c       RMD160
+./crypto/ripemd/ripemd.h        RMD160
+./crypto/ripemd/rmdconst.h      RMD160
+./crypto/ripemd/rmd_locl.h      RMD160
+./crypto/ripemd/rmd_one.c       RMD160
+./crypto/ripemd/rmd160.c        RMD160
+./crypto/ripemd/rmd_dgst.c      RMD160
+
+./crypto/rc5/rc5_ecb.c          RC5
+./crypto/rc5/rc5cfb64.c         RC5
+./crypto/rc5/rc5ofb64.c         RC5
+./crypto/rc5/rc5speed.c         RC5
+./crypto/rc5/rc5test.c          RC5
+./crypto/rc5/rc5_enc.c          RC5
+./crypto/rc5/rc5.h              RC5
+./crypto/rc5/rc5_locl.h         RC5
+./crypto/rc5/rc5_skey.c         RC5
+
+./ssl/bio_ssl.c                 SSL
+./ssl/pxy_ssl.c                 SSL
+./ssl/s23_clnt.c                SSL
+./ssl/s23_lib.c                 SSL
+./ssl/s23_meth.c                SSL
+./ssl/s23_pkt.c                 SSL
+./ssl/s23_srvr.c                SSL
+./ssl/s2_clnt.c                 SSL
+./ssl/s2_enc.c                  SSL
+./ssl/s2_lib.c                  SSL
+./ssl/s2_meth.c                 SSL
+./ssl/s2_pkt.c                  SSL
+./ssl/s2_srvr.c                 SSL
+./ssl/s3_both.c                 SSL
+./ssl/s3_clnt.c                 SSL
+./ssl/s3_enc.c                  SSL
+./ssl/s3_lib.c                  SSL
+./ssl/s3_meth.c                 SSL
+./ssl/s3_pkt.c                  SSL
+./ssl/s3_srvr.c                 SSL
+./ssl/ssl.c                     SSL
+./ssl/ssl2.h                    SSL
+./ssl/ssl23.h                   SSL
+./ssl/ssl3.h                    SSL
+./ssl/ssl_algs.c                SSL
+./ssl/ssl_asn1.c                SSL
+./ssl/ssl_cert.c                SSL
+./ssl/ssl_ciph.c                SSL
+./ssl/ssl_err.c                 SSL
+./ssl/ssl_err2.c                SSL
+./ssl/ssl_lib.c                 SSL
+./ssl/ssl_locl.h                SSL
+./ssl/ssl_rsa.c                 SSL
+./ssl/ssl_sess.c                SSL
+./ssl/ssl_stat.c                SSL
+./ssl/ssl_task.c                SSL
+./ssl/ssl_txt.c                 SSL
+./ssl/tls1.h                    SSL
+./ssl/t1_lib.c                  SSL
+./ssl/t1_enc.c                  SSL
+./ssl/t1_meth.c                 SSL
+./ssl/t1_srvr.c                 SSL
+./ssl/t1_clnt.c                 SSL
+./ssl/ssl.h                     SSL
+./ssl/ssltest.c                 SSL
+
+./rsaref/rsaref.c               RSAREF
+./rsaref/rsaref.h               RSAREF
+./rsaref/rsar_err.c             RSAREF
+
+./apps/apps.c                   APPS
+./apps/apps.h                   APPS
+./apps/asn1pars.c               APPS
+./apps/bf_perm.c                APPS
+./apps/bf_perm.h                APPS
+./apps/ca.c                     APPS
+./apps/ciphers.c                APPS
+./apps/crl.c                    APPS
+./apps/crl2p7.c                 APPS
+./apps/dgst.c                   APPS
+./apps/dh.c                     APPS
+./apps/dsa.c                    APPS
+./apps/dsaparam.c               APPS
+./apps/eay.c                    APPS
+./apps/enc.c                    APPS
+./apps/errstr.c                 APPS
+./apps/speed.c                  APPS
+./apps/gendh.c                  APPS
+./apps/gendsa.c                 APPS
+./apps/genrsa.c                 APPS
+./apps/mybio_cb.c               APPS
+./apps/pem_mail.c               APPS
+./apps/pkcs7.c                  APPS
+./apps/progs.h                  APPS
+./apps/req.c                    APPS
+./apps/rsa.c                    APPS
+./apps/sess_id.c                APPS
+./apps/s_apps.h                 APPS
+./apps/s_args.c                 APPS
+./apps/s_cache.c                APPS
+./apps/s_cb.c                   APPS
+./apps/s_client.c               APPS
+./apps/s_eio.c                  APPS
+./apps/s_eio.h                  APPS
+./apps/s_filter.c               APPS
+./apps/s_filter.h               APPS
+./apps/s_server.c               APPS
+./apps/s_socket.c               APPS
+./apps/s_state.c                APPS
+./apps/s_state.h                APPS
+./apps/s_time.c                 APPS
+./apps/testdsa.h                APPS
+./apps/testrsa.h                APPS
+./apps/verify.c                 APPS
+./apps/version.c                APPS
+./apps/x509.c                   APPS
+./apps/ssleay.c                 APPS
+./apps/sp.c                     APPS
+
+./demos/b64.c                   DEMO
+./demos/bio/saccept.c           DEMO
+./demos/bio/sconnect.c          DEMO
+./demos/maurice/example1.c      DEMO
+./demos/maurice/example2.c      DEMO
+./demos/maurice/example3.c      DEMO
+./demos/maurice/example4.c      DEMO
+./demos/maurice/loadkeys.c      DEMO
+./demos/maurice/loadkeys.h      DEMO
+./demos/prime/prime.c           DEMO
+./demos/selfsign.c              DEMO
+./demos/spkigen.c               DEMO
+
diff --git a/src/lib/libssl/src/dep/gen.pl b/src/lib/libssl/src/dep/gen.pl
new file mode 100644
index 0000000000..35490f2794
--- /dev/null
+++ b/src/lib/libssl/src/dep/gen.pl
@@ -0,0 +1,113 @@
+#!/usr/bin/perl
+
+require 'getopts.pl';
+
+$files="files";
+%have=();
+%missing=();
+%name=();
+%func=();
+
+&Getopts('Ff:');
+
+&load_file("files");
+foreach $file (@ARGV)
+        { &do_nm($file); }
+
+if (defined($opt_f))
+        {
+        %a=();
+        $r=&list_files($opt_f,"",*a);
+        if ($opt_F)
+                {
+                foreach (sort split(/\n/,$r))
+                        { print "$_\n"; }
+                }
+        else
+                { print $r; }
+        }
+else
+        {
+        for (sort keys %have)
+                {
+                print "$_:$have{$_}\n";
+                }
+        }
+
+sub list_files
+        {
+        local($f,$o,*done)=@_;
+        local($a,$_,$ff,$ret);
+
+        return if $f =~ /^\s*$/;
+
+        $done{$f}=1;
+        $ret.=$f."\n" if $opt_F;
+        foreach (split(/ /,$have{$f}))
+                {
+                $ret.="$o$f:$_\n" unless $opt_F;
+                }
+
+        foreach (split(/ /,$missing{$f}))
+                {
+                $ff=$func{$_};
+                next if defined($done{$ff});
+                $ret.=&list_files($ff,$o."      ");
+                }
+        $ret;
+        }
+
+sub do_nm
+        {
+        local($file)=@_;
+        local($fname)="";
+
+        open(IN,"nm $file|") || die "unable to run 'nm $file|':$!\n";
+        while (<IN>)
+                {
+                chop;
+                next if /^\s*$/;
+                if (/^(.*)\.o:\s*$/)
+                        {
+                        $fname="$1.c";
+                        next;
+                        }
+                ($type,$name)=/^.{8} (.) (.+)/;
+#               print "$fname $type $name\n";
+
+                if ($type eq "T")
+                        {
+                        $have{$fname}.="$name ";
+                        $func{$name}=$fname;
+                        }
+                elsif ($type eq "U")
+                        {
+                        $missing{$fname}.="$name ";
+                        }
+                }
+        close(IN);
+        }
+
+sub load_file
+        {
+        local($file)=@_;
+
+        open(IN,"<$files") || die "unable to open $files:$!\n";
+
+        while (<IN>)
+                {
+                chop;
+                next if /^\s*$/;
+                ($n)=/\/([^\/\s]+)\s+/;
+                ($fn)=/^(\S+)\s/;
+#               print "$n - $fn\n";
+                if (defined($name{$n}))
+                        { print "$n already exists\n"; }
+                else
+                        { $name{$n}=$fn; }
+                }
+        close(IN);
+        @name=%name;
+        }
+
+
diff --git a/src/lib/libssl/src/dep/ssl.txt b/src/lib/libssl/src/dep/ssl.txt
new file mode 100644
index 0000000000..7cd125a0d1
--- /dev/null
+++ b/src/lib/libssl/src/dep/ssl.txt
@@ -0,0 +1,156 @@
+BIO_f_ssl
+BIO_new_buffer_ssl_connect
+BIO_new_ssl
+BIO_new_ssl_connect
+BIO_proxy_ssl_copy_session_id
+BIO_ssl_copy_session_id
+BIO_ssl_shutdown
+ERR_load_SSL_strings
+SSL_CIPHER_description
+SSL_CIPHER_get_bits
+SSL_CIPHER_get_name
+SSL_CIPHER_get_version
+SSL_CTX_add_client_CA
+SSL_CTX_add_session
+SSL_CTX_check_private_key
+SSL_CTX_ctrl
+SSL_CTX_flush_sessions
+SSL_CTX_free
+SSL_CTX_get_client_CA_list
+SSL_CTX_get_ex_data
+SSL_CTX_get_ex_new_index
+SSL_CTX_get_quiet_shutdown
+SSL_CTX_get_verify_callback
+SSL_CTX_get_verify_mode
+SSL_CTX_load_verify_locations
+SSL_CTX_new
+SSL_CTX_remove_session
+SSL_CTX_set_cert_verify_cb
+SSL_CTX_set_cipher_list
+SSL_CTX_set_client_CA_list
+SSL_CTX_set_default_passwd_cb
+SSL_CTX_set_default_verify_paths
+SSL_CTX_set_ex_data
+SSL_CTX_set_quiet_shutdown
+SSL_CTX_set_ssl_version
+SSL_CTX_set_verify
+SSL_CTX_use_PrivateKey
+SSL_CTX_use_PrivateKey_ASN1
+SSL_CTX_use_PrivateKey_file
+SSL_CTX_use_RSAPrivateKey
+SSL_CTX_use_RSAPrivateKey_ASN1
+SSL_CTX_use_RSAPrivateKey_file
+SSL_CTX_use_certificate
+SSL_CTX_use_certificate_ASN1
+SSL_CTX_use_certificate_file
+SSL_SESSION_cmp
+SSL_SESSION_free
+SSL_SESSION_get_ex_data
+SSL_SESSION_get_ex_new_index
+SSL_SESSION_get_time
+SSL_SESSION_get_timeout
+SSL_SESSION_hash
+SSL_SESSION_new
+SSL_SESSION_print
+SSL_SESSION_print_fp
+SSL_SESSION_set_ex_data
+SSL_SESSION_set_time
+SSL_SESSION_set_timeout
+SSL_accept
+SSL_add_client_CA
+SSL_alert_desc_string
+SSL_alert_desc_string_long
+SSL_alert_type_string
+SSL_alert_type_string_long
+SSL_check_private_key
+SSL_clear
+SSL_connect
+SSL_copy_session_id
+SSL_ctrl
+SSL_do_handshake
+SSL_dup
+SSL_dup_CA_list
+SSL_free
+SSL_get_SSL_CTX
+SSL_get_certificate
+SSL_get_cipher_list
+SSL_get_ciphers
+SSL_get_client_CA_list
+SSL_get_current_cipher
+SSL_get_default_timeout
+SSL_get_error
+SSL_get_ex_data
+SSL_get_ex_new_index
+SSL_get_fd
+SSL_get_info_callback
+SSL_get_peer_cert_chain
+SSL_get_peer_certificate
+SSL_get_privatekey
+SSL_get_quiet_shutdown
+SSL_get_rbio
+SSL_get_read_ahead
+SSL_get_session
+SSL_get_shared_ciphers
+SSL_get_shutdown
+SSL_get_ssl_method
+SSL_get_verify_callback
+SSL_get_verify_mode
+SSL_get_verify_result
+SSL_get_version
+SSL_get_wbio
+SSL_load_client_CA_file
+SSL_load_error_strings
+SSL_new
+SSL_peek
+SSL_pending
+SSL_read
+SSL_renegotiate
+SSL_rstate_string
+SSL_rstate_string_long
+SSL_set_accept_state
+SSL_set_bio
+SSL_set_cipher_list
+SSL_set_client_CA_list
+SSL_set_connect_state
+SSL_set_ex_data
+SSL_set_fd
+SSL_set_info_callback
+SSL_set_quiet_shutdown
+SSL_set_read_ahead
+SSL_set_rfd
+SSL_set_session
+SSL_set_shutdown
+SSL_set_ssl_method
+SSL_set_verify
+SSL_set_verify_result
+SSL_set_wfd
+SSL_shutdown
+SSL_state
+SSL_state_string
+SSL_state_string_long
+SSL_use_PrivateKey
+SSL_use_PrivateKey_ASN1
+SSL_use_PrivateKey_file
+SSL_use_RSAPrivateKey
+SSL_use_RSAPrivateKey_ASN1
+SSL_use_RSAPrivateKey_file
+SSL_use_certificate
+SSL_use_certificate_ASN1
+SSL_use_certificate_file
+SSL_version
+SSL_write
+SSLeay_add_ssl_algorithms
+SSLv23_client_method
+SSLv23_method
+SSLv23_server_method
+SSLv2_client_method
+SSLv2_method
+SSLv2_server_method
+SSLv3_client_method
+SSLv3_method
+SSLv3_server_method
+TLSv1_client_method
+TLSv1_method
+TLSv1_server_method
+d2i_SSL_SESSION
+i2d_SSL_SESSION
diff --git a/src/lib/libssl/src/doc/API.doc b/src/lib/libssl/src/doc/API.doc
new file mode 100644
index 0000000000..fe2820259a
--- /dev/null
+++ b/src/lib/libssl/src/doc/API.doc
@@ -0,0 +1,24 @@
+SSL - SSLv2/v3/v23 etc.
+
+BIO - methods and how they plug together
+
+MEM - memory allocation callback
+
+CRYPTO - locking for threads
+
+EVP - Ciphers/Digests/signatures
+
+RSA - methods
+
+X509 - certificate retrieval
+
+X509 - validation
+
+X509 - X509v3 extensions
+
+Objects - adding object identifiers
+
+ASN.1 - parsing
+
+PEM - parsing
+
diff --git a/src/lib/libssl/src/doc/a_verify.doc b/src/lib/libssl/src/doc/a_verify.doc
new file mode 100644
index 0000000000..06eec17c2b
--- /dev/null
+++ b/src/lib/libssl/src/doc/a_verify.doc
@@ -0,0 +1,85 @@
+From eay@mincom.com Fri Oct  4 18:29:06 1996
+Received: by orb.mincom.oz.au id AA29080
+  (5.65c/IDA-1.4.4 for eay); Fri, 4 Oct 1996 08:29:07 +1000
+Date: Fri, 4 Oct 1996 08:29:06 +1000 (EST)
+From: Eric Young <eay@mincom.oz.au>
+X-Sender: eay@orb
+To: wplatzer <wplatzer@iaik.tu-graz.ac.at>
+Cc: Eric Young <eay@mincom.oz.au>, SSL Mailing List <ssl-users@mincom.com>
+Subject: Re: Netscape's Public Key
+In-Reply-To: <19961003134837.NTM0049@iaik.tu-graz.ac.at>
+Message-Id: <Pine.SOL.3.91.961004081346.8018K-100000@orb>
+Mime-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Status: RO
+X-Status: 
+
+On Thu, 3 Oct 1996, wplatzer wrote:
+> I get Public Key from Netscape (Gold 3.0b4), but cannot do anything
+> with it... It looks like (asn1parse):
+> 
+> 0:d=0 hl=3 l=180 cons: SEQUENCE
+> 3:d=1 hl=2 l= 96 cons: SEQUENCE
+> 5:d=2 hl=2 l= 92 cons: SEQUENCE
+> 7:d=3 hl=2 l= 13 cons: SEQUENCE
+> 9:d=4 hl=2 l= 9 prim: OBJECT :rsaEncryption
+> 20:d=4 hl=2 l= 0 prim: NULL
+> 22:d=3 hl=2 l= 75 prim: BIT STRING
+> 99:d=2 hl=2 l= 0 prim: IA5STRING :
+> 101:d=1 hl=2 l= 13 cons: SEQUENCE
+> 103:d=2 hl=2 l= 9 prim: OBJECT :md5withRSAEncryption
+> 114:d=2 hl=2 l= 0 prim: NULL
+> 116:d=1 hl=2 l= 65 prim: BIT STRING
+> 
+> The first BIT STRING is the public key and the second BIT STRING is 
+> the signature.
+> But a public key consists of the public exponent and the modulus. Are 
+> both numbers in the first BIT STRING?
+> Is there a document simply describing this coding stuff (checking 
+> signature, get the public key, etc.)?
+
+Minimal in SSLeay.  If you want to see what the modulus and exponent are,
+try asn1parse -offset 25 -length 75 <key.pem
+asn1parse will currently stuff up on the 'length 75' part (fixed in next 
+release) but it will print the stuff.  If you are after more 
+documentation on ASN.1, have a look at www.rsa.com and get their PKCS 
+documents, most of my initial work on SSLeay was done using them.
+
+As for SSLeay,
+util/crypto.num and util/ssl.num are lists of all exported functions in 
+the library (but not macros :-(.
+
+The ones for extracting public keys from certificates and certificate 
+requests are EVP_PKEY *      X509_REQ_extract_key(X509_REQ *req);
+EVP_PKEY *      X509_extract_key(X509 *x509);
+
+To verify a signature on a signed ASN.1 object
+int X509_verify(X509 *a,EVP_PKEY *key);
+int X509_REQ_verify(X509_REQ *a,EVP_PKEY *key);
+int X509_CRL_verify(X509_CRL *a,EVP_PKEY *key);
+int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a,EVP_PKEY *key);
+
+I should mention that EVP_PKEY can be used to hold a public or a private key,
+since for  things like RSA and DSS, a public key is just a subset of what 
+is stored for the private key.
+
+To sign any of the above structures
+
+int X509_sign(X509 *a,EVP_PKEY *key,EVP_MD *md);
+int X509_REQ_sign(X509_REQ *a,EVP_PKEY *key,EVP_MD *md);
+int X509_CRL_sign(X509_CRL *a,EVP_PKEY *key,EVP_MD *md);
+int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *a,EVP_PKEY *key,EVP_MD *md);
+
+where md is the message digest to sign with.
+
+There are all defined in x509.h and all the _sign and _verify functions are
+actually macros to the ASN1_sign() and ASN1_verify() functions.
+These functions will put the correct algorithm identifiers in the correct 
+places in the structures.
+
+eric
+--
+Eric Young                  | BOOL is tri-state according to Bill Gates.
+AARNet: eay@mincom.oz.au    | RTFM Win32 GetMessage().
+
+
diff --git a/src/lib/libssl/src/doc/apps.doc b/src/lib/libssl/src/doc/apps.doc
new file mode 100644
index 0000000000..a2a4e0de72
--- /dev/null
+++ b/src/lib/libssl/src/doc/apps.doc
@@ -0,0 +1,53 @@
+The applications
+
+Ok, where to begin....
+In the begining, when SSLeay was small (April 1995), there
+were but few applications, they did happily cohabit in
+the one bin directory.  Then over time, they did multiply and grow,
+and they started to look like microsoft software; 500k to print 'hello world'.
+A new approach was needed.  They were coalessed into one 'Monolithic'
+application, ssleay.  This one program is composed of many programs that
+can all be compiled independantly.
+
+ssleay has 3 modes of operation.
+1) If the ssleay binaray has the name of one of its component programs, it
+executes that program and then exits.  This can be achieve by using hard or
+symbolic links, or failing that, just renaming the binary.
+2) If the first argument to ssleay is the name of one of the component
+programs, that program runs that program and then exits.
+3) If there are no arguments, ssleay enters a 'command' mode.  Each line is
+interpreted as a program name plus arguments.  After each 'program' is run,
+ssleay returns to the comand line.
+
+dgst    - message digests
+enc     - encryption and base64 encoding
+
+ans1parse - 'pulls' appart ASN.1 encoded objects like certificates.
+
+dh      - Diffle-Hellman parameter manipulation.
+rsa     - RSA manipulations.
+crl     - Certificate revokion list manipulations
+x509    - X509 cert fiddles, including signing.
+pkcs7   - pkcs7 manipulation, only DER versions right now.
+
+genrsa  - generate an RSA private key.
+gendh   - Generate a set of Diffle-Hellman parameters.
+req     - Generate a PKCS#10 object, a certificate request.
+
+s_client - SSL client program
+s_server - SSL server program
+s_time   - A SSL protocol timing program
+s_mult   - Another SSL server, but it multiplexes
+           connections.
+s_filter - under development
+
+errstr  - Convert SSLeay error numbers to strings.
+ca      - Sign certificate requests, and generate
+          certificate revokion lists
+crl2pkcs7 - put a crl and certifcates into a pkcs7 object.
+speed   - Benchmark the ciphers.
+verify  - Check certificates
+hashdir - under development
+
+[ there a now a few more options, play with the program to see what they
+  are ]
diff --git a/src/lib/libssl/src/doc/asn1.doc b/src/lib/libssl/src/doc/asn1.doc
new file mode 100644
index 0000000000..fdad17c05c
--- /dev/null
+++ b/src/lib/libssl/src/doc/asn1.doc
@@ -0,0 +1,401 @@
+The ASN.1 Routines.
+
+ASN.1 is a specification for how to encode structured 'data' in binary form.
+The approach I have take to the manipulation of structures and their encoding
+into ASN.1 is as follows.
+
+For each distinct structure there are 4 function of the following form
+TYPE *TYPE_new(void);
+void TYPE_free(TYPE *);
+TYPE *d2i_TYPE(TYPE **a,unsigned char **pp,long length);
+long i2d_TYPE(TYPE *a,unsigned char **pp);      /* CHECK RETURN VALUE */
+
+where TYPE is the type of the 'object'.  The TYPE that have these functions
+can be in one of 2 forms, either the internal C malloc()ed data structure
+or in the DER (a variant of ASN.1 encoding) binary encoding which is just
+an array of unsigned bytes.  The 'i2d' functions converts from the internal
+form to the DER form and the 'd2i' functions convert from the DER form to
+the internal form.
+
+The 'new' function returns a malloc()ed version of the structure with all
+substructures either created or left as NULL pointers.  For 'optional'
+fields, they are normally left as NULL to indicate no value.  For variable
+size sub structures (often 'SET OF' or 'SEQUENCE OF' in ASN.1 syntax) the
+STACK data type is used to hold the values.  Have a read of stack.doc
+and have a look at the relevant header files to see what I mean.  If there
+is an error while malloc()ing the structure, NULL is returned.
+
+The 'free' function will free() all the sub components of a particular
+structure.  If any of those sub components have been 'removed', replace
+them with NULL pointers, the 'free' functions are tolerant of NULL fields.
+
+The 'd2i' function copies a binary representation into a C structure.  It
+operates as follows.  'a' is a pointer to a pointer to
+the structure to populate, 'pp' is a pointer to a pointer to where the DER
+byte string is located and 'length' is the length of the '*pp' data.
+If there are no errors, a pointer to the populated structure is returned.
+If there is an error, NULL is returned.  Errors can occur because of
+malloc() failures but normally they will be due to syntax errors in the DER
+encoded data being parsed. It is also an error if there was an
+attempt to read more that 'length' bytes from '*p'.  If
+everything works correctly, the value in '*p' is updated
+to point at the location just beyond where the DER
+structure was read from.  In this way, chained calls to 'd2i' type
+functions can be made, with the pointer into the 'data' array being
+'walked' along the input byte array.
+Depending on the value passed for 'a', different things will be done.  If
+'a' is NULL, a new structure will be malloc()ed and returned.  If '*a' is
+NULL, a new structure will be malloc()ed and put into '*a' and returned.
+If '*a' is not NULL, the structure in '*a' will be populated, or in the
+case of an error, free()ed and then returned.
+Having these semantics means that a structure
+can call a 'd2i' function to populate a field and if the field is currently
+NULL, the structure will be created.
+
+The 'i2d' function type is used to copy a C structure to a byte array.
+The parameter 'a' is the structure to convert and '*p' is where to put it.
+As for the 'd2i' type structure, 'p' is updated to point after the last
+byte written.  If p is NULL, no data is written.  The function also returns
+the number of bytes written.  Where this becomes useful is that if the
+function is called with a NULL 'p' value, the length is returned.  This can
+then be used to malloc() an array of bytes and then the same function can
+be recalled passing the malloced array to be written to. e.g.
+
+int len;
+unsigned char *bytes,*p;
+len=i2d_X509(x,NULL);   /* get the size of the ASN1 encoding of 'x' */
+if ((bytes=(unsigned char *)malloc(len)) == NULL)
+        goto err;
+p=bytes;
+i2d_X509(x,&p);
+
+Please note that a new variable, 'p' was passed to i2d_X509.  After the
+call to i2d_X509 p has been incremented by len bytes.
+
+Now the reason for this functional organisation is that it allows nested
+structures to be built up by calling these functions as required.  There
+are various macros used to help write the general 'i2d', 'd2i', 'new' and
+'free' functions.  They are discussed in another file and would only be
+used by some-one wanting to add new structures to the library.  As you
+might be able to guess, the process of writing ASN.1 files can be a bit CPU
+expensive for complex structures.  I'm willing to live with this since the
+simpler library code make my life easier and hopefully most programs using
+these routines will have their execution profiles dominated by cipher or
+message digest routines.
+What follows is a list of 'TYPE' values and the corresponding ASN.1
+structure and where it is used.
+
+TYPE                    ASN.1
+ASN1_INTEGER            INTEGER
+ASN1_BIT_STRING         BIT STRING
+ASN1_OCTET_STRING       OCTET STRING
+ASN1_OBJECT             OBJECT IDENTIFIER
+ASN1_PRINTABLESTRING    PrintableString
+ASN1_T61STRING          T61String
+ASN1_IA5STRING          IA5String
+ASN1_UTCTIME            UTCTime
+ASN1_TYPE               Any of the above mentioned types plus SEQUENCE and SET
+
+Most of the above mentioned types are actualled stored in the
+ASN1_BIT_STRING type and macros are used to differentiate between them.
+The 3 types used are
+
+typedef struct asn1_object_st
+        {
+        /* both null if a dynamic ASN1_OBJECT, one is
+         * defined if a 'static' ASN1_OBJECT */
+        char *sn,*ln;
+        int nid;
+        int length;
+        unsigned char *data;
+        } ASN1_OBJECT;
+This is used to store ASN1 OBJECTS.  Read 'objects.doc' for details ono
+routines to manipulate this structure.  'sn' and 'ln' are used to hold text
+strings that represent the object (short name and long or lower case name).
+These are used by the 'OBJ' library.  'nid' is a number used by the OBJ
+library to uniquely identify objects.  The ASN1 routines will populate the
+'length' and 'data' fields which will contain the bit string representing
+the object.
+
+typedef struct asn1_bit_string_st
+        {
+        int length;
+        int type;
+        unsigned char *data;
+        } ASN1_BIT_STRING;
+This structure is used to hold all the other base ASN1 types except for
+ASN1_UTCTIME (which is really just a 'char *').  Length is the number of
+bytes held in data and type is the ASN1 type of the object (there is a list
+in asn1.h).
+
+typedef struct asn1_type_st
+        {
+        int type;
+        union   {
+                char *ptr;
+                ASN1_INTEGER *          integer;
+                ASN1_BIT_STRING *       bit_string;
+                ASN1_OCTET_STRING *     octet_string;
+                ASN1_OBJECT *           object;
+                ASN1_PRINTABLESTRING *  printablestring;
+                ASN1_T61STRING *        t61string;
+                ASN1_IA5STRING *        ia5string;
+                ASN1_UTCTIME *          utctime;
+                ASN1_BIT_STRING *       set;
+                ASN1_BIT_STRING *       sequence;
+                } value;
+        } ASN1_TYPE;
+This structure is used in a few places when 'any' type of object can be
+expected.
+
+X509                    Certificate
+X509_CINF               CertificateInfo
+X509_ALGOR              AlgorithmIdentifier
+X509_NAME               Name                    
+X509_NAME_ENTRY         A single sub component of the name.
+X509_VAL                Validity
+X509_PUBKEY             SubjectPublicKeyInfo
+The above mentioned types are declared in x509.h. They are all quite
+straight forward except for the X509_NAME/X509_NAME_ENTRY pair.
+A X509_NAME is a STACK (see stack.doc) of X509_NAME_ENTRY's.
+typedef struct X509_name_entry_st
+        {
+        ASN1_OBJECT *object;
+        ASN1_BIT_STRING *value;
+        int set;
+        int size;       /* temp variable */
+        } X509_NAME_ENTRY;
+The size is a temporary variable used by i2d_NAME and set is the set number
+for the particular NAME_ENTRY.  A X509_NAME is encoded as a sequence of
+sequence of sets.  Normally each set contains only a single item.
+Sometimes it contains more.  Normally throughout this library there will be
+only one item per set.  The set field contains the 'set' that this entry is
+a member of.  So if you have just created a X509_NAME structure and
+populated it with X509_NAME_ENTRYs, you should then traverse the X509_NAME
+(which is just a STACK) and set the 'set/' field to incrementing numbers.
+For more details on why this is done, read the ASN.1 spec for Distinguished
+Names.
+
+X509_REQ                CertificateRequest
+X509_REQ_INFO           CertificateRequestInfo
+These are used to hold certificate requests.
+
+X509_CRL                CertificateRevocationList
+These are used to hold a certificate revocation list
+
+RSAPrivateKey           PrivateKeyInfo
+RSAPublicKey            PublicKeyInfo
+Both these 'function groups' operate on 'RSA' structures (see rsa.doc).
+The difference is that the RSAPublicKey operations only manipulate the m
+and e fields in the RSA structure.
+
+DSAPrivateKey           DSS private key
+DSAPublicKey            DSS public key
+Both these 'function groups' operate on 'DSS' structures (see dsa.doc).
+The difference is that the RSAPublicKey operations only manipulate the 
+XXX fields in the DSA structure.
+
+DHparams                DHParameter
+This is used to hold the p and g value for The Diffie-Hellman operation.
+The function deal with the 'DH' strucure (see dh.doc).
+
+Now all of these function types can be used with several other functions to give
+quite useful set of general manipulation routines.  Normally one would
+not uses these functions directly but use them via macros. 
+
+char *ASN1_dup(int (*i2d)(),char *(*d2i)(),char *x);
+'x' is the input structure case to a 'char *', 'i2d' is the 'i2d_TYPE'
+function for the type that 'x' is and d2i is the 'd2i_TYPE' function for the
+type that 'x' is.  As is obvious from the parameters, this function
+duplicates the strucutre by transforming it into the DER form and then
+re-loading it into a new strucutre and returning the new strucutre.  This
+is obviously a bit cpu intensive but when faced with a complex dynamic
+structure this is the simplest programming approach.  There are macros for
+duplicating the major data types but is simple to add extras.
+
+char *ASN1_d2i_fp(char *(*new)(),char *(*d2i)(),FILE *fp,unsigned char **x);
+'x' is a pointer to a pointer of the 'desired type'.  new and d2i are the
+corresponding 'TYPE_new' and 'd2i_TYPE' functions for the type and 'fp' is
+an open file pointer to read from.  This function reads from 'fp' as much
+data as it can and then uses 'd2i' to parse the bytes to load and return
+the parsed strucutre in 'x' (if it was non-NULL) and to actually return the
+strucutre.  The behavior of 'x' is as per all the other d2i functions.
+
+char *ASN1_d2i_bio(char *(*new)(),char *(*d2i)(),BIO *fp,unsigned char **x);
+The 'BIO' is the new IO type being used in SSLeay (see bio.doc).  This
+function is the same as ASN1_d2i_fp() except for the BIO argument.
+ASN1_d2i_fp() actually calls this function.
+
+int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x);
+'x' is converted to bytes by 'i2d' and then written to 'out'.  ASN1_i2d_fp
+and ASN1_d2i_fp are not really symetric since ASN1_i2d_fp will read all
+available data from the file pointer before parsing a single item while
+ASN1_i2d_fp can be used to write a sequence of data objects.  To read a
+series of objects from a file I would sugest loading the file into a buffer
+and calling the relevent 'd2i' functions.
+
+char *ASN1_d2i_bio(char *(*new)(),char *(*d2i)(),BIO *fp,unsigned char **x);
+This function is the same as ASN1_i2d_fp() except for the BIO argument.
+ASN1_i2d_fp() actually calls this function.
+
+char *  PEM_ASN1_read(char *(*d2i)(),char *name,FILE *fp,char **x,int (*cb)());
+This function will read the next PEM encoded (base64) object of the same
+type as 'x' (loaded by the d2i function).  'name' is the name that is in
+the '-----BEGIN name-----' that designates the start of that object type.
+If the data is encrypted, 'cb' will be called to prompt for a password.  If
+it is NULL a default function will be used to prompt from the password.
+'x' is delt with as per the standard 'd2i' function interface.  This
+function can be used to read a series of objects from a file.  While any
+data type can be encrypted (see PEM_ASN1_write) only RSA private keys tend
+to be encrypted.
+
+char *  PEM_ASN1_read_bio(char *(*d2i)(),char *name,BIO *fp,
+        char **x,int (*cb)());
+Same as PEM_ASN1_read() except using a BIO.  This is called by
+PEM_ASN1_read().
+
+int     PEM_ASN1_write(int (*i2d)(),char *name,FILE *fp,char *x,EVP_CIPHER *enc,
+                unsigned char *kstr,int klen,int (*callback)());
+
+int     PEM_ASN1_write_bio(int (*i2d)(),char *name,BIO *fp,
+                char *x,EVP_CIPHER *enc,unsigned char *kstr,int klen,
+                int (*callback)());
+
+int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
+        ASN1_BIT_STRING *signature, char *data, RSA *rsa, EVP_MD *type);
+int ASN1_verify(int (*i2d)(), X509_ALGOR *algor1,
+        ASN1_BIT_STRING *signature,char *data, RSA *rsa);
+
+int ASN1_BIT_STRING_cmp(ASN1_BIT_STRING *a, ASN1_BIT_STRING *b);
+ASN1_BIT_STRING *ASN1_BIT_STRING_type_new(int type );
+
+int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
+void ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
+ASN1_UTCTIME *ASN1_UTCTIME_dup(ASN1_UTCTIME *a);
+
+ASN1_BIT_STRING *d2i_asn1_print_type(ASN1_BIT_STRING **a,unsigned char **pp,
+                long length,int type);
+
+int             i2d_ASN1_SET(STACK *a, unsigned char **pp,
+                        int (*func)(), int ex_tag, int ex_class);
+STACK *         d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,
+                        char *(*func)(), int ex_tag, int ex_class);
+
+int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *object);
+int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
+int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
+
+int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);
+long ASN1_INTEGER_get(ASN1_INTEGER *a);
+ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai);
+BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai,BIGNUM *bn);
+
+/* given a string, return the correct type.  Max is the maximum number
+ * of bytes to parse.  It stops parsing when 'max' bytes have been
+ * processed or a '\0' is hit */
+int ASN1_PRINTABLE_type(unsigned char *s,int max);
+
+void ASN1_parse(BIO *fp,unsigned char *pp,long len);
+
+int i2d_ASN1_bytes(ASN1_BIT_STRING *a, unsigned char **pp, int tag, int class);
+ASN1_BIT_STRING *d2i_ASN1_bytes(ASN1_OCTET_STRING **a, unsigned char **pp,
+        long length, int Ptag, int Pclass);
+
+/* PARSING */
+int asn1_Finish(ASN1_CTX *c);
+
+/* SPECIALS */
+int ASN1_get_object(unsigned char **pp, long *plength, int *ptag,
+        int *pclass, long omax);
+int ASN1_check_infinite_end(unsigned char **p,long len);
+void ASN1_put_object(unsigned char **pp, int constructed, int length,
+        int tag, int class);
+int ASN1_object_size(int constructed, int length, int tag);
+
+X509 *  X509_get_cert(CERTIFICATE_CTX *ctx,X509_NAME * name,X509 *tmp_x509);
+int     X509_add_cert(CERTIFICATE_CTX *ctx,X509 *);
+
+char *  X509_cert_verify_error_string(int n);
+int     X509_add_cert_file(CERTIFICATE_CTX *c,char *file, int type);
+char *  X509_gmtime (char *s, long adj);
+int     X509_add_cert_dir (CERTIFICATE_CTX *c,char *dir, int type);
+int     X509_load_verify_locations (CERTIFICATE_CTX *ctx,
+                char *file_env, char *dir_env);
+int     X509_set_default_verify_paths(CERTIFICATE_CTX *cts);
+X509 *  X509_new_D2i_X509(int len, unsigned char *p);
+char *  X509_get_default_cert_area(void );
+char *  X509_get_default_cert_dir(void );
+char *  X509_get_default_cert_file(void );
+char *  X509_get_default_cert_dir_env(void );
+char *  X509_get_default_cert_file_env(void );
+char *  X509_get_default_private_dir(void );
+X509_REQ *X509_X509_TO_req(X509 *x, RSA *rsa);
+int     X509_cert_verify(CERTIFICATE_CTX *ctx,X509 *xs, int (*cb)()); 
+
+CERTIFICATE_CTX *CERTIFICATE_CTX_new();
+void CERTIFICATE_CTX_free(CERTIFICATE_CTX *c);
+
+void X509_NAME_print(BIO *fp, X509_NAME *name, int obase);
+int             X509_print_fp(FILE *fp,X509 *x);
+int             X509_print(BIO *fp,X509 *x);
+
+X509_INFO *     X509_INFO_new(void);
+void            X509_INFO_free(X509_INFO *a);
+
+char *          X509_NAME_oneline(X509_NAME *a);
+
+#define X509_verify(x,rsa)
+#define X509_REQ_verify(x,rsa)
+#define X509_CRL_verify(x,rsa)
+
+#define X509_sign(x,rsa,md)
+#define X509_REQ_sign(x,rsa,md)
+#define X509_CRL_sign(x,rsa,md)
+
+#define X509_dup(x509)
+#define d2i_X509_fp(fp,x509)
+#define i2d_X509_fp(fp,x509)
+#define d2i_X509_bio(bp,x509)
+#define i2d_X509_bio(bp,x509)
+
+#define X509_CRL_dup(crl)
+#define d2i_X509_CRL_fp(fp,crl)
+#define i2d_X509_CRL_fp(fp,crl)
+#define d2i_X509_CRL_bio(bp,crl)
+#define i2d_X509_CRL_bio(bp,crl)
+
+#define X509_REQ_dup(req)
+#define d2i_X509_REQ_fp(fp,req)
+#define i2d_X509_REQ_fp(fp,req)
+#define d2i_X509_REQ_bio(bp,req)
+#define i2d_X509_REQ_bio(bp,req)
+
+#define RSAPrivateKey_dup(rsa)
+#define d2i_RSAPrivateKey_fp(fp,rsa)
+#define i2d_RSAPrivateKey_fp(fp,rsa)
+#define d2i_RSAPrivateKey_bio(bp,rsa)
+#define i2d_RSAPrivateKey_bio(bp,rsa)
+
+#define X509_NAME_dup(xn)
+#define X509_NAME_ENTRY_dup(ne)
+
+void X509_REQ_print_fp(FILE *fp,X509_REQ *req);
+void X509_REQ_print(BIO *fp,X509_REQ *req);
+
+RSA *X509_REQ_extract_key(X509_REQ *req);
+RSA *X509_extract_key(X509 *x509);
+
+int             X509_issuer_and_serial_cmp(X509 *a, X509 *b);
+unsigned long   X509_issuer_and_serial_hash(X509 *a);
+
+X509_NAME *     X509_get_issuer_name(X509 *a);
+int             X509_issuer_name_cmp(X509 *a, X509 *b);
+unsigned long   X509_issuer_name_hash(X509 *a);
+
+X509_NAME *     X509_get_subject_name(X509 *a);
+int             X509_subject_name_cmp(X509 *a,X509 *b);
+unsigned long   X509_subject_name_hash(X509 *x);
+
+int             X509_NAME_cmp (X509_NAME *a, X509_NAME *b);
+unsigned long   X509_NAME_hash(X509_NAME *x);
+
diff --git a/src/lib/libssl/src/doc/bio.doc b/src/lib/libssl/src/doc/bio.doc
new file mode 100644
index 0000000000..545a57cdff
--- /dev/null
+++ b/src/lib/libssl/src/doc/bio.doc
@@ -0,0 +1,423 @@
+BIO Routines
+
+This documentation is rather sparse, you are probably best 
+off looking at the code for specific details.
+
+The BIO library is a IO abstraction that was originally 
+inspired by the need to have callbacks to perform IO to FILE 
+pointers when using Windows 3.1 DLLs.  There are two types 
+of BIO; a source/sink type and a filter type.
+The source/sink methods are as follows:
+-       BIO_s_mem()  memory buffer - a read/write byte array that
+        grows until memory runs out :-).
+-       BIO_s_file()  FILE pointer - A wrapper around the normal 
+        'FILE *' commands, good for use with stdin/stdout.
+-       BIO_s_fd()  File descriptor - A wrapper around file 
+        descriptors, often used with pipes.
+-       BIO_s_socket()  Socket - Used around sockets.  It is 
+        mostly in the Microsoft world that sockets are different 
+        from file descriptors and there are all those ugly winsock 
+        commands.
+-       BIO_s_null()  Null - read nothing and write nothing.; a 
+        useful endpoint for filter type BIO's specifically things 
+        like the message digest BIO.
+
+The filter types are
+-       BIO_f_buffer()  IO buffering - does output buffering into 
+        larger chunks and performs input buffering to allow gets() 
+        type functions.
+-       BIO_f_md()  Message digest - a transparent filter that can 
+        be asked to return a message digest for the data that has 
+        passed through it.
+-       BIO_f_cipher()  Encrypt or decrypt all data passing 
+        through the filter.
+-       BIO_f_base64()  Base64 decode on read and encode on write.
+-       BIO_f_ssl()  A filter that performs SSL encryption on the 
+        data sent through it.
+
+Base BIO functions.
+The BIO library has a set of base functions that are 
+implemented for each particular type.  Filter BIOs will 
+normally call the equivalent function on the source/sink BIO 
+that they are layered on top of after they have performed 
+some modification to the data stream.  Multiple filter BIOs 
+can be 'push' into a stack of modifers, so to read from a 
+file, unbase64 it, then decrypt it, a BIO_f_cipher, 
+BIO_f_base64 and a BIO_s_file would probably be used.  If a 
+sha-1 and md5 message digest needed to be generated, a stack 
+two BIO_f_md() BIOs and a BIO_s_null() BIO could be used.
+The base functions are
+-       BIO *BIO_new(BIO_METHOD *type); Create  a new BIO of  type 'type'.
+-       int BIO_free(BIO *a); Free a BIO structure.  Depending on 
+        the configuration, this will free the underlying data 
+        object for a source/sink BIO.
+-       int BIO_read(BIO *b, char *data, int len); Read upto 'len' 
+        bytes into 'data'. 
+-       int BIO_gets(BIO *bp,char *buf, int size); Depending on 
+        the BIO, this can either be a 'get special' or a get one 
+        line of data, as per fgets();
+-       int BIO_write(BIO *b, char *data, int len); Write 'len' 
+        bytes from 'data' to the 'b' BIO.
+-       int BIO_puts(BIO *bp,char *buf); Either a 'put special' or 
+        a write null terminated string as per fputs().
+-       long BIO_ctrl(BIO *bp,int cmd,long larg,char *parg);  A 
+        control function which is used to manipulate the BIO 
+        structure and modify it's state and or report on it.  This 
+        function is just about never used directly, rather it 
+        should be used in conjunction with BIO_METHOD specific 
+        macros.
+-       BIO *BIO_push(BIO *new_top, BIO *old); new_top is apped to the
+        top of the 'old' BIO list.  new_top should be a filter BIO.
+        All writes will go through 'new_top' first and last on read.
+        'old' is returned.
+-       BIO *BIO_pop(BIO *bio); the new topmost BIO is returned, NULL if
+        there are no more.
+
+If a particular low level BIO method is not supported 
+(normally BIO_gets()), -2 will be returned if that method is 
+called.  Otherwise the IO methods (read, write, gets, puts) 
+will return the number of bytes read or written, and 0 or -1 
+for error (or end of input).  For the -1 case, 
+BIO_should_retry(bio) can be called to determine if it was a 
+genuine error or a temporary problem.  -2 will also be 
+returned if the BIO has not been initalised yet, in all 
+cases, the correct error codes are set (accessible via the 
+ERR library).
+
+
+The following functions are convenience functions:
+-       int BIO_printf(BIO *bio, char * format, ..);  printf but 
+        to a BIO handle.
+-       long BIO_ctrl_int(BIO *bp,int cmd,long larg,int iarg); a 
+        convenience function to allow a different argument types 
+        to be passed to BIO_ctrl().
+-       int BIO_dump(BIO *b,char *bytes,int len); output 'len' 
+        bytes from 'bytes' in a hex dump debug format.
+-       long BIO_debug_callback(BIO *bio, int cmd, char *argp, int 
+        argi, long argl, long ret) - a default debug BIO callback, 
+        this is mentioned below.  To use this one normally has to 
+        use the BIO_set_callback_arg() function to assign an 
+        output BIO for the callback to use.
+-       BIO *BIO_find_type(BIO *bio,int type); when there is a 'stack'
+        of BIOs, this function scan the list and returns the first
+        that is of type 'type', as listed in buffer.h under BIO_TYPE_XXX.
+-       void BIO_free_all(BIO *bio); Free the bio and all other BIOs
+        in the list.  It walks the bio->next_bio list.
+
+
+
+Extra commands are normally implemented as macros calling BIO_ctrl().
+-       BIO_number_read(BIO *bio) - the number of bytes processed 
+        by BIO_read(bio,.).
+-       BIO_number_written(BIO *bio) - the number of bytes written 
+        by BIO_write(bio,.).
+-       BIO_reset(BIO *bio) - 'reset' the BIO.
+-       BIO_eof(BIO *bio) - non zero if we are at the current end 
+        of input.
+-       BIO_set_close(BIO *bio, int close_flag) - set the close flag.
+-       BIO_get_close(BIO *bio) - return the close flag.
+        BIO_pending(BIO *bio) - return the number of bytes waiting 
+        to be read (normally buffered internally).
+-       BIO_flush(BIO *bio) - output any data waiting to be output.
+-       BIO_should_retry(BIO *io) - after a BIO_read/BIO_write 
+        operation returns 0 or -1, a call to this function will 
+        return non zero if you should retry the call later (this 
+        is for non-blocking IO).
+-       BIO_should_read(BIO *io) - we should retry when data can 
+        be read.
+-       BIO_should_write(BIO *io) - we should retry when data can 
+        be written.
+-       BIO_method_name(BIO *io) - return a string for the method name.
+-       BIO_method_type(BIO *io) - return the unique ID of the BIO method.
+-       BIO_set_callback(BIO *io,  long (*callback)(BIO *io, int 
+        cmd, char *argp, int argi, long argl, long ret); - sets 
+        the debug callback.
+-       BIO_get_callback(BIO *io) - return the assigned function 
+        as mentioned above.
+-       BIO_set_callback_arg(BIO *io, char *arg)  - assign some 
+        data against the BIO.  This is normally used by the debug 
+        callback but could in reality be used for anything.  To 
+        get an idea of how all this works, have a look at the code 
+        in the default debug callback mentioned above.  The 
+        callback can modify the return values.
+
+Details of the BIO_METHOD structure.
+typedef struct bio_method_st
+        {
+        int type;
+        char *name;
+        int (*bwrite)();
+        int (*bread)();
+        int (*bputs)();
+        int (*bgets)();
+        long (*ctrl)();
+        int (*create)();
+        int (*destroy)();
+        } BIO_METHOD;
+
+The 'type' is the numeric type of the BIO, these are listed in buffer.h;
+'Name' is a textual representation of the BIO 'type'.
+The 7 function pointers point to the respective function 
+methods, some of which can be NULL if not implemented.
+The BIO structure
+typedef struct bio_st
+        {
+        BIO_METHOD *method;
+        long (*callback)(BIO * bio, int mode, char *argp, int 
+                argi, long argl, long ret);
+        char *cb_arg; /* first argument for the callback */
+        int init;
+        int shutdown;
+        int flags;      /* extra storage */
+        int num;
+        char *ptr;
+        struct bio_st *next_bio; /* used by filter BIOs */
+        int references;
+        unsigned long num_read;
+        unsigned long num_write;
+        } BIO;
+
+-       'Method' is the BIO method.
+-       'callback', when configured, is called before and after 
+        each BIO method is called for that particular BIO.  This 
+        is intended primarily for debugging and of informational feedback.
+-       'init' is 0 when the BIO can be used for operation.  
+        Often, after a BIO is created, a number of operations may 
+        need to be performed before it is available for use.  An 
+        example is for BIO_s_sock().  A socket needs to be 
+        assigned to the BIO before it can be used.
+-       'shutdown', this flag indicates if the underlying 
+        comunication primative being used should be closed/freed 
+        when the BIO is closed.
+-       'flags' is used to hold extra state.  It is primarily used 
+        to hold information about why a non-blocking operation 
+        failed and to record startup protocol information for the 
+        SSL BIO.
+-       'num' and 'ptr' are used to hold instance specific state 
+        like file descriptors or local data structures.
+-       'next_bio' is used by filter BIOs to hold the pointer of the
+        next BIO in the chain. written data is sent to this BIO and
+        data read is taken from it.
+-       'references' is used to indicate the number of pointers to 
+        this structure.  This needs to be '1' before a call to 
+        BIO_free() is made if the BIO_free() function is to 
+        actually free() the structure, otherwise the reference 
+        count is just decreased.  The actual BIO subsystem does 
+        not really use this functionality but it is useful when 
+        used in more advanced applicaion.
+-       num_read and num_write are the total number of bytes 
+        read/written via the 'read()' and 'write()' methods.
+
+BIO_ctrl operations.
+The following is the list of standard commands passed as the 
+second parameter to BIO_ctrl() and should be supported by 
+all BIO as best as possible.  Some are optional, some are 
+manditory, in any case, where is makes sense, a filter BIO 
+should pass such requests to underlying BIO's.
+-       BIO_CTRL_RESET  - Reset the BIO back to an initial state.
+-       BIO_CTRL_EOF    - return 0 if we are not at the end of input, 
+        non 0 if we are.
+-       BIO_CTRL_INFO   - BIO specific special command, normal
+        information return.
+-       BIO_CTRL_SET    - set IO specific parameter.
+-       BIO_CTRL_GET    - get IO specific parameter.
+-       BIO_CTRL_GET_CLOSE - Get the close on BIO_free() flag, one 
+        of BIO_CLOSE or BIO_NOCLOSE.
+-       BIO_CTRL_SET_CLOSE - Set the close on BIO_free() flag.
+-       BIO_CTRL_PENDING - Return the number of bytes available 
+        for instant reading
+-       BIO_CTRL_FLUSH  - Output pending data, return number of bytes output.
+-       BIO_CTRL_SHOULD_RETRY - After an IO error (-1 returned) 
+        should we 'retry' when IO is possible on the underlying IO object.
+-       BIO_CTRL_RETRY_TYPE - What kind of IO are we waiting on.
+
+The following command is a special BIO_s_file() specific option.
+-       BIO_CTRL_SET_FILENAME - specify a file to open for IO.
+
+The BIO_CTRL_RETRY_TYPE needs a little more explanation.  
+When performing non-blocking IO, or say reading on a memory 
+BIO, when no data is present (or cannot be written), 
+BIO_read() and/or BIO_write() will return -1.  
+BIO_should_retry(bio) will return true if this is due to an 
+IO condition rather than an actual error.  In the case of 
+BIO_s_mem(), a read when there is no data will return -1 and 
+a should retry when there is more 'read' data.
+The retry type is deduced from 2 macros
+BIO_should_read(bio) and BIO_should_write(bio).
+Now while it may appear obvious that a BIO_read() failure 
+should indicate that a retry should be performed when more 
+read data is available, this is often not true when using 
+things like an SSL BIO.  During the SSL protocol startup 
+multiple reads and writes are performed, triggered by any 
+SSL_read or SSL_write.
+So to write code that will transparently handle either a 
+socket or SSL BIO,
+        i=BIO_read(bio,..)
+        if (I == -1)
+                {
+                if (BIO_should_retry(bio))
+                        {
+                        if (BIO_should_read(bio))
+                                {
+                                /* call us again when BIO can be read */
+                                }
+                        if (BIO_should_write(bio))
+                                {
+                                /* call us again when BIO can be written */
+                                }
+                        }
+                }
+
+At this point in time only read and write conditions can be 
+used but in the future I can see the situation for other 
+conditions, specifically with SSL there could be a condition 
+of a X509 certificate lookup taking place and so the non-
+blocking BIO_read would require a retry when the certificate 
+lookup subsystem has finished it's lookup.  This is all 
+makes more sense and is easy to use in a event loop type 
+setup.
+When using the SSL BIO, either SSL_read() or SSL_write()s 
+can be called during the protocol startup and things will 
+still work correctly.
+The nice aspect of the use of the BIO_should_retry() macro 
+is that all the errno codes that indicate a non-fatal error 
+are encapsulated in one place.  The Windows specific error 
+codes and WSAGetLastError() calls are also hidden from the 
+application.
+
+Notes on each BIO method.
+Normally buffer.h is just required but depending on the 
+BIO_METHOD, ssl.h or evp.h will also be required.
+
+BIO_METHOD *BIO_s_mem(void);
+-       BIO_set_mem_buf(BIO *bio, BUF_MEM *bm, int close_flag) - 
+        set the underlying BUF_MEM structure for the BIO to use.
+-       BIO_get_mem_ptr(BIO *bio, char **pp) - if pp is not NULL, 
+        set it to point to the memory array and return the number 
+        of bytes available.
+A read/write BIO.  Any data written is appended to the 
+memory array and any read is read from the front.  This BIO 
+can be used for read/write at the same time. BIO_gets() is 
+supported in the fgets() sense.
+BIO_CTRL_INFO can be used to retrieve pointers to the memory 
+buffer and it's length.
+
+BIO_METHOD *BIO_s_file(void);
+-       BIO_set_fp(BIO *bio, FILE *fp, int close_flag) - set 'FILE *' to use.
+-       BIO_get_fp(BIO *bio, FILE **fp) - get the 'FILE *' in use.
+-       BIO_read_filename(BIO *bio, char *name) - read from file.
+-       BIO_write_filename(BIO *bio, char *name) - write to file.
+-       BIO_append_filename(BIO *bio, char *name) - append to file.
+This BIO sits over the normal system fread()/fgets() type 
+functions. Gets() is supported.  This BIO in theory could be 
+used for read and write but it is best to think of each BIO 
+of this type as either a read or a write BIO, not both.
+
+BIO_METHOD *BIO_s_socket(void);
+BIO_METHOD *BIO_s_fd(void);
+-       BIO_sock_should_retry(int i) - the underlying function 
+        used to determine if a call should be retried; the 
+        argument is the '0' or '-1' returned by the previous BIO 
+        operation.
+-       BIO_fd_should_retry(int i) - same as the 
+-       BIO_sock_should_retry() except that it is different internally.
+-       BIO_set_fd(BIO *bio, int fd, int close_flag) - set the 
+        file descriptor to use
+-       BIO_get_fd(BIO *bio, int *fd) - get the file descriptor.
+These two methods are very similar.  Gets() is not 
+supported, if you want this functionality, put a 
+BIO_f_buffer() onto it.  This BIO is bi-directional if the 
+underlying file descriptor is.  This is normally the case 
+for sockets but not the case for stdio descriptors.
+
+BIO_METHOD *BIO_s_null(void);
+Read and write as much data as you like, it all disappears 
+into this BIO.
+
+BIO_METHOD *BIO_f_buffer(void);
+-       BIO_get_buffer_num_lines(BIO *bio) - return the number of 
+        complete lines in the buffer.
+-       BIO_set_buffer_size(BIO *bio, long size) - set the size of 
+        the buffers.
+This type performs input and output buffering.  It performs 
+both at the same time.  The size of the buffer can be set 
+via the set buffer size option.  Data buffered for output is 
+only written when the buffer fills.
+
+BIO_METHOD *BIO_f_ssl(void);
+-       BIO_set_ssl(BIO *bio, SSL *ssl, int close_flag) - the SSL 
+        structure to use.
+-       BIO_get_ssl(BIO *bio, SSL **ssl) - get the SSL structure 
+        in use.
+The SSL bio is a little different from normal BIOs because 
+the underlying SSL structure is a little different.  A SSL 
+structure performs IO via a read and write BIO.  These can 
+be different and are normally set via the
+SSL_set_rbio()/SSL_set_wbio() calls.  The SSL_set_fd() calls 
+are just wrappers that create socket BIOs and then call 
+SSL_set_bio() where the read and write BIOs are the same.  
+The BIO_push() operation makes the SSLs IO BIOs the same, so 
+make sure the BIO pushed is capable of two directional 
+traffic.  If it is not, you will have to install the BIOs 
+via the more conventional SSL_set_bio() call.  BIO_pop() will retrieve
+the 'SSL read' BIO.
+
+BIO_METHOD *BIO_f_md(void);
+-       BIO_set_md(BIO *bio, EVP_MD *md) - set the message digest 
+        to use.
+-       BIO_get_md(BIO *bio, EVP_MD **mdp) - return the digest 
+        method in use in mdp, return 0 if not set yet.
+-       BIO_reset() reinitializes the digest (EVP_DigestInit()) 
+        and passes the reset to the underlying BIOs.
+All data read or written via BIO_read() or BIO_write() to 
+this BIO will be added to the calculated digest.  This 
+implies that this BIO is only one directional.  If read and 
+write operations are performed, two separate BIO_f_md() BIOs 
+are reuqired to generate digests on both the input and the 
+output.  BIO_gets(BIO *bio, char *md, int size) will place the 
+generated digest into 'md' and return the number of bytes.  
+The EVP_MAX_MD_SIZE should probably be used to size the 'md' 
+array.  Reading the digest will also reset it.
+
+BIO_METHOD *BIO_f_cipher(void);
+-       BIO_reset() reinitializes the cipher.
+-       BIO_flush() should be called when the last bytes have been 
+        output to flush the final block of block ciphers.
+-       BIO_get_cipher_status(BIO *b), when called after the last 
+        read from a cipher BIO, returns non-zero if the data 
+        decrypted correctly, otherwise, 0.
+-       BIO_set_cipher(BIO *b, EVP_CIPHER *c, unsigned char *key, 
+        unsigned char *iv, int encrypt)   This function is used to 
+        setup a cipher BIO.  The length of key and iv are 
+        specified by the choice of EVP_CIPHER.  Encrypt is 1 to 
+        encrypt and 0 to decrypt.
+
+BIO_METHOD *BIO_f_base64(void);
+-       BIO_flush() should be called when the last bytes have been output.
+This BIO base64 encodes when writing and base64 decodes when 
+reading.  It will scan the input until a suitable begin line 
+is found.  After reading data, BIO_reset() will reset the 
+BIO to start scanning again.  Do not mix reading and writing 
+on the same base64 BIO.  It is meant as a single stream BIO.
+
+Directions      type
+both            BIO_s_mem()
+one/both        BIO_s_file()
+both            BIO_s_fd()
+both            BIO_s_socket() 
+both            BIO_s_null()
+both            BIO_f_buffer()
+one             BIO_f_md()  
+one             BIO_f_cipher()  
+one             BIO_f_base64()  
+both            BIO_f_ssl()
+
+It is easy to mix one and two directional BIOs, all one has 
+to do is to keep two separate BIO pointers for reading and 
+writing and be careful about usage of underlying BIOs.  The 
+SSL bio by it's very nature has to be two directional but 
+the BIO_push() command will push the one BIO into the SSL 
+BIO for both reading and writing.
+
+The best example program to look at is apps/enc.c and/or perhaps apps/dgst.c.
+
diff --git a/src/lib/libssl/src/doc/blowfish.doc b/src/lib/libssl/src/doc/blowfish.doc
new file mode 100644
index 0000000000..8a7f425b32
--- /dev/null
+++ b/src/lib/libssl/src/doc/blowfish.doc
@@ -0,0 +1,146 @@
+The Blowfish library.
+
+Blowfish is a block cipher that operates on 64bit (8 byte) quantities.  It
+uses variable size key, but 128bit (16 byte) key would normally be considered
+good.  It can be used in all the modes that DES can be used.  This
+library implements the ecb, cbc, cfb64, ofb64 modes.
+
+Blowfish is quite a bit faster that DES, and much faster than IDEA or
+RC2.  It is one of the faster block ciphers.
+
+For all calls that have an 'input' and 'output' variables, they can be the
+same.
+
+This library requires the inclusion of 'blowfish.h'.
+
+All of the encryption functions take what is called an BF_KEY as an 
+argument.  An BF_KEY is an expanded form of the Blowfish key.
+For all modes of the Blowfish algorithm, the BF_KEY used for
+decryption is the same one that was used for encryption.
+
+The define BF_ENCRYPT is passed to specify encryption for the functions
+that require an encryption/decryption flag. BF_DECRYPT is passed to
+specify decryption.
+
+Please note that any of the encryption modes specified in my DES library
+could be used with Blowfish.  I have only implemented ecb, cbc, cfb64 and
+ofb64 for the following reasons.
+- ecb is the basic Blowfish encryption.
+- cbc is the normal 'chaining' form for block ciphers.
+- cfb64 can be used to encrypt single characters, therefore input and output
+  do not need to be a multiple of 8.
+- ofb64 is similar to cfb64 but is more like a stream cipher, not as
+  secure (not cipher feedback) but it does not have an encrypt/decrypt mode.
+- If you want triple Blowfish, thats 384 bits of key and you must be totally
+  obsessed with security.  Still, if you want it, it is simple enough to
+  copy the function from the DES library and change the des_encrypt to
+  BF_encrypt; an exercise left for the paranoid reader :-).
+
+The functions are as follows:
+
+void BF_set_key(
+BF_KEY *ks;
+int len;
+unsigned char *key;
+        BF_set_key converts an 'len' byte key into a BF_KEY.
+        A 'ks' is an expanded form of the 'key' which is used to
+        perform actual encryption.  It can be regenerated from the Blowfish key
+        so it only needs to be kept when encryption or decryption is about
+        to occur.  Don't save or pass around BF_KEY's since they
+        are CPU architecture dependent, 'key's are not.  Blowfish is an
+        interesting cipher in that it can be used with a variable length
+        key.  'len' is the length of 'key' to be used as the key.
+        A 'len' of 16 is recomended by me, but blowfish can use upto
+        72 bytes.  As a warning, blowfish has a very very slow set_key
+        function, it actually runs BF_encrypt 521 times.
+        
+void BF_encrypt(unsigned long *data, BF_KEY *key);
+void BF_decrypt(unsigned long *data, BF_KEY *key);
+        These are the Blowfish encryption function that gets called by just
+        about every other Blowfish routine in the library.  You should not
+        use this function except to implement 'modes' of Blowfish.
+        I say this because the
+        functions that call this routine do the conversion from 'char *' to
+        long, and this needs to be done to make sure 'non-aligned' memory
+        access do not occur.
+        Data is a pointer to 2 unsigned long's and key is the
+        BF_KEY to use. 
+
+void BF_ecb_encrypt(
+unsigned char *in,
+unsigned char *out,
+BF_KEY *key,
+int encrypt);
+        This is the basic Electronic Code Book form of Blowfish (in DES this
+        mode is called Electronic Code Book so I'm going to use the term
+        for blowfish as well.
+        Input is encrypted into output using the key represented by
+        key.  Depending on the encrypt, encryption or
+        decryption occurs.  Input is 8 bytes long and output is 8 bytes.
+        
+void BF_cbc_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+BF_KEY *ks,
+unsigned char *ivec,
+int encrypt);
+        This routine implements Blowfish in Cipher Block Chaining mode.
+        Input, which should be a multiple of 8 bytes is encrypted
+        (or decrypted) to output which will also be a multiple of 8 bytes.
+        The number of bytes is in length (and from what I've said above,
+        should be a multiple of 8).  If length is not a multiple of 8, bad 
+        things will probably happen.  ivec is the initialisation vector.
+        This function updates iv after each call so that it can be passed to
+        the next call to BF_cbc_encrypt().
+        
+void BF_cfb64_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+BF_KEY *schedule,
+unsigned char *ivec,
+int *num,
+int encrypt);
+        This is one of the more useful functions in this Blowfish library, it
+        implements CFB mode of Blowfish with 64bit feedback.
+        This allows you to encrypt an arbitrary number of bytes,
+        you do not require 8 byte padding.  Each call to this
+        routine will encrypt the input bytes to output and then update ivec
+        and num.  Num contains 'how far' we are though ivec.
+        'Encrypt' is used to indicate encryption or decryption.
+        CFB64 mode operates by using the cipher to generate a stream
+        of bytes which is used to encrypt the plain text.
+        The cipher text is then encrypted to generate the next 64 bits to
+        be xored (incrementally) with the next 64 bits of plain
+        text.  As can be seen from this, to encrypt or decrypt,
+        the same 'cipher stream' needs to be generated but the way the next
+        block of data is gathered for encryption is different for
+        encryption and decryption.
+        
+void BF_ofb64_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+BF_KEY *schedule,
+unsigned char *ivec,
+int *num);
+        This functions implements OFB mode of Blowfish with 64bit feedback.
+        This allows you to encrypt an arbitrary number of bytes,
+        you do not require 8 byte padding.  Each call to this
+        routine will encrypt the input bytes to output and then update ivec
+        and num.  Num contains 'how far' we are though ivec.
+        This is in effect a stream cipher, there is no encryption or
+        decryption mode.
+        
+For reading passwords, I suggest using des_read_pw_string() from my DES library.
+To generate a password from a text string, I suggest using MD5 (or MD2) to
+produce a 16 byte message digest that can then be passed directly to
+BF_set_key().
+
+=====
+For more information about the specific Blowfish modes in this library
+(ecb, cbc, cfb and ofb), read the section entitled 'Modes of DES' from the
+documentation on my DES library.  What is said about DES is directly
+applicable for Blowfish.
+
diff --git a/src/lib/libssl/src/doc/bn.doc b/src/lib/libssl/src/doc/bn.doc
new file mode 100644
index 0000000000..47be23b6ea
--- /dev/null
+++ b/src/lib/libssl/src/doc/bn.doc
@@ -0,0 +1,381 @@
+The Big Number library.
+
+#include "bn.h" when using this library.
+
+This big number library was written for use in implementing the RSA and DH
+public key encryption algorithms.  As such, features such as negative
+numbers have not been extensively tested but they should work as expected.
+This library uses dynamic memory allocation for storing its data structures
+and so there are no limit on the size of the numbers manipulated by these
+routines but there is always the requirement to check return codes from
+functions just in case a memory allocation error has occurred.
+
+The basic object in this library is a BIGNUM.  It is used to hold a single
+large integer.  This type should be considered opaque and fields should not
+be modified or accessed directly.
+typedef struct bignum_st
+        {
+        int top;        /* Index of last used d. */
+        BN_ULONG *d;    /* Pointer to an array of 'BITS2' bit chunks. */
+        int max;        /* Size of the d array. */
+        int neg;
+        } BIGNUM;
+The big number is stored in a malloced array of BN_ULONG's.  A BN_ULONG can
+be either 16, 32 or 64 bits in size, depending on the 'number of  bits'
+specified in bn.h. 
+The 'd' field is this array.  'max' is the size of the 'd' array that has
+been allocated.  'top' is the 'last' entry being used, so for a value of 4,
+bn.d[0]=4 and bn.top=1.  'neg' is 1 if the number is negative.
+When a BIGNUM is '0', the 'd' field can be NULL and top == 0.
+
+Various routines in this library require the use of 'temporary' BIGNUM
+variables during their execution.  Due to the use of dynamic memory
+allocation to create BIGNUMs being rather expensive when used in
+conjunction with repeated subroutine calls, the BN_CTX structure is
+used.  This structure contains BN_CTX BIGNUMs.  BN_CTX
+is the maximum number of temporary BIGNUMs any publicly exported 
+function will use.
+
+#define BN_CTX  12
+typedef struct bignum_ctx
+        {
+        int tos;                        /* top of stack */
+        BIGNUM *bn[BN_CTX];     /* The variables */
+        } BN_CTX;
+
+The functions that follow have been grouped according to function.  Most
+arithmetic functions return a result in the first argument, sometimes this
+first argument can also be an input parameter, sometimes it cannot.  These
+restrictions are documented.
+
+extern BIGNUM *BN_value_one;
+There is one variable defined by this library, a BIGNUM which contains the
+number 1.  This variable is useful for use in comparisons and assignment.
+
+Get Size functions.
+
+int BN_num_bits(BIGNUM *a);
+        This function returns the size of 'a' in bits.
+        
+int BN_num_bytes(BIGNUM *a);
+        This function (macro) returns the size of 'a' in bytes.
+        For conversion of BIGNUMs to byte streams, this is the number of
+        bytes the output string will occupy.  If the output byte
+        format specifies that the 'top' bit indicates if the number is
+        signed, so an extra '0' byte is required if the top bit on a
+        positive number is being written, it is upto the application to
+        make this adjustment.  Like I said at the start, I don't
+        really support negative numbers :-).
+
+Creation/Destruction routines.
+
+BIGNUM *BN_new();
+        Return a new BIGNUM object.  The number initially has a value of 0.  If
+        there is an error, NULL is returned.
+        
+void    BN_free(BIGNUM *a);
+        Free()s a BIGNUM.
+        
+void    BN_clear(BIGNUM *a);
+        Sets 'a' to a value of 0 and also zeros all unused allocated
+        memory.  This function is used to clear a variable of 'sensitive'
+        data that was held in it.
+        
+void    BN_clear_free(BIGNUM *a);
+        This function zeros the memory used by 'a' and then free()'s it.
+        This function should be used to BN_free() BIGNUMS that have held
+        sensitive numeric values like RSA private key values.  Both this
+        function and BN_clear tend to only be used by RSA and DH routines.
+
+BN_CTX *BN_CTX_new(void);
+        Returns a new BN_CTX.  NULL on error.
+        
+void    BN_CTX_free(BN_CTX *c);
+        Free a BN_CTX structure.  The BIGNUMs in 'c' are BN_clear_free()ed.
+        
+BIGNUM *bn_expand(BIGNUM *b, int bits);
+        This is an internal function that should not normally be used.  It
+        ensures that 'b' has enough room for a 'bits' bit number.  It is
+        mostly used by the various BIGNUM routines.  If there is an error,
+        NULL is returned. if not, 'b' is returned.
+        
+BIGNUM *BN_copy(BIGNUM *to, BIGNUM *from);
+        The 'from' is copied into 'to'.  NULL is returned if there is an
+        error, otherwise 'to' is returned.
+
+BIGNUM *BN_dup(BIGNUM *a);
+        A new BIGNUM is created and returned containing the value of 'a'.
+        NULL is returned on error.
+
+Comparison and Test Functions.
+
+int BN_is_zero(BIGNUM *a)
+        Return 1 if 'a' is zero, else 0.
+
+int BN_is_one(a)
+        Return 1 is 'a' is one, else 0.
+
+int BN_is_word(a,w)
+        Return 1 if 'a' == w, else 0.  'w' is a BN_ULONG.
+
+int BN_cmp(BIGNUM *a, BIGNUM *b);
+        Return -1 if 'a' is less than 'b', 0 if 'a' and 'b' are the same
+        and 1 is 'a' is greater than 'b'.  This is a signed comparison.
+        
+int BN_ucmp(BIGNUM *a, BIGNUM *b);
+        This function is the same as BN_cmp except that the comparison
+        ignores the sign of the numbers.
+        
+Arithmetic Functions
+For all of these functions, 0 is returned if there is an error and 1 is
+returned for success.  The return value should always be checked.  eg.
+if (!BN_add(r,a,b)) goto err;
+Unless explicitly mentioned, the 'return' value can be one of the
+'parameters' to the function.
+
+int BN_add(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+        Add 'a' and 'b' and return the result in 'r'.  This is r=a+b.
+        
+int BN_sub(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+        Subtract 'a' from 'b' and put the result in 'r'. This is r=a-b.
+        
+int BN_lshift(BIGNUM *r, BIGNUM *a, int n);
+        Shift 'a' left by 'n' bits.  This is r=a*(2^n).
+        
+int BN_lshift1(BIGNUM *r, BIGNUM *a);
+        Shift 'a' left by 1 bit.  This form is more efficient than
+        BN_lshift(r,a,1).  This is r=a*2.
+        
+int BN_rshift(BIGNUM *r, BIGNUM *a, int n);
+        Shift 'a' right by 'n' bits.  This is r=int(a/(2^n)).
+        
+int BN_rshift1(BIGNUM *r, BIGNUM *a);
+        Shift 'a' right by 1 bit.  This form is more efficient than
+        BN_rshift(r,a,1).  This is r=int(a/2).
+        
+int BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b);
+        Multiply a by b and return the result in 'r'. 'r' must not be
+        either 'a' or 'b'.  It has to be a different BIGNUM.
+        This is r=a*b.
+
+int BN_sqr(BIGNUM *r, BIGNUM *a, BN_CTX *ctx);
+        Multiply a by a and return the result in 'r'. 'r' must not be
+        'a'.  This function is alot faster than BN_mul(r,a,a).  This is r=a*a.
+
+int BN_div(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BIGNUM *d, BN_CTX *ctx);
+        Divide 'm' by 'd' and return the result in 'dv' and the remainder
+        in 'rem'.  Either of 'dv' or 'rem' can be NULL in which case that
+        value is not returned.  'ctx' needs to be passed as a source of
+        temporary BIGNUM variables.
+        This is dv=int(m/d), rem=m%d.
+        
+int BN_mod(BIGNUM *rem, BIGNUM *m, BIGNUM *d, BN_CTX *ctx);
+        Find the remainder of 'm' divided by 'd' and return it in 'rem'.
+        'ctx' holds the temporary BIGNUMs required by this function.
+        This function is more efficient than BN_div(NULL,rem,m,d,ctx);
+        This is rem=m%d.
+
+int BN_mod_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BIGNUM *m,BN_CTX *ctx);
+        Multiply 'a' by 'b' and return the remainder when divided by 'm'.
+        'ctx' holds the temporary BIGNUMs required by this function.
+        This is r=(a*b)%m.
+
+int BN_mod_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,BN_CTX *ctx);
+        Raise 'a' to the 'p' power and return the remainder when divided by
+        'm'.  'ctx' holds the temporary BIGNUMs required by this function.
+        This is r=(a^p)%m.
+
+int BN_reciprocal(BIGNUM *r, BIGNUM *m, BN_CTX *ctx);
+        Return the reciprocal of 'm'.  'ctx' holds the temporary variables
+        required.  This function returns -1 on error, otherwise it returns
+        the number of bits 'r' is shifted left to make 'r' into an integer.
+        This number of bits shifted is required in BN_mod_mul_reciprocal().
+        This is r=(1/m)<<(BN_num_bits(m)+1).
+        
+int BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *x, BIGNUM *y, BIGNUM *m, 
+        BIGNUM *i, int nb, BN_CTX *ctx);
+        This function is used to perform an efficient BN_mod_mul()
+        operation.  If one is going to repeatedly perform BN_mod_mul() with
+        the same modulus is worth calculating the reciprocal of the modulus
+        and then using this function.  This operation uses the fact that
+        a/b == a*r where r is the reciprocal of b.  On modern computers
+        multiplication is very fast and big number division is very slow.
+        'x' is multiplied by 'y' and then divided by 'm' and the remainder
+        is returned.  'i' is the reciprocal of 'm' and 'nb' is the number
+        of bits as returned from BN_reciprocal().  Normal usage is as follows.
+        bn=BN_reciprocal(i,m);
+        for (...)
+                { BN_mod_mul_reciprocal(r,x,y,m,i,bn,ctx); }
+        This is r=(x*y)%m.  Internally it is approximately
+        r=(x*y)-m*(x*y/m) or r=(x*y)-m*((x*y*i) >> bn)
+        This function is used in BN_mod_exp() and BN_is_prime().
+
+Assignment Operations
+
+int BN_one(BIGNUM *a)
+        Set 'a' to hold the value one.
+        This is a=1.
+        
+int BN_zero(BIGNUM *a)
+        Set 'a' to hold the value zero.
+        This is a=0.
+        
+int BN_set_word(BIGNUM *a, unsigned long w);
+        Set 'a' to hold the value of 'w'.  'w' is an unsigned long.
+        This is a=w.
+
+unsigned long BN_get_word(BIGNUM *a);
+        Returns 'a' in an unsigned long.  Not remarkably, often 'a' will
+        be biger than a word, in which case 0xffffffffL is returned.
+
+Word Operations
+These functions are much more efficient that the normal bignum arithmetic
+operations.
+
+BN_ULONG BN_mod_word(BIGNUM *a, unsigned long w);
+        Return the remainder of 'a' divided by 'w'.
+        This is return(a%w).
+        
+int BN_add_word(BIGNUM *a, unsigned long w);
+        Add 'w' to 'a'.  This function does not take the sign of 'a' into
+        account.  This is a+=w;
+        
+Bit operations.
+
+int BN_is_bit_set(BIGNUM *a, int n);
+        This function return 1 if bit 'n' is set in 'a' else 0.
+
+int BN_set_bit(BIGNUM *a, int n);
+        This function sets bit 'n' to 1 in 'a'. 
+        This is a&= ~(1<<n);
+
+int BN_clear_bit(BIGNUM *a, int n);
+        This function sets bit 'n' to zero in 'a'.  Return 0 if less
+        than 'n' bits in 'a' else 1.  This is a&= ~(1<<n);
+
+int BN_mask_bits(BIGNUM *a, int n);
+        Truncate 'a' to n bits long.  This is a&= ~((~0)<<n)
+
+Format conversion routines.
+
+BIGNUM *BN_bin2bn(unsigned char *s, int len,BIGNUM *ret);
+        This function converts 'len' bytes in 's' into a BIGNUM which
+        is put in 'ret'.  If ret is NULL, a new BIGNUM is created.
+        Either this new BIGNUM or ret is returned.  The number is
+        assumed to be in bigendian form in 's'.  By this I mean that
+        to 'ret' is created as follows for 'len' == 5.
+        ret = s[0]*2^32 + s[1]*2^24 + s[2]*2^16 + s[3]*2^8 + s[4];
+        This function cannot be used to convert negative numbers.  It
+        is always assumed the number is positive.  The application
+        needs to diddle the 'neg' field of th BIGNUM its self.
+        The better solution would be to save the numbers in ASN.1 format
+        since this is a defined standard for storing big numbers.
+        Look at the functions
+
+        ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai);
+        BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai,BIGNUM *bn);
+        int i2d_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);
+        ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a,unsigned char **pp,
+                long length;
+
+int BN_bn2bin(BIGNUM *a, unsigned char *to);
+        This function converts 'a' to a byte string which is put into
+        'to'.  The representation is big-endian in that the most
+        significant byte of 'a' is put into to[0].  This function
+        returns the number of bytes used to hold 'a'.  BN_num_bytes(a)
+        would return the same value and can be used to determine how
+        large 'to' needs to be.  If the number is negative, this
+        information is lost.  Since this library was written to
+        manipulate large positive integers, the inability to save and
+        restore them is not considered to be a problem by me :-).
+        As for BN_bin2bn(), look at the ASN.1 integer encoding funtions
+        for SSLeay.  They use BN_bin2bn() and BN_bn2bin() internally.
+        
+char *BN_bn2ascii(BIGNUM *a);
+        This function returns a malloc()ed string that contains the
+        ascii hexadecimal encoding of 'a'.  The number is in bigendian
+        format with a '-' in front if the number is negative.
+
+int BN_ascii2bn(BIGNUM **bn, char *a);
+        The inverse of BN_bn2ascii.  The function returns the number of
+        characters from 'a' were processed in generating a the bignum.
+        error is inticated by 0 being returned.  The number is a
+        hex digit string, optionally with a leading '-'.  If *bn
+        is null, a BIGNUM is created and returned via that variable.
+        
+int BN_print_fp(FILE *fp, BIGNUM *a);
+        'a' is printed to file pointer 'fp'.  It is in the same format
+        that is output from BN_bn2ascii().  0 is returned on error,
+        1 if things are ok.
+
+int BN_print(BIO *bp, BIGNUM *a);
+        Same as BN_print except that the output is done to the SSLeay libraries
+        BIO routines.  BN_print_fp() actually calls this function.
+
+Miscellaneous Routines.
+
+int BN_rand(BIGNUM *rnd, int bits, int top, int bottom);
+        This function returns in 'rnd' a random BIGNUM that is bits
+        long.  If bottom is 1, the number returned is odd.  If top is set,
+        the top 2 bits of the number are set.  This is useful because if
+        this is set, 2 'n; bit numbers multiplied together will return a 2n
+        bit number.  If top was not set, they could produce a 2n-1 bit
+        number.
+
+BIGNUM *BN_mod_inverse(BIGNUM *a, BIGNUM *n,BN_CTX *ctx);
+        This function create a new BIGNUM and returns it.  This number
+        is the inverse mod 'n' of 'a'.  By this it is meant that the
+        returned value 'r' satisfies (a*r)%n == 1.  This function is
+        used in the generation of RSA keys.  'ctx', as per usual,
+        is used to hold temporary variables that are required by the
+        function.  NULL is returned on error.
+
+int BN_gcd(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_CTX *ctx);
+        'r' has the greatest common divisor of 'a' and 'b'.  'ctx' is
+        used for temporary variables and 0 is returned on error.
+
+int BN_is_prime(BIGNUM *p,int nchecks,void (*callback)(),BN_CTX *ctx,
+        char *cb_arg);
+        This function is used to check if a BIGNUM ('p') is prime.
+        It performs this test by using the Miller-Rabin randomised
+        primality test.  This is a probalistic test that requires a
+        number of rounds to ensure the number is prime to a high
+        degree of probability.  Since this can take quite some time, a
+        callback function can be passed and it will be called each
+        time 'p' passes a round of the prime testing.  'callback' will
+        be called as follows, callback(1,n,cb_arg) where n is the number of
+        the round, just passed.  As per usual 'ctx' contains temporary
+        variables used.  If ctx is NULL, it does not matter, a local version
+        will be malloced.  This parameter is present to save some mallocing
+        inside the function but probably could be removed.
+        0 is returned on error.
+        'ncheck' is the number of Miller-Rabin tests to run.  It is
+        suggested to use the value 'BN_prime_checks' by default.
+
+BIGNUM *BN_generate_prime(
+int bits,
+int strong,
+BIGNUM *a,
+BIGNUM *rems,
+void (*callback)());
+char *cb_arg
+        This function is used to generate prime numbers.  It returns a
+        new BIGNUM that has a high probability of being a prime.
+        'bits' is the number of bits that
+        are to be in the prime.  If 'strong' is true, the returned prime
+        will also be a strong prime ((p-1)/2 is also prime).
+        While searching for the prime ('p'), we
+        can add the requirement that the prime fill the following
+        condition p%a == rem.  This can be used to help search for
+        primes with specific features, which is required when looking
+        for primes suitable for use with certain 'g' values in the
+        Diffie-Hellman key exchange algorithm.  If 'a' is NULL,
+        this condition is not checked.  If rem is NULL, rem is assumed
+        to be 1.  Since this search for a prime
+        can take quite some time, if callback is not NULL, it is called
+        in the following situations.
+        We have a suspected prime (from a quick sieve),
+        callback(0,sus_prime++,cb_arg). Each item to be passed to BN_is_prime().
+        callback(1,round++,cb_arg).  Each successful 'round' in BN_is_prime().
+        callback(2,round,cb_arg). For each successful BN_is_prime() test.
+
diff --git a/src/lib/libssl/src/doc/ca.1 b/src/lib/libssl/src/doc/ca.1
new file mode 100644
index 0000000000..5b0c5a198d
--- /dev/null
+++ b/src/lib/libssl/src/doc/ca.1
@@ -0,0 +1,121 @@
+From eay@orb.mincom.oz.au Thu Dec 28 23:56:45 1995
+Received: by orb.mincom.oz.au id AA07374
+  (5.65c/IDA-1.4.4 for eay); Thu, 28 Dec 1995 13:56:45 +1000
+Date: Thu, 28 Dec 1995 13:56:45 +1000 (EST)
+From: Eric Young <eay@mincom.oz.au>
+X-Sender: eay@orb
+To: sameer <sameer@c2.org>
+Cc: ssleay@mincom.oz.au
+Subject: Re: 'ca'
+In-Reply-To: <199512230440.UAA23410@infinity.c2.org>
+Message-Id: <Pine.SOL.3.91.951228133525.7269A-100000@orb>
+Mime-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Status: RO
+X-Status: 
+
+On Fri, 22 Dec 1995, sameer wrote:
+>       I could use documentation on 'ca'. Thanks.
+
+Very quickly.
+The ca program uses the ssleay.conf file for most of its configuration
+
+./ca -help
+
+ -verbose        - Talk alot while doing things
+ -config file    - A config file. If you don't want to use the
+                   default config file
+ -name arg       - The particular CA definition to use
+        In the config file, the section to use for parameters.  This lets 
+        multiple setups to be contained in the one file.  By default, the 
+        default_ca variable is looked up in the [ ca ] section.  So in the 
+        shipped ssleay.conf, the CA definition used is CA_default.  It could be 
+        any other name.
+ -gencrl days    - Generate a new CRL, days is when the next CRL is due
+        This will generate a new certificate revocion list.
+ -days arg       - number of days to certify the certificate for
+        When certifiying certificates, this is the number of days to use.
+ -md arg         - md to use, one of md2, md5, sha or sha1
+ -policy arg     - The CA 'policy' to support
+        I'll describe this later, but there are 2 policies definied in the 
+        shipped ssleay.conf
+ -keyfile arg    - PEM RSA private key file
+ -key arg        - key to decode the RSA private key if it is encrypted
+        since we need to keep the CA's RSA key encrypted
+ -cert           - The CA certificate
+ -in file        - The input PEM encoded certificate request(s)
+ -out file       - Where to put the output file(s)
+ -outdir dir     - Where to put output certificates
+        The -out options concatinates all the output certificied
+        certificates to one file, -outdir puts them in a directory,
+        named by serial number.
+ -infiles ....   - The last argument, requests to process
+        The certificate requests to process, -in is the same.
+
+Just about all the above have default values defined in ssleay.conf.
+
+The key variables in ssleay.conf are (for the pariticular '-name' being 
+used, in the default, it is CA_default).
+
+dir is where all the CA database stuff is kept.
+certs is where all the previously issued certificates are kept.
+The database is a simple text database containing the following tab separated 
+fields.
+status: a value of 'R' - revoked, 'E' -expired or 'V' valid.
+issued date:  When the certificate was certified.
+revoked date:  When it was revoked, blank if not revoked.
+serial number:  The certificate serial number.
+certificate:    Where the certificate is located.
+CN:     The name of the certificate.
+
+The demo file has quite a few made up values it it.  The last 2 were 
+added by the ca program and are acurate.
+The CA program does not update the 'certificate' file correctly right now.
+The serial field should be unique as should the CN/status combination.
+The ca program checks these at startup.  What still needs to be 
+wrtten is a program to 'regenerate' the data base file from the issued 
+certificate list (and a CRL list).
+
+Back to the CA_default variables.
+
+Most of the variables are commented.
+
+policy is the default policy.
+
+Ok for policies, they define the order and which fields must be present 
+in the certificate request and what gets filled in.
+
+So a value of
+countryName             = match
+means that the country name must match the CA certificate.
+organizationalUnitName  = optional
+The org.Unit,Name does not have to be present and
+commonName              = supplied
+commonName must be supplied in the certificate request.
+
+For the 'policy_match' polocy, the order of the attributes in the 
+generated certiticate would be
+countryName
+stateOrProvinceName
+organizationName
+organizationalUnitName
+commonName
+emailAddress
+
+Have a play, it sort of makes sense.  If you think about how the persona 
+requests operate, it is similar to the 'policy_match' policy and the
+'policy_anything' is similar to what versign is doing.
+
+I hope this helps a bit.  Some backend scripts are definitly needed to 
+update the database and to make certificate revocion easy.  All 
+certificates issued should also be kept forever (or until they expire?)
+
+hope this helps
+eric (who has to run off an buy some cheap knee pads for the caving in 4 
+days time :-)
+
+--
+Eric Young                  | Signature removed since it was generating
+AARNet: eay@mincom.oz.au    | more followups than the message contents :-)
+
+
diff --git a/src/lib/libssl/src/doc/callback.doc b/src/lib/libssl/src/doc/callback.doc
new file mode 100644
index 0000000000..7ad0f7f7d2
--- /dev/null
+++ b/src/lib/libssl/src/doc/callback.doc
@@ -0,0 +1,240 @@
+Callback functions used in SSLeay.
+
+--------------------------
+The BIO library.  
+
+Each BIO structure can have a callback defined against it.  This callback is
+called 2 times for each BIO 'function'.  It is passed 6 parameters.
+BIO_debug_callback() is an example callback which is defined in
+crypto/buffer/bio_cb.c and is used in apps/dgst.c  This is intended mostly
+for debuging or to notify the application of IO.
+
+long BIO_debug_callback(BIO *bio,int cmd,char *argp,int argi,long argl,
+        long ret);
+bio is the BIO being called, cmd is the type of BIO function being called.
+Look at the BIO_CB_* defines in buffer.h.  Argp and argi are the arguments
+passed to BIO_read(), BIO_write, BIO_gets(), BIO_puts().  In the case of
+BIO_ctrl(), argl is also defined.  The first time the callback is called,
+before the underlying function has been executed, 0 is passed as 'ret', and
+if the return code from the callback is not > 0, the call is aborted
+and the returned <= 0 value is returned.
+The second time the callback is called, the 'cmd' value also has
+BIO_CB_RETURN logically 'or'ed with it.  The 'ret' value is the value returned
+from the actuall function call and whatever the callback returns is returned
+from the BIO function.
+
+BIO_set_callback(b,cb) can be used to set the callback function
+(b is a BIO), and BIO_set_callback_arg(b,arg) can be used to
+set the cb_arg argument in the BIO strucutre.  This field is only intended
+to be used by application, primarily in the callback function since it is
+accessable since the BIO is passed.
+
+--------------------------
+The PEM library.
+
+The pem library only really uses one type of callback,
+static int def_callback(char *buf, int num, int verify);
+which is used to return a password string if required.
+'buf' is the buffer to put the string in.  'num' is the size of 'buf'
+and 'verify' is used to indicate that the password should be checked.
+This last flag is mostly used when reading a password for encryption.
+
+For all of these functions, a NULL callback will call the above mentioned
+default callback.  This default function does not work under Windows 3.1.
+For other machines, it will use an application defined prompt string
+(EVP_set_pw_prompt(), which defines a library wide prompt string)
+if defined, otherwise it will use it's own PEM password prompt.
+It will then call EVP_read_pw_string() to get a password from the console.
+If your application wishes to use nice fancy windows to retrieve passwords,
+replace this function.  The callback should return the number of bytes read
+into 'buf'.  If the number of bytes <= 0, it is considered an error.
+
+Functions that take this callback are listed below.  For the 'read' type
+functions, the callback will only be required if the PEM data is encrypted.
+
+For the Write functions, normally a password can be passed in 'kstr', of
+'klen' bytes which will be used if the 'enc' cipher is not NULL.  If
+'kstr' is NULL, the callback will be used to retrieve a password.
+
+int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len,
+        int (*callback)());
+char *PEM_ASN1_read_bio(char *(*d2i)(),char *name,BIO *bp,char **x,int (*cb)());
+char *PEM_ASN1_read(char *(*d2i)(),char *name,FILE *fp,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)());
+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)());
+STACK *PEM_X509_INFO_read_bio(BIO *fp, STACK *sk, int (*cb)());
+
+#define PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb)
+#define PEM_write_DSAPrivateKey(fp,x,enc,kstr,klen,cb)
+#define PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb)
+#define PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb)
+#define PEM_read_SSL_SESSION(fp,x,cb)
+#define PEM_read_X509(fp,x,cb)
+#define PEM_read_X509_REQ(fp,x,cb)
+#define PEM_read_X509_CRL(fp,x,cb)
+#define PEM_read_RSAPrivateKey(fp,x,cb)
+#define PEM_read_DSAPrivateKey(fp,x,cb)
+#define PEM_read_PrivateKey(fp,x,cb)
+#define PEM_read_PKCS7(fp,x,cb)
+#define PEM_read_DHparams(fp,x,cb)
+#define PEM_read_bio_SSL_SESSION(bp,x,cb)
+#define PEM_read_bio_X509(bp,x,cb)
+#define PEM_read_bio_X509_REQ(bp,x,cb)
+#define PEM_read_bio_X509_CRL(bp,x,cb)
+#define PEM_read_bio_RSAPrivateKey(bp,x,cb)
+#define PEM_read_bio_DSAPrivateKey(bp,x,cb)
+#define PEM_read_bio_PrivateKey(bp,x,cb)
+#define PEM_read_bio_PKCS7(bp,x,cb)
+#define PEM_read_bio_DHparams(bp,x,cb)
+int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)());
+RSA *d2i_Netscape_RSA(RSA **a, unsigned char **pp, long length, int (*cb)());
+
+Now you will notice that macros like
+#define PEM_write_X509(fp,x) \
+                PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp, \
+                                        (char *)x, NULL,NULL,0,NULL)
+Don't do encryption normally.  If you want to PEM encrypt your X509 structure,
+either just call PEM_ASN1_write directly or just define you own
+macro variant.  As you can see, this macro just sets all encryption related
+parameters to NULL.
+
+
+--------------------------
+The SSL library.
+
+#define SSL_set_info_callback(ssl,cb)
+#define SSL_CTX_set_info_callback(ctx,cb)
+void callback(SSL *ssl,int location,int ret)
+This callback is called each time around the SSL_connect()/SSL_accept() 
+state machine.  So it will be called each time the SSL protocol progresses.
+It is mostly present for use when debugging.  When SSL_connect() or
+SSL_accept() return, the location flag is SSL_CB_ACCEPT_EXIT or
+SSL_CB_CONNECT_EXIT and 'ret' is the value about to be returned.
+Have a look at the SSL_CB_* defines in ssl.h.  If an info callback is defined
+against the SSL_CTX, it is called unless there is one set against the SSL.
+Have a look at
+void client_info_callback() in apps/s_client() for an example.
+
+Certificate verification.
+void SSL_set_verify(SSL *s, int mode, int (*callback) ());
+void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,int (*callback)());
+This callback is used to help verify client and server X509 certificates.
+It is actually passed to X509_cert_verify(), along with the SSL structure
+so you have to read about X509_cert_verify() :-).  The SSL_CTX version is used
+if the SSL version is not defined.  X509_cert_verify() is the function used
+by the SSL part of the library to verify certificates.  This function is
+nearly always defined by the application.
+
+void SSL_CTX_set_cert_verify_cb(SSL_CTX *ctx, int (*cb)(),char *arg);
+int callback(char *arg,SSL *s,X509 *xs,STACK *cert_chain);
+This call is used to replace the SSLeay certificate verification code.
+The 'arg' is kept in the SSL_CTX and is passed to the callback.
+If the callback returns 0, the certificate is rejected, otherwise it
+is accepted.  The callback is replacing the X509_cert_verify() call.
+This feature is not often used, but if you wished to implement
+some totally different certificate authentication system, this 'hook' is
+vital.
+
+SSLeay keeps a cache of session-ids against each SSL_CTX.  These callbacks can
+be used to notify the application when a SSL_SESSION is added to the cache
+or to retrieve a SSL_SESSION that is not in the cache from the application.
+#define SSL_CTX_sess_set_get_cb(ctx,cb)
+SSL_SESSION *callback(SSL *s,char *session_id,int session_id_len,int *copy);
+If defined, this callback is called to return the SESSION_ID for the
+session-id in 'session_id', of 'session_id_len' bytes.  'copy' is set to 1
+if the server is to 'take a copy' of the SSL_SESSION structure.  It is 0
+if the SSL_SESSION is being 'passed in' so the SSLeay library is now
+responsible for 'free()ing' the structure.  Basically it is used to indicate
+if the reference count on the SSL_SESSION structure needs to be incremented.
+
+#define SSL_CTX_sess_set_new_cb(ctx,cb)
+int callback(SSL *s, SSL_SESSION *sess);
+When a new connection is established, if the SSL_SESSION is going to be added
+to the cache, this callback is called.  Return 1 if a 'copy' is required,
+otherwise, return 0.  This return value just causes the reference count
+to be incremented (on return of a 1), this means the application does
+not need to worry about incrementing the refernece count (and the
+locking that implies in a multi-threaded application).
+
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx,int (*cb)());
+This sets the SSL password reading function.
+It is mostly used for windowing applications
+and used by PEM_read_bio_X509() and PEM_read_bio_RSAPrivateKey()
+calls inside the SSL library.   The only reason this is present is because the
+calls to PEM_* functions is hidden in the SSLeay library so you have to
+pass in the callback some how.
+
+#define SSL_CTX_set_client_cert_cb(ctx,cb)
+int callback(SSL *s,X509 **x509, EVP_PKEY **pkey);
+Called when a client certificate is requested but there is not one set
+against the SSL_CTX or the SSL.  If the callback returns 1, x509 and
+pkey need to point to valid data.  The library will free these when
+required so if the application wants to keep these around, increment
+their reference counts.  If 0 is returned, no client cert is
+available.  If -1 is returned, it is assumed that the callback needs
+to be called again at a later point in time.  SSL_connect will return
+-1 and SSL_want_x509_lookup(ssl) returns true.  Remember that
+application data can be attached to an SSL structure via the
+SSL_set_app_data(SSL *ssl,char *data) call.
+
+--------------------------
+The X509 library.
+
+int X509_cert_verify(CERTIFICATE_CTX *ctx,X509 *xs, int (*cb)(),
+        int *error,char *arg,STACK *cert_chain);
+int verify_callback(int ok,X509 *xs,X509 *xi,int depth,int error,char *arg,
+        STACK *cert_chain);
+
+X509_cert_verify() is used to authenticate X509 certificates.  The 'ctx' holds
+the details of the various caches and files used to locate certificates.
+'xs' is the certificate to verify and 'cb' is the application callback (more
+detail later).  'error' will be set to the error code and 'arg' is passed
+to the 'cb' callback.  Look at the VERIFY_* defines in crypto/x509/x509.h
+
+When ever X509_cert_verify() makes a 'negative' decision about a
+certitificate, the callback is called.  If everything checks out, the
+callback is called with 'VERIFY_OK' or 'VERIFY_ROOT_OK' (for a self
+signed cert that is not the passed certificate).
+
+The callback is passed the X509_cert_verify opinion of the certificate 
+in 'ok', the certificate in 'xs', the issuer certificate in 'xi',
+the 'depth' of the certificate in the verification 'chain', the
+VERIFY_* code in 'error' and the argument passed to X509_cert_verify()
+in 'arg'. cert_chain is a list of extra certs to use if they are not
+in the cache.
+
+The callback can be used to look at the error reason, and then return 0
+for an 'error' or '1' for ok.  This will override the X509_cert_verify()
+opinion of the certificates validity.  Processing will continue depending on
+the return value.  If one just wishes to use the callback for informational
+reason, just return the 'ok' parameter.
+
+--------------------------
+The BN and DH library.
+
+BIGNUM *BN_generate_prime(int bits,int strong,BIGNUM *add,
+        BIGNUM *rem,void (*callback)(int,int));
+int BN_is_prime(BIGNUM *p,int nchecks,void (*callback)(int,int),
+
+Read doc/bn.doc for the description of these 2.
+
+DH *DH_generate_parameters(int prime_len,int generator,
+        void (*callback)(int,int));
+Read doc/bn.doc for the description of the callback, since it is just passed
+to BN_generate_prime(), except that it is also called as
+callback(3,0) by this function.
+
+--------------------------
+The CRYPTO library.
+
+void CRYPTO_set_locking_callback(void (*func)(int mode,int type,char *file,
+        int line));
+void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,
+        int type,char *file, int line));
+void CRYPTO_set_id_callback(unsigned long (*func)(void));
+
+Read threads.doc for info on these ones.
+
diff --git a/src/lib/libssl/src/doc/cipher.doc b/src/lib/libssl/src/doc/cipher.doc
new file mode 100644
index 0000000000..d49ba78c5c
--- /dev/null
+++ b/src/lib/libssl/src/doc/cipher.doc
@@ -0,0 +1,345 @@
+The Cipher subroutines.
+
+These routines require "evp.h" to be included.
+
+These functions are a higher level interface to the various cipher
+routines found in this library.  As such, they allow the same code to be
+used to encrypt and decrypt via different ciphers with only a change
+in an initial parameter.  These routines also provide buffering for block
+ciphers.
+
+These routines all take a pointer to the following structure to specify
+which cipher to use.  If you wish to use a new cipher with these routines,
+you would probably be best off looking an how an existing cipher is
+implemented and copying it.  At this point in time, I'm not going to go
+into many details.  This structure should be considered opaque
+
+typedef struct pem_cipher_st
+        {
+        int type;
+        int block_size;
+        int key_len;
+        int iv_len;
+        void (*enc_init)();     /* init for encryption */
+        void (*dec_init)();     /* init for decryption */
+        void (*do_cipher)();    /* encrypt data */
+        } EVP_CIPHER;
+        
+The type field is the object NID of the cipher type
+(read the section on Objects for an explanation of what a NID is).
+The cipher block_size is how many bytes need to be passed
+to the cipher at a time.  Key_len is the
+length of the key the cipher requires and iv_len is the length of the
+initialisation vector required.  enc_init is the function
+called to initialise the ciphers context for encryption and dec_init is the
+function to initialise for decryption (they need to be different, especially
+for the IDEA cipher).
+
+One reason for specifying the Cipher via a pointer to a structure
+is that if you only use des-cbc, only the des-cbc routines will
+be included when you link the program.  If you passed an integer
+that specified which cipher to use, the routine that mapped that
+integer to a set of cipher functions would cause all the ciphers
+to be link into the code.  This setup also allows new ciphers
+to be added by the application (with some restrictions).
+
+The thirteen ciphers currently defined in this library are
+
+EVP_CIPHER *EVP_des_ecb();     /* DES in ecb mode,     iv=0, block=8, key= 8 */
+EVP_CIPHER *EVP_des_ede();     /* DES in ecb ede mode, iv=0, block=8, key=16 */
+EVP_CIPHER *EVP_des_ede3();    /* DES in ecb ede mode, iv=0, block=8, key=24 */
+EVP_CIPHER *EVP_des_cfb();     /* DES in cfb mode,     iv=8, block=1, key= 8 */
+EVP_CIPHER *EVP_des_ede_cfb(); /* DES in ede cfb mode, iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_des_ede3_cfb();/* DES in ede cfb mode, iv=8, block=1, key=24 */
+EVP_CIPHER *EVP_des_ofb();     /* DES in ofb mode,     iv=8, block=1, key= 8 */
+EVP_CIPHER *EVP_des_ede_ofb(); /* DES in ede ofb mode, iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_des_ede3_ofb();/* DES in ede ofb mode, iv=8, block=1, key=24 */
+EVP_CIPHER *EVP_des_cbc();     /* DES in cbc mode,     iv=8, block=8, key= 8 */
+EVP_CIPHER *EVP_des_ede_cbc(); /* DES in cbc ede mode, iv=8, block=8, key=16 */
+EVP_CIPHER *EVP_des_ede3_cbc();/* DES in cbc ede mode, iv=8, block=8, key=24 */
+EVP_CIPHER *EVP_desx_cbc();    /* DES in desx cbc mode,iv=8, block=8, key=24 */
+EVP_CIPHER *EVP_rc4();         /* RC4,                 iv=0, block=1, key=16 */
+EVP_CIPHER *EVP_idea_ecb();    /* IDEA in ecb mode,    iv=0, block=8, key=16 */
+EVP_CIPHER *EVP_idea_cfb();    /* IDEA in cfb mode,    iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_idea_ofb();    /* IDEA in ofb mode,    iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_idea_cbc();    /* IDEA in cbc mode,    iv=8, block=8, key=16 */
+EVP_CIPHER *EVP_rc2_ecb();     /* RC2 in ecb mode,     iv=0, block=8, key=16 */
+EVP_CIPHER *EVP_rc2_cfb();     /* RC2 in cfb mode,     iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_rc2_ofb();     /* RC2 in ofb mode,     iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_rc2_cbc();     /* RC2 in cbc mode,     iv=8, block=8, key=16 */
+EVP_CIPHER *EVP_bf_ecb();      /* Blowfish in ecb mode,iv=0, block=8, key=16 */
+EVP_CIPHER *EVP_bf_cfb();      /* Blowfish in cfb mode,iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_bf_ofb();      /* Blowfish in ofb mode,iv=8, block=1, key=16 */
+EVP_CIPHER *EVP_bf_cbc();      /* Blowfish in cbc mode,iv=8, block=8, key=16 */
+
+The meaning of the compound names is as follows.
+des     The base cipher is DES.
+idea    The base cipher is IDEA
+rc4     The base cipher is RC4-128
+rc2     The base cipher is RC2-128
+ecb     Electronic Code Book form of the cipher.
+cbc     Cipher Block Chaining form of the cipher.
+cfb     64 bit Cipher Feedback form of the cipher.
+ofb     64 bit Output Feedback form of the cipher.
+ede     The cipher is used in Encrypt, Decrypt, Encrypt mode.  The first
+        and last keys are the same.
+ede3    The cipher is used in Encrypt, Decrypt, Encrypt mode.
+
+All the Cipher routines take a EVP_CIPHER_CTX pointer as an argument.
+The state of the cipher is kept in this structure.
+
+typedef struct EVP_CIPHER_Ctx_st
+        {
+        EVP_CIPHER *cipher;
+        int encrypt;            /* encrypt or decrypt */
+        int buf_len;            /* number we have left */
+        unsigned char buf[8];
+        union   {
+                .... /* cipher specific stuff */
+                } c;
+        } EVP_CIPHER_CTX;
+
+Cipher is a pointer the the EVP_CIPHER for the current context.  The encrypt
+flag indicates encryption or decryption.  buf_len is the number of bytes
+currently being held in buf.
+The 'c' union holds the cipher specify context.
+
+The following functions are to be used.
+
+int EVP_read_pw_string(
+char *buf,
+int len,
+char *prompt,
+int verify,
+        This function is the same as des_read_pw_string() (des.doc).
+
+void EVP_set_pw_prompt(char *prompt);
+        This function sets the 'default' prompt to use to use in
+        EVP_read_pw_string when the prompt parameter is NULL.  If the
+        prompt parameter is NULL, this 'default prompt' feature is turned
+        off.  Be warned, this is a global variable so weird things
+        will happen if it is used under Win16 and care must be taken
+        with a multi-threaded version of the library.
+
+char *EVP_get_pw_prompt();
+        This returns a pointer to the default prompt string.  NULL
+        if it is not set.
+
+int EVP_BytesToKey(
+EVP_CIPHER *type,
+EVP_MD *md,
+unsigned char *salt,
+unsigned char *data,
+int datal,
+int count,
+unsigned char *key,
+unsigned char *iv);
+        This function is used to generate a key and an initialisation vector
+        for a specified cipher from a key string and a salt.  Type
+        specifies the cipher the 'key' is being generated for.  Md is the
+        message digest algorithm to use to generate the key and iv.  The salt
+        is an optional 8 byte object that is used to help seed the key
+        generator.
+        If the salt value is NULL, it is just not used.  Datal is the
+        number of bytes to use from 'data' in the key generation.  
+        This function returns the key size for the specified cipher, if
+        data is NULL, this value is returns and no other
+        computation is performed.  Count is
+        the number of times to loop around the key generator.  I would
+        suggest leaving it's value as 1.  Key and iv are the structures to
+        place the returning iv and key in.  If they are NULL, no value is
+        generated for that particular value.
+        The algorithm used is as follows
+        
+        /* M[] is an array of message digests
+         * MD() is the message digest function */
+        M[0]=MD(data . salt);
+        for (i=1; i<count; i++) M[0]=MD(M[0]);
+
+        i=1
+        while (data still needed for key and iv)
+                {
+                M[i]=MD(M[i-1] . data . salt);
+                for (i=1; i<count; i++) M[i]=MD(M[i]);
+                i++;
+                }
+
+        If the salt is NULL, it is not used.
+        The digests are concatenated together.
+        M = M[0] . M[1] . M[2] .......
+
+        For key= 8, iv=8 => key=M[0.. 8], iv=M[ 9 .. 16].
+        For key=16, iv=0 => key=M[0..16].
+        For key=16, iv=8 => key=M[0..16], iv=M[17 .. 24].
+        For key=24, iv=8 => key=M[0..24], iv=M[25 .. 32].
+
+        This routine will produce DES-CBC keys and iv that are compatible
+        with the PKCS-5 standard when md2 or md5 are used.  If md5 is
+        used, the salt is NULL and count is 1, this routine will produce
+        the password to key mapping normally used with RC4.
+        I have attempted to logically extend the PKCS-5 standard to
+        generate keys and iv for ciphers that require more than 16 bytes,
+        if anyone knows what the correct standard is, please inform me.
+        When using sha or sha1, things are a bit different under this scheme,
+        since sha produces a 20 byte digest.  So for ciphers requiring
+        24 bits of data, 20 will come from the first MD and 4 will
+        come from the second.
+
+        I have considered having a separate function so this 'routine'
+        can be used without the requirement of passing a EVP_CIPHER *,
+        but I have decided to not bother.  If you wish to use the
+        function without official EVP_CIPHER structures, just declare
+        a local one and set the key_len and iv_len fields to the
+        length you desire.
+
+The following routines perform encryption and decryption 'by parts'.  By
+this I mean that there are groups of 3 routines.  An Init function that is
+used to specify a cipher and initialise data structures.  An Update routine
+that does encryption/decryption, one 'chunk' at a time.  And finally a
+'Final' function that finishes the encryption/decryption process.
+All these functions take a EVP_CIPHER pointer to specify which cipher to
+encrypt/decrypt with.  They also take a EVP_CIPHER_CTX object as an
+argument.  This structure is used to hold the state information associated
+with the operation in progress.
+
+void EVP_EncryptInit(
+EVP_CIPHER_CTX *ctx,
+EVP_CIPHER *type,
+unsigned char *key,
+unsigned char *iv);
+        This function initialise a EVP_CIPHER_CTX for encryption using the
+        cipher passed in the 'type' field.  The cipher is initialised to use
+        'key' as the key and 'iv' for the initialisation vector (if one is
+        required).  If the type, key or iv is NULL, the value currently in the
+        EVP_CIPHER_CTX is reused.  So to perform several decrypt
+        using the same cipher, key and iv, initialise with the cipher,
+        key and iv the first time and then for subsequent calls,
+        reuse 'ctx' but pass NULL for type, key and iv.  You must make sure
+        to pass a key that is large enough for a particular cipher.  I
+        would suggest using the EVP_BytesToKey() function.
+
+void EVP_EncryptUpdate(
+EVP_CIPHER_CTX *ctx,
+unsigned char *out,
+int *outl,
+unsigned char *in,
+int inl);
+        This function takes 'inl' bytes from 'in' and outputs bytes
+        encrypted by the cipher 'ctx' was initialised with into 'out'.  The
+        number of bytes written to 'out' is put into outl.  If a particular
+        cipher encrypts in blocks, less or more bytes than input may be
+        output.  Currently the largest block size used by supported ciphers
+        is 8 bytes, so 'out' should have room for 'inl+7' bytes.  Normally
+        EVP_EncryptInit() is called once, followed by lots and lots of
+        calls to EVP_EncryptUpdate, followed by a single EVP_EncryptFinal
+        call.
+
+void EVP_EncryptFinal(
+EVP_CIPHER_CTX *ctx,
+unsigned char *out,
+int *outl);
+        Because quite a large number of ciphers are block ciphers, there is
+        often an incomplete block to write out at the end of the
+        encryption.  EVP_EncryptFinal() performs processing on this last
+        block.  The last block in encoded in such a way that it is possible
+        to determine how many bytes in the last block are valid.  For 8 byte
+        block size ciphers, if only 5 bytes in the last block are valid, the
+        last three bytes will be filled with the value 3.  If only 2 were
+        valid, the other 6 would be filled with sixes.  If all 8 bytes are
+        valid, a extra 8 bytes are appended to the cipher stream containing
+        nothing but 8 eights.  These last bytes are output into 'out' and
+        the number of bytes written is put into 'outl'  These last bytes
+        are output into 'out' and the number of bytes written is put into
+        'outl'.  This form of block cipher finalisation is compatible with
+        PKCS-5.  Please remember that even if you are using ciphers like
+        RC4 that has no blocking and so the function will not write
+        anything into 'out', it would still be a good idea to pass a
+        variable for 'out' that can hold 8 bytes just in case the cipher is
+        changed some time in the future.  It should also be remembered
+        that the EVP_CIPHER_CTX contains the password and so when one has
+        finished encryption with a particular EVP_CIPHER_CTX, it is good
+        practice to zero the structure 
+        (ie. memset(ctx,0,sizeof(EVP_CIPHER_CTX)).
+        
+void EVP_DecryptInit(
+EVP_CIPHER_CTX *ctx,
+EVP_CIPHER *type,
+unsigned char *key,
+unsigned char *iv);
+        This function is basically the same as EVP_EncryptInit() accept that
+        is prepares the EVP_CIPHER_CTX for decryption.
+
+void EVP_DecryptUpdate(
+EVP_CIPHER_CTX *ctx,
+unsigned char *out,
+int *outl,
+unsigned char *in,
+int inl);
+        This function is basically the same as EVP_EncryptUpdate()
+        except that it performs decryption.  There is one
+        fundamental difference though.  'out' can not be the same as
+        'in' for any ciphers with a block size greater than 1 if more
+        than one call to EVP_DecryptUpdate() will be made.  This
+        is because this routine can hold a 'partial' block between
+        calls.  When a partial block is decrypted (due to more bytes
+        being passed via this function, they will be written to 'out'
+        overwriting the input bytes in 'in' that have not been read
+        yet.  From this it should also be noted that 'out' should
+        be at least one 'block size' larger than 'inl'.  This problem
+        only occurs on the second and subsequent call to
+        EVP_DecryptUpdate() when using a block cipher.
+
+int EVP_DecryptFinal(
+EVP_CIPHER_CTX *ctx,
+unsigned char *out,
+int *outl);
+        This function is different to EVP_EncryptFinal in that it 'removes'
+        any padding bytes appended when the data was encrypted.  Due to the
+        way in which 1 to 8 bytes may have been appended when encryption
+        using a block cipher, 'out' can end up with 0 to 7 bytes being put
+        into it.  When decoding the padding bytes, it is possible to detect
+        an incorrect decryption.  If the decryption appears to be wrong, 0
+        is returned.  If everything seems ok, 1 is returned.  For ciphers
+        with a block size of 1 (RC4), this function would normally not
+        return any bytes and would always return 1.  Just because this
+        function returns 1 does not mean the decryption was correct. It
+        would normally be wrong due to either the wrong key/iv or
+        corruption of the cipher data fed to EVP_DecryptUpdate().
+        As for EVP_EncryptFinal, it is a good idea to zero the
+        EVP_CIPHER_CTX after use since the structure contains the key used
+        to decrypt the data.
+        
+The following Cipher routines are convenience routines that call either
+EVP_EncryptXxx or EVP_DecryptXxx depending on weather the EVP_CIPHER_CTX
+was setup to encrypt or decrypt.  
+
+void EVP_CipherInit(
+EVP_CIPHER_CTX *ctx,
+EVP_CIPHER *type,
+unsigned char *key,
+unsigned char *iv,
+int enc);
+        This function take arguments that are the same as EVP_EncryptInit()
+        and EVP_DecryptInit() except for the extra 'enc' flag.  If 1, the
+        EVP_CIPHER_CTX is setup for encryption, if 0, decryption.
+
+void EVP_CipherUpdate(
+EVP_CIPHER_CTX *ctx,
+unsigned char *out,
+int *outl,
+unsigned char *in,
+int inl);
+        Again this function calls either EVP_EncryptUpdate() or
+        EVP_DecryptUpdate() depending on state in the 'ctx' structure.
+        As noted for EVP_DecryptUpdate(), when this routine is used
+        for decryption with block ciphers, 'out' should not be the
+        same as 'in'.
+
+int EVP_CipherFinal(
+EVP_CIPHER_CTX *ctx,
+unsigned char *outm,
+int *outl);
+        This routine call EVP_EncryptFinal() or EVP_DecryptFinal()
+        depending on the state information in 'ctx'.  1 is always returned
+        if the mode is encryption, otherwise the return value is the return
+        value of EVP_DecryptFinal().
diff --git a/src/lib/libssl/src/doc/cipher.m b/src/lib/libssl/src/doc/cipher.m
new file mode 100644
index 0000000000..9f74917135
--- /dev/null
+++ b/src/lib/libssl/src/doc/cipher.m
@@ -0,0 +1,128 @@
+From ssl-lists-owner@mincom.com Tue Oct 15 18:16:14 1996
+Received: from cygnus.mincom.oz.au by orb.mincom.oz.au with SMTP id AA11550
+  (5.65c/IDA-1.4.4 for eay); Tue, 15 Oct 1996 08:17:41 +1000
+Received: (from daemon@localhost) by cygnus.mincom.oz.au (8.7.5/8.7.3) id IAA12472 for ssl-users-outgoing; Tue, 15 Oct 1996 08:16:35 +1000 (EST)
+Received: from orb.mincom.oz.au (eay@orb.mincom.oz.au [192.55.197.1]) by cygnus.mincom.oz.au (8.7.5/8.7.3) with SMTP id IAA12463 for <ssl-users@listserv.mincom.oz.au>; Tue, 15 Oct 1996 08:16:32 +1000 (EST)
+Received: by orb.mincom.oz.au id AA11544
+  (5.65c/IDA-1.4.4 for ssl-users@listserv.mincom.oz.au); Tue, 15 Oct 1996 08:16:15 +1000
+Date: Tue, 15 Oct 1996 08:16:14 +1000 (EST)
+From: Eric Young <eay@mincom.com>
+X-Sender: eay@orb
+To: Roland Haring <rharing@tandem.cl>
+Cc: ssl-users@mincom.com
+Subject: Re: Symmetric encryption with ssleay
+In-Reply-To: <m0vBpyq-00001aC@tandemnet.tandem.cl>
+Message-Id: <Pine.SOL.3.91.961015075623.11394A-100000@orb>
+Mime-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Sender: ssl-lists-owner@mincom.com
+Precedence: bulk
+Status: RO
+X-Status: 
+
+
+On Fri, 11 Oct 1996, Roland Haring wrote:
+> THE_POINT:
+>       Would somebody be so kind to give me the minimum basic 
+>       calls I need to do to libcrypto.a to get some text encrypted
+>       and decrypted again? ...hopefully with code included to do
+>       base64 encryption and decryption ... e.g. that sign-it.c code
+>       posted some while ago was a big help :-) (please, do not point
+>       me to apps/enc.c where I suspect my Heissenbug to be hidden :-)
+
+Ok, the base64 encoding stuff in 'enc.c' does the wrong thing sometimes 
+when the data is less than a line long (this is for decoding).  I'll dig 
+up the exact fix today and post it.  I am taking longer on 0.6.5 than I 
+intended so I'll just post this patch.
+
+The documentation to read is in
+doc/cipher.doc,
+doc/encode.doc (very sparse :-).
+and perhaps
+doc/digest.doc,
+
+The basic calls to encrypt with say triple DES are
+
+Given
+char key[EVP_MAX_KEY_LENGTH];
+char iv[EVP_MAX_IV_LENGTH];
+EVP_CIPHER_CTX ctx;
+unsigned char out[512+8];
+int outl;
+
+/* optional generation of key/iv data from text password using md5
+ * via an upward compatable verson of PKCS#5. */
+EVP_BytesToKey(EVP_des_ede3_cbc,EVP_md5,NULL,passwd,strlen(passwd),
+        key,iv);
+
+/* Initalise the EVP_CIPHER_CTX */
+EVP_EncryptInit(ctx,EVP_des_ede3_cbc,key,iv);
+
+while (....)
+        {
+        /* This is processing 512 bytes at a time, the bytes are being
+         * copied into 'out', outl bytes are output.  'out' should not be the
+         * same as 'in' for reasons mentioned in the documentation. */
+        EVP_EncryptUpdate(ctx,out,&outl,in,512);
+        }
+
+/* Output the last 'block'.  If the cipher is a block cipher, the last
+ * block is encoded in such a way so that a wrong decryption will normally be
+ * detected - again, one of the PKCS standards. */
+
+EVP_EncryptFinal(ctx,out,&outl);
+
+To decrypt, use the EVP_DecryptXXXXX functions except that EVP_DecryptFinal()
+will return 0 if the decryption fails (only detectable on block ciphers).
+
+You can also use
+EVP_CipherInit()
+EVP_CipherUpdate()
+EVP_CipherFinal()
+which does either encryption or decryption depending on an extra 
+parameter to EVP_CipherInit().
+
+
+To do the base64 encoding,
+EVP_EncodeInit()
+EVP_EncodeUpdate()
+EVP_EncodeFinal()
+
+EVP_DecodeInit()
+EVP_DecodeUpdate()
+EVP_DecodeFinal()
+
+where the encoding is quite simple, but the decoding can be a bit more 
+fun (due to dud input).
+
+EVP_DecodeUpdate() returns -1 for an error on an input line, 0 if the 
+'last line' was just processed, and 1 if more lines should be submitted.
+
+EVP_DecodeFinal() returns -1 for an error or 1 if things are ok.
+
+So the loop becomes
+EVP_DecodeInit(....)
+for (;;)
+        {
+        i=EVP_DecodeUpdate(....);
+        if (i < 0) goto err;
+
+        /* process the data */
+
+        if (i == 0) break;
+        }
+EVP_DecodeFinal(....);
+/* process the data */
+
+The problem in 'enc.c' is that I was stuff the processing up after the 
+EVP_DecodeFinal(...) when the for(..) loop was not being run (one line of 
+base64 data) and this was because 'enc.c' tries to scan over a file until
+it hits the first valid base64 encoded line.
+
+hope this helps a bit.
+eric
+--
+Eric Young                  | BOOL is tri-state according to Bill Gates.
+AARNet: eay@mincom.oz.au    | RTFM Win32 GetMessage().
+
+
diff --git a/src/lib/libssl/src/doc/conf.doc b/src/lib/libssl/src/doc/conf.doc
new file mode 100644
index 0000000000..f12fe884f5
--- /dev/null
+++ b/src/lib/libssl/src/doc/conf.doc
@@ -0,0 +1,89 @@
+The CONF library.
+
+The CONF library is a simple set of routines that can be used to configure
+programs.  It is a superset of the genenv() function with some extra
+structure.
+
+The library consists of 5 functions.
+
+LHASH *CONF_load(LHASH *config,char *file);
+This function is called to load in a configuration file.  Multiple
+configuration files can be loaded, with each subsequent 'load' overwriting
+any already defined 'variables'.  If there is an error, NULL is returned.
+If config is NULL, a new LHASH structure is created and returned, otherwise
+the new data in the 'file' is loaded into the 'config' structure.
+
+void CONF_free(LHASH *config);
+This function free()s the data in config.
+
+char *CONF_get_string(LHASH *config,char *section,char *name);
+This function returns the string found in 'config' that corresponds to the
+'section' and 'name' specified.  Classes and the naming system used will be
+discussed later in this document.  If the variable is not defined, an NULL
+is returned.
+
+long CONF_get_long(LHASH *config,char *section, char *name);
+This function is the same as CONF_get_string() except that it converts the
+string to an long and returns it.  If variable is not a number or the
+variable does not exist, 0 is returned.  This is a little problematic but I
+don't know of a simple way around it.
+
+STACK *CONF_get_section(LHASH *config, char *section);
+This function returns a 'stack' of CONF_VALUE items that are all the
+items defined in a particular section.  DO NOT free() any of the
+variable returned.  They will disappear when CONF_free() is called.
+
+The 'lookup' model.
+The configuration file is divided into 'sections'.  Each section is started by
+a line of the form '[ section ]'.  All subsequent variable definitions are
+of this section.  A variable definition is a simple alpha-numeric name
+followed by an '=' and then the data.  A section or variable name can be
+described by a regular expression of the following form '[A-Za-z0-9_]+'.
+The value of the variable is the text after the '=' until the end of the
+line, stripped of leading and trailing white space.
+At this point I should mention that a '#' is a comment character, \ is the
+escape character, and all three types of quote can be used to stop any
+special interpretation of the data.
+Now when the data is being loaded, variable expansion can occur.  This is
+done by expanding any $NAME sequences into the value represented by the
+variable NAME.  If the variable is not in the current section, the different
+section can be specified by using the $SECTION::NAME form.  The ${NAME} form
+also works and is very useful for expanding variables inside strings.
+
+When a variable is looked up, there are 2 special section. 'default', which
+is the initial section, and 'ENV' which is the processes environment
+variables (accessed via getenv()).  When a variable is looked up, it is
+first 'matched' with it's section (if one was specified), if this fails, the
+'default' section is matched.
+If the 'lhash' variable passed was NULL, the environment is searched.
+
+Now why do we bother with sections?  So we can have multiple programs using
+the same configuration file, or multiple instances of the same program
+using different variables.  It also provides a nice mechanism to override
+the processes environment variables (eg ENV::HOME=/tmp).  If there is a
+program specific variable missing, we can have default values.
+Multiple configuration files can be loaded, with each new value clearing
+any predefined values.  A system config file can provide 'default' values,
+and application/usr specific files can provide overriding values.
+
+Examples
+
+# This is a simple example
+SSLEAY_HOME     = /usr/local/ssl
+ENV::PATH       = $SSLEAY_HOME/bin:$PATH        # override my path
+
+[X509]
+cert_dir        = $SSLEAY_HOME/certs    # /usr/local/ssl/certs
+
+[SSL]
+CIPHER          = DES-EDE-MD5:RC4-MD5
+USER_CERT       = $HOME/${USER}di'r 5'  # /home/eay/eaydir 5
+USER_CERT       = $HOME/\${USER}di\'r   # /home/eay/${USER}di'r
+USER_CERT       = "$HOME/${US"ER}di\'r  # $HOME/${USER}di'r
+
+TEST            = 1234\
+5678\
+9ab                                     # TEST=123456789ab
+TTT             = 1234\n\n              # TTT=1234<nl><nl>
+
+
diff --git a/src/lib/libssl/src/doc/des.doc b/src/lib/libssl/src/doc/des.doc
new file mode 100644
index 0000000000..5879d968f3
--- /dev/null
+++ b/src/lib/libssl/src/doc/des.doc
@@ -0,0 +1,505 @@
+The DES library.
+
+Please note that this library was originally written to operate with
+eBones, a version of Kerberos that had had encryption removed when it left
+the USA and then put back in.  As such there are some routines that I will
+advise not using but they are still in the library for historical reasons.
+For all calls that have an 'input' and 'output' variables, they can be the
+same.
+
+This library requires the inclusion of 'des.h'.
+
+All of the encryption functions take what is called a des_key_schedule as an 
+argument.  A des_key_schedule is an expanded form of the des key.
+A des_key is 8 bytes of odd parity, the type used to hold the key is a
+des_cblock.  A des_cblock is an array of 8 bytes, often in this library
+description I will refer to input bytes when the function specifies
+des_cblock's as input or output, this just means that the variable should
+be a multiple of 8 bytes.
+
+The define DES_ENCRYPT is passed to specify encryption, DES_DECRYPT to
+specify decryption.  The functions and global variable are as follows:
+
+int des_check_key;
+        DES keys are supposed to be odd parity.  If this variable is set to
+        a non-zero value, des_set_key() will check that the key has odd
+        parity and is not one of the known weak DES keys.  By default this
+        variable is turned off;
+        
+void des_set_odd_parity(
+des_cblock *key );
+        This function takes a DES key (8 bytes) and sets the parity to odd.
+        
+int des_is_weak_key(
+des_cblock *key );
+        This function returns a non-zero value if the DES key passed is a
+        weak, DES key.  If it is a weak key, don't use it, try a different
+        one.  If you are using 'random' keys, the chances of hitting a weak
+        key are 1/2^52 so it is probably not worth checking for them.
+        
+int des_set_key(
+des_cblock *key,
+des_key_schedule schedule);
+        Des_set_key converts an 8 byte DES key into a des_key_schedule.
+        A des_key_schedule is an expanded form of the key which is used to
+        perform actual encryption.  It can be regenerated from the DES key
+        so it only needs to be kept when encryption or decryption is about
+        to occur.  Don't save or pass around des_key_schedule's since they
+        are CPU architecture dependent, DES keys are not.  If des_check_key
+        is non zero, zero is returned if the key has the wrong parity or
+        the key is a weak key, else 1 is returned.
+        
+int des_key_sched(
+des_cblock *key,
+des_key_schedule schedule);
+        An alternative name for des_set_key().
+
+int des_rw_mode;                /* defaults to DES_PCBC_MODE */
+        This flag holds either DES_CBC_MODE or DES_PCBC_MODE (default).
+        This specifies the function to use in the enc_read() and enc_write()
+        functions.
+
+void des_encrypt(
+unsigned long *data,
+des_key_schedule ks,
+int enc);
+        This is the DES encryption function that gets called by just about
+        every other DES routine in the library.  You should not use this
+        function except to implement 'modes' of DES.  I say this because the
+        functions that call this routine do the conversion from 'char *' to
+        long, and this needs to be done to make sure 'non-aligned' memory
+        access do not occur.  The characters are loaded 'little endian',
+        have a look at my source code for more details on how I use this
+        function.
+        Data is a pointer to 2 unsigned long's and ks is the
+        des_key_schedule to use.  enc, is non zero specifies encryption,
+        zero if decryption.
+
+void des_encrypt2(
+unsigned long *data,
+des_key_schedule ks,
+int enc);
+        This functions is the same as des_encrypt() except that the DES
+        initial permutation (IP) and final permutation (FP) have been left
+        out.  As for des_encrypt(), you should not use this function.
+        It is used by the routines in my library that implement triple DES.
+        IP() des_encrypt2() des_encrypt2() des_encrypt2() FP() is the same
+        as des_encrypt() des_encrypt() des_encrypt() except faster :-).
+
+void des_ecb_encrypt(
+des_cblock *input,
+des_cblock *output,
+des_key_schedule ks,
+int enc);
+        This is the basic Electronic Code Book form of DES, the most basic
+        form.  Input is encrypted into output using the key represented by
+        ks.  If enc is non zero (DES_ENCRYPT), encryption occurs, otherwise
+        decryption occurs.  Input is 8 bytes long and output is 8 bytes.
+        (the des_cblock structure is 8 chars).
+        
+void des_ecb3_encrypt(
+des_cblock *input,
+des_cblock *output,
+des_key_schedule ks1,
+des_key_schedule ks2,
+des_key_schedule ks3,
+int enc);
+        This is the 3 key EDE mode of ECB DES.  What this means is that 
+        the 8 bytes of input is encrypted with ks1, decrypted with ks2 and
+        then encrypted again with ks3, before being put into output;
+        C=E(ks3,D(ks2,E(ks1,M))).  There is a macro, des_ecb2_encrypt()
+        that only takes 2 des_key_schedules that implements,
+        C=E(ks1,D(ks2,E(ks1,M))) in that the final encrypt is done with ks1.
+        
+void des_cbc_encrypt(
+des_cblock *input,
+des_cblock *output,
+long length,
+des_key_schedule ks,
+des_cblock *ivec,
+int enc);
+        This routine implements DES in Cipher Block Chaining mode.
+        Input, which should be a multiple of 8 bytes is encrypted
+        (or decrypted) to output which will also be a multiple of 8 bytes.
+        The number of bytes is in length (and from what I've said above,
+        should be a multiple of 8).  If length is not a multiple of 8, I'm
+        not being held responsible :-).  ivec is the initialisation vector.
+        This function does not modify this variable.  To correctly implement
+        cbc mode, you need to do one of 2 things; copy the last 8 bytes of
+        cipher text for use as the next ivec in your application,
+        or use des_ncbc_encrypt(). 
+        Only this routine has this problem with updating the ivec, all
+        other routines that are implementing cbc mode update ivec.
+        
+void des_ncbc_encrypt(
+des_cblock *input,
+des_cblock *output,
+long length,
+des_key_schedule sk,
+des_cblock *ivec,
+int enc);
+        For historical reasons, des_cbc_encrypt() did not update the
+        ivec with the value requires so that subsequent calls to
+        des_cbc_encrypt() would 'chain'.  This was needed so that the same
+        'length' values would not need to be used when decrypting.
+        des_ncbc_encrypt() does the right thing.  It is the same as
+        des_cbc_encrypt accept that ivec is updates with the correct value
+        to pass in subsequent calls to des_ncbc_encrypt().  I advise using
+        des_ncbc_encrypt() instead of des_cbc_encrypt();
+
+void des_xcbc_encrypt(
+des_cblock *input,
+des_cblock *output,
+long length,
+des_key_schedule sk,
+des_cblock *ivec,
+des_cblock *inw,
+des_cblock *outw,
+int enc);
+        This is RSA's DESX mode of DES.  It uses inw and outw to
+        'whiten' the encryption.  inw and outw are secret (unlike the iv)
+        and are as such, part of the key.  So the key is sort of 24 bytes.
+        This is much better than cbc des.
+        
+void des_3cbc_encrypt(
+des_cblock *input,
+des_cblock *output,
+long length,
+des_key_schedule sk1,
+des_key_schedule sk2,
+des_cblock *ivec1,
+des_cblock *ivec2,
+int enc);
+        This function is flawed, do not use it.  I have left it in the
+        library because it is used in my des(1) program and will function
+        correctly when used by des(1).  If I removed the function, people
+        could end up unable to decrypt files.
+        This routine implements outer triple cbc encryption using 2 ks and
+        2 ivec's.  Use des_ede2_cbc_encrypt() instead.
+        
+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);
+        This function implements outer triple CBC DES encryption with 3
+        keys.  What this means is that each 'DES' operation
+        inside the cbc mode is really an C=E(ks3,D(ks2,E(ks1,M))).
+        Again, this is cbc mode so an ivec is requires.
+        This mode is used by SSL.
+        There is also a des_ede2_cbc_encrypt() that only uses 2
+        des_key_schedule's, the first being reused for the final
+        encryption.  C=E(ks1,D(ks2,E(ks1,M))).  This form of triple DES
+        is used by the RSAref library.
+        
+void des_pcbc_encrypt(
+des_cblock *input,
+des_cblock *output,
+long length,
+des_key_schedule ks,
+des_cblock *ivec,
+int enc);
+        This is Propagating Cipher Block Chaining mode of DES.  It is used
+        by Kerberos v4.  It's parameters are the same as des_ncbc_encrypt().
+        
+void des_cfb_encrypt(
+unsigned char *in,
+unsigned char *out,
+int numbits,
+long length,
+des_key_schedule ks,
+des_cblock *ivec,
+int enc);
+        Cipher Feedback Back mode of DES.  This implementation 'feeds back'
+        in numbit blocks.  The input (and output) is in multiples of numbits
+        bits.  numbits should to be a multiple of 8 bits.  Length is the
+        number of bytes input.  If numbits is not a multiple of 8 bits,
+        the extra bits in the bytes will be considered padding.  So if
+        numbits is 12, for each 2 input bytes, the 4 high bits of the
+        second byte will be ignored.  So to encode 72 bits when using
+        a numbits of 12 take 12 bytes.  To encode 72 bits when using
+        numbits of 9 will take 16 bytes.  To encode 80 bits when using
+        numbits of 16 will take 10 bytes. etc, etc.  This padding will
+        apply to both input and output.
+
+        
+void des_cfb64_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+des_key_schedule ks,
+des_cblock *ivec,
+int *num,
+int enc);
+        This is one of the more useful functions in this DES library, it
+        implements CFB mode of DES with 64bit feedback.  Why is this
+        useful you ask?  Because this routine will allow you to encrypt an
+        arbitrary number of bytes, no 8 byte padding.  Each call to this
+        routine will encrypt the input bytes to output and then update ivec
+        and num.  num contains 'how far' we are though ivec.  If this does
+        not make much sense, read more about cfb mode of DES :-).
+        
+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);
+        Same as des_cfb64_encrypt() accept that the DES operation is
+        triple DES.  As usual, there is a macro for
+        des_ede2_cfb64_encrypt() which reuses ks1.
+
+void des_ofb_encrypt(
+unsigned char *in,
+unsigned char *out,
+int numbits,
+long length,
+des_key_schedule ks,
+des_cblock *ivec);
+        This is a implementation of Output Feed Back mode of DES.  It is
+        the same as des_cfb_encrypt() in that numbits is the size of the
+        units dealt with during input and output (in bits).
+        
+void des_ofb64_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+des_key_schedule ks,
+des_cblock *ivec,
+int *num);
+        The same as des_cfb64_encrypt() except that it is Output Feed Back
+        mode.
+
+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);
+        Same as des_ofb64_encrypt() accept that the DES operation is
+        triple DES.  As usual, there is a macro for
+        des_ede2_ofb64_encrypt() which reuses ks1.
+
+int des_read_pw_string(
+char *buf,
+int length,
+char *prompt,
+int verify);
+        This routine is used to get a password from the terminal with echo
+        turned off.  Buf is where the string will end up and length is the
+        size of buf.  Prompt is a string presented to the 'user' and if
+        verify is set, the key is asked for twice and unless the 2 copies
+        match, an error is returned.  A return code of -1 indicates a
+        system error, 1 failure due to use interaction, and 0 is success.
+
+unsigned long des_cbc_cksum(
+des_cblock *input,
+des_cblock *output,
+long length,
+des_key_schedule ks,
+des_cblock *ivec);
+        This function produces an 8 byte checksum from input that it puts in
+        output and returns the last 4 bytes as a long.  The checksum is
+        generated via cbc mode of DES in which only the last 8 byes are
+        kept.  I would recommend not using this function but instead using
+        the EVP_Digest routines, or at least using MD5 or SHA.  This
+        function is used by Kerberos v4 so that is why it stays in the
+        library.
+        
+char *des_fcrypt(
+const char *buf,
+const char *salt
+char *ret);
+        This is my fast version of the unix crypt(3) function.  This version
+        takes only a small amount of space relative to other fast
+        crypt() implementations.  This is different to the normal crypt
+        in that the third parameter is the buffer that the return value
+        is written into.  It needs to be at least 14 bytes long.  This
+        function is thread safe, unlike the normal crypt.
+
+char *crypt(
+const char *buf,
+const char *salt);
+        This function calls des_fcrypt() with a static array passed as the
+        third parameter.  This emulates the normal non-thread safe semantics
+        of crypt(3).
+
+void des_string_to_key(
+char *str,
+des_cblock *key);
+        This function takes str and converts it into a DES key.  I would
+        recommend using MD5 instead and use the first 8 bytes of output.
+        When I wrote the first version of these routines back in 1990, MD5
+        did not exist but I feel these routines are still sound.  This
+        routines is compatible with the one in MIT's libdes.
+        
+void des_string_to_2keys(
+char *str,
+des_cblock *key1,
+des_cblock *key2);
+        This function takes str and converts it into 2 DES keys.
+        I would recommend using MD5 and using the 16 bytes as the 2 keys.
+        I have nothing against these 2 'string_to_key' routines, it's just
+        that if you say that your encryption key is generated by using the
+        16 bytes of an MD5 hash, every-one knows how you generated your
+        keys.
+
+int des_read_password(
+des_cblock *key,
+char *prompt,
+int verify);
+        This routine combines des_read_pw_string() with des_string_to_key().
+
+int des_read_2passwords(
+des_cblock *key1,
+des_cblock *key2,
+char *prompt,
+int verify);
+        This routine combines des_read_pw_string() with des_string_to_2key().
+
+void des_random_seed(
+des_cblock key);
+        This routine sets a starting point for des_random_key().
+        
+void des_random_key(
+des_cblock ret);
+        This function return a random key.  Make sure to 'seed' the random
+        number generator (with des_random_seed()) before using this function.
+        I personally now use a MD5 based random number system.
+
+int des_enc_read(
+int fd,
+char *buf,
+int len,
+des_key_schedule ks,
+des_cblock *iv);
+        This function will write to a file descriptor the encrypted data
+        from buf.  This data will be preceded by a 4 byte 'byte count' and
+        will be padded out to 8 bytes.  The encryption is either CBC of
+        PCBC depending on the value of des_rw_mode.  If it is DES_PCBC_MODE,
+        pcbc is used, if DES_CBC_MODE, cbc is used.  The default is to use
+        DES_PCBC_MODE.
+
+int des_enc_write(
+int fd,
+char *buf,
+int len,
+des_key_schedule ks,
+des_cblock *iv);
+        This routines read stuff written by des_enc_read() and decrypts it.
+        I have used these routines quite a lot but I don't believe they are
+        suitable for non-blocking io.  If you are after a full
+        authentication/encryption over networks, have a look at SSL instead.
+
+unsigned long des_quad_cksum(
+des_cblock *input,
+des_cblock *output,
+long length,
+int out_count,
+des_cblock *seed);
+        This is a function from Kerberos v4 that is not anything to do with
+        DES but was needed.  It is a cksum that is quicker to generate than
+        des_cbc_cksum();  I personally would use MD5 routines now.
+=====
+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 can 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 key3 again.
+- As for ECB encryption but increases the key length to 168 bits.
+  There are theoretic attacks that can be used that make the effective
+  key length 112 bits, but this attack also requires 2^56 blocks of
+  memory, not very likely, even for the NSA.
+- If both keys are the same it is equivalent to encrypting once with
+  just one key.
+- If the first and last key are the same, the key length is 112 bits.
+  There are attacks that could reduce the key space to 55 bit's but it
+  requires 2^56 blocks of memory.
+- If all 3 keys are the same, this is effectively the same as normal
+  ecb mode.
+
+Triple CBC Mode (des_ede3_cbc_encrypt())
+- Encrypt with key1, decrypt with key2 and then encrypt with key3.
+- As for CBC encryption but increases the key length to 168 bits with
+  the same restrictions as for triple ecb mode.
diff --git a/src/lib/libssl/src/doc/digest.doc b/src/lib/libssl/src/doc/digest.doc
new file mode 100644
index 0000000000..d2fb987591
--- /dev/null
+++ b/src/lib/libssl/src/doc/digest.doc
@@ -0,0 +1,94 @@
+
+The Message Digest subroutines.
+
+These routines require "evp.h" to be included.
+
+These functions are a higher level interface to the various message digest
+routines found in this library.  As such, they allow the same code to be
+used to digest via different algorithms with only a change in an initial
+parameter.  They are basically just a front-end to the MD2, MD5, SHA
+and SHA1
+routines.
+
+These routines all take a pointer to the following structure to specify
+which message digest algorithm to use.
+typedef struct evp_md_st
+        {
+        int type;
+        int pkey_type;
+        int md_size;
+        void (*init)();
+        void (*update)();
+        void (*final)();
+
+        int required_pkey_type; /*EVP_PKEY_xxx */
+        int (*sign)();
+        int (*verify)();
+        } EVP_MD;
+
+If additional message digest algorithms are to be supported, a structure of
+this type needs to be declared and populated and then the Digest routines
+can be used with that algorithm.  The type field is the object NID of the
+digest type (read the section on Objects for an explanation).  The pkey_type
+is the Object type to use when the a message digest is generated by there
+routines and then is to be signed with the pkey algorithm.  Md_size is
+the size of the message digest returned.  Init, update
+and final are the relevant functions to perform the message digest function
+by parts.  One reason for specifying the message digest to use via this
+mechanism is that if you only use md5, only the md5 routines will
+be included in you linked program.  If you passed an integer
+that specified which message digest to use, the routine that mapped that
+integer to a set of message digest functions would cause all the message
+digests functions to be link into the code.  This setup also allows new
+message digest functions to be added by the application.
+
+The six message digests defined in this library are
+
+EVP_MD *EVP_md2(void);  /* RSA sign/verify */
+EVP_MD *EVP_md5(void);  /* RSA sign/verify */
+EVP_MD *EVP_sha(void);  /* RSA sign/verify */
+EVP_MD *EVP_sha1(void); /* RSA sign/verify */
+EVP_MD *EVP_dss(void);  /* DSA sign/verify */
+EVP_MD *EVP_dss1(void); /* DSA sign/verify */
+
+All the message digest routines take a EVP_MD_CTX pointer as an argument.
+The state of the message digest is kept in this structure.
+
+typedef struct pem_md_ctx_st
+        {
+        EVP_MD *digest;
+        union   {
+                unsigned char base[4]; /* this is used in my library as a
+                                        * 'pointer' to all union elements
+                                        * structures. */
+                MD2_CTX md2;
+                MD5_CTX md5;
+                SHA_CTX sha;
+                } md;
+        } EVP_MD_CTX;
+
+The Digest functions are as follows.
+
+void EVP_DigestInit(
+EVP_MD_CTX *ctx,
+EVP_MD *type);
+        This function is used to initialise the EVP_MD_CTX.  The message
+        digest that will associated with 'ctx' is specified by 'type'.
+
+void EVP_DigestUpdate(
+EVP_MD_CTX *ctx,
+unsigned char *data,
+unsigned int cnt);
+        This function is used to pass more data to the message digest
+        function.  'cnt' bytes are digested from 'data'.
+
+void EVP_DigestFinal(
+EVP_MD_CTX *ctx,
+unsigned char *md,
+unsigned int *len);
+        This function finishes the digestion and puts the message digest
+        into 'md'.  The length of the message digest is put into len;
+        EVP_MAX_MD_SIZE is the size of the largest message digest that
+        can be returned from this function.  Len can be NULL if the
+        size of the digest is not required.
+        
diff --git a/src/lib/libssl/src/doc/encode.doc b/src/lib/libssl/src/doc/encode.doc
new file mode 100644
index 0000000000..af17549289
--- /dev/null
+++ b/src/lib/libssl/src/doc/encode.doc
@@ -0,0 +1,15 @@
+
+void    EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
+void    EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx,unsigned char *out,
+                int *outl,unsigned char *in,int inl);
+void    EVP_EncodeFinal(EVP_ENCODE_CTX *ctx,unsigned char *out,int *outl);
+int     EVP_EncodeBlock(unsigned char *t, unsigned char *f, int n);
+
+void    EVP_DecodeInit(EVP_ENCODE_CTX *ctx);
+int     EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx,unsigned char *out,int *outl,
+                unsigned char *in, int inl);
+int     EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
+                char *out, int *outl);
+int     EVP_DecodeBlock(unsigned char *t, unsigned
+                char *f, int n);
+
diff --git a/src/lib/libssl/src/doc/envelope.doc b/src/lib/libssl/src/doc/envelope.doc
new file mode 100644
index 0000000000..483e4fca6b
--- /dev/null
+++ b/src/lib/libssl/src/doc/envelope.doc
@@ -0,0 +1,67 @@
+The following routines are use to create 'digital' envelopes.
+By this I mean that they perform various 'higher' level cryptographic
+functions.  Have a read of 'cipher.doc' and 'digest.doc' since those
+routines are used by these functions.
+cipher.doc contains documentation about the cipher part of the
+envelope library and digest.doc contatins the description of the
+message digests supported.
+
+To 'sign' a document involves generating a message digest and then encrypting
+the digest with an private key.
+
+#define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
+#define EVP_SignUpdate(a,b,c)           EVP_DigestUpdate(a,b,c)
+Due to the fact this operation is basically just an extended message
+digest, the first 2 functions are macro calls to Digest generating
+functions.
+
+int     EVP_SignFinal(
+EVP_MD_CTX *ctx,
+unsigned char *md,
+unsigned int *s,
+EVP_PKEY *pkey);
+        This finalisation function finishes the generation of the message
+digest and then encrypts the digest (with the correct message digest 
+object identifier) with the EVP_PKEY private key.  'ctx' is the message digest
+context.  'md' will end up containing the encrypted message digest.  This
+array needs to be EVP_PKEY_size(pkey) bytes long.  's' will actually
+contain the exact length.  'pkey' of course is the private key.  It is
+one of EVP_PKEY_RSA or EVP_PKEY_DSA type.
+If there is an error, 0 is returned, otherwise 1.
+                
+Verify is used to check an signed message digest.
+
+#define EVP_VerifyInit(a,b)             EVP_DigestInit(a,b)
+#define EVP_VerifyUpdate(a,b,c)         EVP_DigestUpdate(a,b,c)
+Since the first step is to generate a message digest, the first 2 functions
+are macros.
+
+int EVP_VerifyFinal(
+EVP_MD_CTX *ctx,
+unsigned char *md,
+unsigned int s,
+EVP_PKEY *pkey);
+        This function finishes the generation of the message digest and then
+compares it with the supplied encrypted message digest.  'md' contains the
+'s' bytes of encrypted message digest.  'pkey' is used to public key decrypt
+the digest.  It is then compared with the message digest just generated.
+If they match, 1 is returned else 0.
+
+int     EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek,
+                int *ekl, unsigned char *iv, EVP_PKEY **pubk, int npubk);
+Must have at least one public key, error is 0.  I should also mention that
+the buffers pointed to by 'ek' need to be EVP_PKEY_size(pubk[n]) is size.
+
+#define EVP_SealUpdate(a,b,c,d,e)       EVP_EncryptUpdate(a,b,c,d,e)    
+void    EVP_SealFinal(EVP_CIPHER_CTX *ctx,unsigned char *out,int *outl);
+
+
+int     EVP_OpenInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,unsigned char *ek,
+                int ekl,unsigned char *iv,EVP_PKEY *priv);
+0 on failure
+
+#define EVP_OpenUpdate(a,b,c,d,e)       EVP_DecryptUpdate(a,b,c,d,e)
+
+int     EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+Decrypt final return code
+
diff --git a/src/lib/libssl/src/doc/error.doc b/src/lib/libssl/src/doc/error.doc
new file mode 100644
index 0000000000..a91654999a
--- /dev/null
+++ b/src/lib/libssl/src/doc/error.doc
@@ -0,0 +1,115 @@
+The error routines.
+
+The 'error' system I've implemented is intended to server 2 purpose, to
+record the reason why a command failed and to record where in the libraries
+the failure occurred.  It is more or less setup to record a 'trace' of which
+library components were being traversed when the error occurred.
+
+When an error is recorded, it is done so a as single unsigned long which is
+composed of three parts.  The top byte is the 'library' number, the middle
+12 bytes is the function code, and the bottom 12 bits is the 'reason' code.
+
+Each 'library', or should a say, 'section' of the SSLeay library has a
+different unique 'library' error number.  Each function in the library has
+a number that is unique for that library.  Each 'library' also has a number
+for each 'error reason' that is only unique for that 'library'.
+
+Due to the way these error routines record a 'error trace', there is an
+array per thread that is used to store the error codes.
+The various functions in this library are used to access
+and manipulate this array.
+
+void ERR_put_error(int lib, int func,int reason);
+        This routine records an error in library 'lib', function 'func'
+and reason 'reason'.  As errors get 'put' into the buffer, they wrap
+around and overwrite old errors if too many are written.  It is assumed
+that the last errors are the most important.
+
+unsigned long ERR_get_error(void );
+        This function returns the last error added to the error buffer.
+In effect it is popping the value off the buffer so repeated calls will
+continue to return values until there are no more errors to return in which
+case 0 is returned.
+
+unsigned long ERR_peek_error(void );
+        This function returns the value of the last error added to the
+error buffer but does not 'pop' it from the buffer.
+
+void ERR_clear_error(void );
+        This function clears the error buffer, discarding all unread
+errors.
+
+While the above described error system obviously produces lots of different
+error number, a method for 'reporting' these errors in a human readable
+form is required.  To achieve this, each library has the option of
+'registering' error strings.
+
+typedef struct ERR_string_data_st
+        {
+        unsigned long error;
+        char *string;
+        } ERR_STRING_DATA;
+
+The 'ERR_STRING_DATA' contains an error code and the corresponding text
+string.  To add new function error strings for a library, the
+ERR_STRING_DATA needs to be 'registered' with the library.
+
+void ERR_load_strings(unsigned long lib,ERR_STRING_DATA *err);
+        This function 'registers' the array of ERR_STRING_DATA pointed to by
+'err' as error text strings for the error library 'lib'.
+
+void ERR_free_strings(void);
+        This function free()s all the loaded error strings.
+
+char *ERR_error_string(unsigned long error,char *buf);
+        This function returns a text string that is a human readable
+version of the error represented by 'error'.  Buff should be at least 120
+bytes long and if it is NULL, the return value is a pointer to a static
+variable that will contain the error string, otherwise 'buf' is returned.
+If there is not a text string registered for a particular error, a text
+string containing the error number is returned instead.
+
+void ERR_print_errors(BIO *bp);
+void ERR_print_errors_fp(FILE *fp);
+        This function is a convenience routine that prints the error string
+for each error until all errors have been accounted for.
+
+char *ERR_lib_error_string(unsigned long e);
+char *ERR_func_error_string(unsigned long e);
+char *ERR_reason_error_string(unsigned long e);
+The above three functions return the 3 different components strings for the
+error 'e'.  ERR_error_string() uses these functions.
+
+void ERR_load_ERR_strings(void );
+        This function 'registers' the error strings for the 'ERR' module.
+
+void ERR_load_crypto_strings(void );
+        This function 'register' the error strings for just about every
+library in the SSLeay package except for the SSL routines.  There is no
+need to ever register any error text strings and you will probably save in
+program size.  If on the other hand you do 'register' all errors, it is
+quite easy to determine why a particular routine failed.
+
+As a final footnote as to why the error system is designed as it is.
+1) I did not want a single 'global' error code.
+2) I wanted to know which subroutine a failure occurred in.
+3) For Windows NT etc, it should be simple to replace the 'key' routines
+   with code to pass error codes back to the application.
+4) I wanted the option of meaningful error text strings.
+
+Late breaking news - the changes to support threads.
+
+Each 'thread' has an 'ERR_STATE' state associated with it.
+ERR_STATE *ERR_get_state(void ) will return the 'state' for the calling
+thread/process.
+
+ERR_remove_state(unsigned long pid); will 'free()' this state.  If pid == 0
+the current 'thread/process' will have it's error state removed.
+If you do not remove the error state of a thread, this could be considered a
+form of memory leak, so just after 'reaping' a thread that has died,
+call ERR_remove_state(pid).
+
+Have a read of thread.doc for more details for what is required for
+multi-threading support.  All the other error routines will
+work correctly when using threads.
+
diff --git a/src/lib/libssl/src/doc/legal.doc b/src/lib/libssl/src/doc/legal.doc
new file mode 100644
index 0000000000..b55ed5ce6a
--- /dev/null
+++ b/src/lib/libssl/src/doc/legal.doc
@@ -0,0 +1,117 @@
+From eay@mincom.com Thu Jun 27 00:25:45 1996
+Received: by orb.mincom.oz.au id AA15821
+  (5.65c/IDA-1.4.4 for eay); Wed, 26 Jun 1996 14:25:45 +1000
+Date: Wed, 26 Jun 1996 14:25:45 +1000 (EST)
+From: Eric Young <eay@mincom.oz.au>
+X-Sender: eay@orb
+To: Ken Toll <ktoll@ren.digitalage.com>
+Cc: Eric Young <eay@mincom.oz.au>, ssl-talk@netscape.com
+Subject: Re: Unidentified subject!
+In-Reply-To: <9606261950.ZM28943@ren.digitalage.com>
+Message-Id: <Pine.SOL.3.91.960626131156.28573K-100000@orb>
+Mime-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Status: O
+X-Status: 
+
+
+This is a little off topic but since SSLeay is a free implementation of
+the SSLv2 protocol, I feel it is worth responding on the topic of if it 
+is actually legal for Americans to use free cryptographic software.
+
+On Wed, 26 Jun 1996, Ken Toll wrote:
+> Is the U.S the only country that SSLeay cannot be used commercially 
+> (because of RSAref) or is that going to be an issue with every country 
+> that a client/server application (non-web browser/server) is deployed 
+> and sold?
+
+>From what I understand, the software patents that apply to algorithms 
+like RSA and DH only apply in the USA.  The IDEA algorithm I believe is 
+patened in europe (USA?), but considing how little it is used by other SSL 
+implementations, it quite easily be left out of the SSLeay build
+(this can be done with a compile flag).
+
+Actually if the RSA patent did apply outside the USA, it could be rather
+interesting since RSA is not alowed to let RSA toolkits outside of the USA
+[1], and since these are the only forms that they will alow the algorithm
+to be used in, it would mean that non-one outside of the USA could produce
+public key software which would be a very strong statment for
+international patent law to make :-).  This logic is a little flawed but
+it still points out some of the more interesting permutations of USA
+patent law and ITAR restrictions. 
+
+Inside the USA there is also the unresolved issue of RC4/RC2 which were
+made public on sci.crypt in Sep 1994 (RC4) and Feb 1996 (RC2).  I have
+copies of the origional postings if people are interested.  RSA I believe 
+claim that they were 'trade-secrets' and that some-one broke an NDA in 
+revealing them.  Other claim they reverse engineered the algorithms from 
+compiled binaries.  If the algorithms were reverse engineered, I belive 
+RSA had no legal leg to stand on.  If an NDA was broken, I don't know.
+Regardless, RSA, I belive, is willing to go to court over the issue so 
+licencing is probably the best idea, or at least talk to them.
+If there are people who actually know more about this, pease let me know, I 
+don't want to vilify or spread miss-information if I can help it.
+
+If you are not producing a web browser, it is easy to build SSLeay with
+RC2/RC4 removed. Since RC4 is the defacto standard cipher in 
+all web software (and it is damn fast) it is more or less required for 
+www use. For non www use of SSL, especially for an application where 
+interoperability with other vendors is not critical just leave it out.
+
+Removing IDEA, RC2 and RC4 would only leave DES and Triple DES but 
+they should be ok.  Considing that Triple DES can encrypt at rates of
+410k/sec on a pentium 100, and 940k/sec on a P6/200, this is quite 
+reasonable performance.  Single DES clocks in at 1160k/s and 2467k/s
+respectivly is actually quite fast for those not so paranoid (56 bit key).[1]
+
+> Is it possible to get a certificate for commercial use outside of the U.S.?
+yes.
+
+Thawte Consulting issues certificates (they are the people who sell the
+        Sioux httpd server and are based in South Africa)
+Verisign will issue certificates for Sioux (sold from South Africa), so this
+        proves that they will issue certificate for OS use if they are
+        happy with the quality of the software.
+
+(The above mentioned companies just the ones that I know for sure are issuing
+ certificates outside the USA).
+
+There is always the point that if you are using SSL for an intra net, 
+SSLeay provides programs that can be used so you can issue your own 
+certificates.  They need polishing but at least it is a good starting point.
+
+I am not doing anything outside Australian law by implementing these
+algorithms (to the best of my knowedge).  It is another example of how 
+the world legal system does not cope with the internet very well.
+
+I may start making shared libraries available (I have now got DLL's for 
+Windows).  This will mean that distributions into the usa could be 
+shipped with a version with a reduced cipher set and the versions outside 
+could use the DLL/shared library with all the ciphers (and without RSAref).
+
+This could be completly hidden from the application, so this would not 
+even require a re-linking.
+
+This is the reverse of what people were talking about doing to get around 
+USA export regulations :-)
+
+eric
+
+[1]:    The RSAref2.0 tookit is available on at least 3 ftp sites in Europe
+        and one in South Africa.
+
+[2]:    Since I always get questions when I post benchmark numbers :-),
+        DES performace figures are in 1000's of bytes per second in cbc 
+        mode using an 8192 byte buffer.  The pentium 100 was running Windows NT 
+        3.51 DLLs and the 686/200 was running NextStep.
+        I quote pentium 100 benchmarks because it is basically the
+        'entry level' computer that most people buy for personal use.
+        Windows 95 is the OS shipping on those boxes, so I'll give
+        NT numbers (the same Win32 runtime environment).  The 686
+        numbers are present as an indication of where we will be in a
+        few years.
+--
+Eric Young                  | BOOL is tri-state according to Bill Gates.
+AARNet: eay@mincom.oz.au    | RTFM Win32 GetMessage().
+
+
diff --git a/src/lib/libssl/src/doc/lhash.doc b/src/lib/libssl/src/doc/lhash.doc
new file mode 100644
index 0000000000..5a2aeb4b38
--- /dev/null
+++ b/src/lib/libssl/src/doc/lhash.doc
@@ -0,0 +1,151 @@
+The LHASH library.
+
+I wrote this library in 1991 and have since forgotten why I called it lhash.
+It implements a hash table from an article I read at the
+time from 'Communications of the ACM'.  What makes this hash
+table different is that as the table fills, the hash table is
+increased (or decreased) in size via realloc().
+When a 'resize' is done, instead of all hashes being redistributed over
+twice as many 'buckets', one bucket is split.  So when an 'expand' is done,
+there is only a minimal cost to redistribute some values.  Subsequent
+inserts will cause more single 'bucket' redistributions but there will
+never be a sudden large cost due to redistributing all the 'buckets'.
+
+The state for a particular hash table is kept in the LHASH structure.
+The LHASH structure also records statistics about most aspects of accessing
+the hash table.  This is mostly a legacy of my writing this library for
+the reasons of implementing what looked like a nice algorithm rather than
+for a particular software product.
+
+Internal stuff you probably don't want to know about.
+The decision to increase or decrease the hash table size is made depending
+on the 'load' of the hash table.  The load is the number of items in the
+hash table divided by the size of the hash table.  The default values are
+as follows.  If (hash->up_load < load) => expand.
+if (hash->down_load > load) =>  contract.  The 'up_load' has a default value of
+1 and 'down_load' has a default value of 2.  These numbers can be modified
+by the application by just playing with the 'up_load' and 'down_load'
+variables.  The 'load' is kept in a form which is multiplied by 256.  So
+hash->up_load=8*256; will cause a load of 8 to be set.
+
+If you are interested in performance the field to watch is
+num_comp_calls.  The hash library keeps track of the 'hash' value for
+each item so when a lookup is done, the 'hashes' are compared, if
+there is a match, then a full compare is done, and
+hash->num_comp_calls is incremented.  If num_comp_calls is not equal
+to num_delete plus num_retrieve it means that your hash function is
+generating hashes that are the same for different values.  It is
+probably worth changing your hash function if this is the case because
+even if your hash table has 10 items in a 'bucked', it can be searched
+with 10 'unsigned long' compares and 10 linked list traverses.  This
+will be much less expensive that 10 calls to you compare function.
+
+LHASH *lh_new(
+unsigned long (*hash)(),
+int (*cmp)());
+        This function is used to create a new LHASH structure.  It is passed
+        function pointers that are used to store and retrieve values passed
+        into the hash table.  The 'hash'
+        function is a hashing function that will return a hashed value of
+        it's passed structure.  'cmp' is passed 2 parameters, it returns 0
+        is they are equal, otherwise, non zero.
+        If there are any problems (usually malloc failures), NULL is
+        returned, otherwise a new LHASH structure is returned.  The
+        hash value is normally truncated to a power of 2, so make sure
+        that your hash function returns well mixed low order bits.
+        
+void lh_free(
+LHASH *lh);
+        This function free()s a LHASH structure.  If there is malloced
+        data in the hash table, it will not be freed.  Consider using the
+        lh_doall function to deallocate any remaining entries in the hash
+        table.
+        
+char *lh_insert(
+LHASH *lh,
+char *data);
+        This function inserts the data pointed to by data into the lh hash
+        table.  If there is already and entry in the hash table entry, the
+        value being replaced is returned.  A NULL is returned if the new
+        entry does not clash with an entry already in the table (the normal
+        case) or on a malloc() failure (perhaps I should change this....).
+        The 'char *data' is exactly what is passed to the hash and
+        comparison functions specified in lh_new().
+        
+char *lh_delete(
+LHASH *lh,
+char *data);
+        This routine deletes an entry from the hash table.  The value being
+        deleted is returned.  NULL is returned if there is no such value in
+        the hash table.
+
+char *lh_retrieve(
+LHASH *lh,
+char *data);
+        If 'data' is in the hash table it is returned, else NULL is
+        returned.  The way these routines would normally be uses is that a
+        dummy structure would have key fields populated and then
+        ret=lh_retrieve(hash,&dummy);.  Ret would now be a pointer to a fully
+        populated structure.
+
+void lh_doall(
+LHASH *lh,
+void (*func)(char *a));
+        This function will, for every entry in the hash table, call function
+        'func' with the data item as parameters.
+        This function can be quite useful when used as follows.
+        void cleanup(STUFF *a)
+                { STUFF_free(a); }
+        lh_doall(hash,cleanup);
+        lh_free(hash);
+        This can be used to free all the entries, lh_free() then
+        cleans up the 'buckets' that point to nothing.  Be careful
+        when doing this.  If you delete entries from the hash table,
+        in the call back function, the table may decrease in size,
+        moving item that you are
+        currently on down lower in the hash table.  This could cause
+        some entries to be skipped.  The best solution to this problem
+        is to set lh->down_load=0 before you start.  This will stop
+        the hash table ever being decreased in size.
+
+void lh_doall_arg(
+LHASH *lh;
+void(*func)(char *a,char *arg));
+char *arg;
+        This function is the same as lh_doall except that the function
+        called will be passed 'arg' as the second argument.
+        
+unsigned long lh_strhash(
+char *c);
+        This function is a demo string hashing function.  Since the LHASH
+        routines would normally be passed structures, this routine would
+        not normally be passed to lh_new(), rather it would be used in the
+        function passed to lh_new().
+
+The next three routines print out various statistics about the state of the
+passed hash table.  These numbers are all kept in the lhash structure.
+
+void lh_stats(
+LHASH *lh,
+FILE *out);
+        This function prints out statistics on the size of the hash table,
+        how many entries are in it, and the number and result of calls to
+        the routines in this library.
+
+void lh_node_stats(
+LHASH *lh,
+FILE *out);
+        For each 'bucket' in the hash table, the number of entries is
+        printed.
+        
+void lh_node_usage_stats(
+LHASH *lh,
+FILE *out);
+        This function prints out a short summary of the state of the hash
+        table.  It prints what I call the 'load' and the 'actual load'.
+        The load is the average number of data items per 'bucket' in the
+        hash table.  The 'actual load' is the average number of items per
+        'bucket', but only for buckets which contain entries.  So the
+        'actual load' is the average number of searches that will need to
+        find an item in the hash table, while the 'load' is the average number
+        that will be done to record a miss.
diff --git a/src/lib/libssl/src/doc/md2.doc b/src/lib/libssl/src/doc/md2.doc
new file mode 100644
index 0000000000..b106bc675d
--- /dev/null
+++ b/src/lib/libssl/src/doc/md2.doc
@@ -0,0 +1,49 @@
+The MD2 library.
+MD2 is a message digest algorithm that can be used to condense an arbitrary
+length message down to a 16 byte hash.  The functions all need to be passed
+a MD2_CTX which is used to hold the MD2 context during multiple MD2_Update()
+function calls.  The normal method of use for this library is as follows
+
+MD2_Init(...);
+MD2_Update(...);
+...
+MD2_Update(...);
+MD2_Final(...);
+
+This library requires the inclusion of 'md2.h'.
+
+The main negative about MD2 is that it is slow, especially when compared
+to MD5.
+
+The functions are as follows:
+
+void MD2_Init(
+MD2_CTX *c);
+        This function needs to be called to initiate a MD2_CTX structure for
+        use.
+        
+void MD2_Update(
+MD2_CTX *c;
+unsigned char *data;
+unsigned long len);
+        This updates the message digest context being generated with 'len'
+        bytes from the 'data' pointer.  The number of bytes can be any
+        length.
+
+void MD2_Final(
+unsigned char *md;
+MD2_CTX *c;
+        This function is called when a message digest of the data digested
+        with MD2_Update() is wanted.  The message digest is put in the 'md'
+        array and is MD2_DIGEST_LENGTH (16) bytes long.
+
+unsigned char *MD2(
+unsigned long n;
+unsigned char *d;
+unsigned char *md;
+        This function performs a MD2_Init(), followed by a MD2_Update()
+        followed by a MD2_Final() (using a local MD2_CTX).
+        The resulting digest is put into 'md' if it is not NULL.
+        Regardless of the value of 'md', the message
+        digest is returned from the function.  If 'md' was NULL, the message
+        digest returned is being stored in a static structure.
diff --git a/src/lib/libssl/src/doc/md5.doc b/src/lib/libssl/src/doc/md5.doc
new file mode 100644
index 0000000000..519dbdc61a
--- /dev/null
+++ b/src/lib/libssl/src/doc/md5.doc
@@ -0,0 +1,50 @@
+The MD5 library.
+MD5 is a message digest algorithm that can be used to condense an arbitrary
+length message down to a 16 byte hash.  The functions all need to be passed
+a MD5_CTX which is used to hold the MD5 context during multiple MD5_Update()
+function calls.  This library also contains random number routines that are
+based on MD5
+
+The normal method of use for this library is as follows
+
+MD5_Init(...);
+MD5_Update(...);
+...
+MD5_Update(...);
+MD5_Final(...);
+
+This library requires the inclusion of 'md5.h'.
+
+The functions are as follows:
+
+void MD5_Init(
+MD5_CTX *c);
+        This function needs to be called to initiate a MD5_CTX structure for
+        use.
+        
+void MD5_Update(
+MD5_CTX *c;
+unsigned char *data;
+unsigned long len);
+        This updates the message digest context being generated with 'len'
+        bytes from the 'data' pointer.  The number of bytes can be any
+        length.
+
+void MD5_Final(
+unsigned char *md;
+MD5_CTX *c;
+        This function is called when a message digest of the data digested
+        with MD5_Update() is wanted.  The message digest is put in the 'md'
+        array and is MD5_DIGEST_LENGTH (16) bytes long.
+
+unsigned char *MD5(
+unsigned char *d;
+unsigned long n;
+unsigned char *md;
+        This function performs a MD5_Init(), followed by a MD5_Update()
+        followed by a MD5_Final() (using a local MD5_CTX).
+        The resulting digest is put into 'md' if it is not NULL.
+        Regardless of the value of 'md', the message
+        digest is returned from the function.  If 'md' was NULL, the message
+        digest returned is being stored in a static structure.
+
diff --git a/src/lib/libssl/src/doc/memory.doc b/src/lib/libssl/src/doc/memory.doc
new file mode 100644
index 0000000000..b9aa33ace0
--- /dev/null
+++ b/src/lib/libssl/src/doc/memory.doc
@@ -0,0 +1,27 @@
+In the interests of debugging SSLeay, there is an option to compile
+using some simple memory leak checking.
+
+All malloc(), free() and realloc() calls in SSLeay now go via
+Malloc(), Free() and Realloc() (except those in crypto/lhash).
+
+If CRYPTO_MDEBUG is defined, these calls are #defined to
+CRYPTO_malloc(), CRYPTO_free() and CRYPTO_realloc().
+If it is not defined, they are #defined to malloc(), free() and realloc().
+
+the CRYPTO_malloc() routines by default just call the underlying library
+functons.
+
+If CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) is called, memory leak detection is
+turned on.  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) turns it off.
+
+When turned on, each Malloc() or Realloc() call is recored along with the file
+and line number from where the call was made.   (This is done using the
+lhash library which always uses normal system malloc(3) routines).
+
+void CRYPTO_mem_leaks(BIO *b);
+void CRYPTO_mem_leaks_fp(FILE *fp);
+These both print out the list of memory that has not been free()ed.
+This will probably be rather hard to read, but if you look for the 'top level'
+structure allocation, this will often give an idea as to what is not being
+free()ed.  I don't expect people to use this stuff normally.
+
diff --git a/src/lib/libssl/src/doc/ms3-ca.doc b/src/lib/libssl/src/doc/ms3-ca.doc
new file mode 100644
index 0000000000..f8350aadc2
--- /dev/null
+++ b/src/lib/libssl/src/doc/ms3-ca.doc
@@ -0,0 +1,398 @@
+Date: Mon, 9 Jun 97 08:00:33 +0200
+From: Holger.Reif@PrakInf.TU-Ilmenau.DE (Holger Reif)
+Subject: ms3-ca.doc
+Organization: TU Ilmenau, Fak. IA, FG Telematik
+Content-Length: 14575
+Status: RO
+X-Status: 
+
+Loading client certs into MSIE 3.01
+===================================
+
+This document conatains all the information necessary to succesfully set up 
+some scripts to issue client certs to Microsoft Internet Explorer. It 
+includes the required knowledge about the model MSIE uses for client 
+certification and includes complete sample scripts ready to play with. The 
+scripts were tested against a modified ca program of SSLeay 0.6.6 and should 
+work with the regular ca program that comes with version 0.8.0. I haven't 
+tested against MSIE 4.0
+
+You can use the information contained in this document in either way you 
+want. However if you feel it saved you a lot of time I ask you to be as fair 
+as to mention my name: Holger Reif <reif@prakinf.tu-ilmenau.de>.
+
+1.) The model used by MSIE
+--------------------------
+
+The Internet Explorer doesn't come with a embedded engine for installing 
+client certs like Netscape's Navigator. It rather uses the CryptoAPI (CAPI) 
+defined by Microsoft. CAPI comes with WindowsNT 4.0 or is installed together 
+with Internet Explorer since 3.01. The advantage of this approach is a higher 
+flexibility because the certificates in the (per user) system open 
+certificate store may be used by other applications as well. The drawback 
+however is that you need to do a bit more work to get a client cert issued.
+
+CAPI defines functions which will handle basic cryptographic work, eg. 
+generating keys, encrypting some data, signing text or building a certificate 
+request. The procedure is as follows: A CAPI function generates you a key 
+pair and saves it into the certificate store. After that one builds a 
+Distinguished Name. Together with that key pair another CAPI function forms a 
+PKCS#10 request which you somehow need to submit to a CA. Finally the issued 
+cert is given to a yet another CAPI function which saves it into the 
+certificate store.
+
+The certificate store with the user's keys and certs is in the registry. You 
+will find it under HKEY_CURRENT_USER/Software/Microsoft/Cryptography/ (I 
+leave it to you as a little exercise to figure out what all the entries mean 
+;-). Note that the keys are protected only with the user's usual Windows 
+login password.
+
+2.) The practical usage
+-----------------------
+
+Unfortunatly since CAPI is a system API you can't access its functions from 
+HTML code directly. For this purpose Microsoft provides a wrapper called 
+certenr3.dll. This DLL accesses the CAPI functions and provides an interface 
+usable from Visual Basic Script. One needs to install that library on the 
+computer which wants to have client cert. The easiest way is to load it as an 
+ActiveX control (certenr3.dll is properly authenticode signed by MS ;-). If 
+you have ever enrolled e cert request at a CA you will have installed it.
+
+At time of writing certenr3.dll is contained in 
+http://www.microsoft.com/workshop/prog/security/csa/certenr3.exe. It comes 
+with an README file which explains the available functions. It is labeled 
+beta but every CA seems to use it anyway. The license.txt allows you the 
+usage for your own purposes (as far as I understood) and a somehow limited 
+distribution. 
+
+The two functions of main interest are GenerateKeyPair and AcceptCredentials. 
+For complete explanation of all possible parameters see the README file. Here 
+are only minimal required parameters and their values.
+
+GenerateKeyPair(sessionID, FASLE, szName, 0, "ClientAuth", TRUE, FALSE, 1)
+- sessionID is a (locally to that computer) unique string to correlate the 
+generated key pair with a cert installed later.
+- szName is the DN of the form "C=DE; S=Thueringen; L=Ilmenau; CN=Holger 
+Reif; 1.2.840.113549.1.9.1=reif@prakinf.tu-ilmenau.de". Note that S is the 
+abreviation for StateOrProvince. The recognized abreviation include CN, O, C, 
+OU, G, I, L, S, T. If the abreviation is unknown (eg. for PKCS#9 email addr) 
+you need to use the full object identifier. The starting point for searching 
+them could be crypto/objects.h since all OIDs know to SSLeay are listed 
+there.
+- note: the possible ninth parameter which should give a default name to the 
+certificate storage location doesn't seem to work. Changes to the constant 
+values in the call above doesn't seem to make sense. You can't generate 
+PKCS#10 extensions with that function.
+
+The result of GenerateKeyPair is the base64 encoded PKCS#10 request. However 
+it has a little strange format that SSLeay doesn't accept. (BTW I feel the 
+decision of rejecting that format as standard conforming.) It looks like 
+follows:
+        1st line with 76 chars
+        2nd line with 76 chars
+        ...
+        (n-2)th line with 76 chars
+        (n-1)th line contains a multiple of 4 chars less then 76 (possible 
+empty)
+        (n)th line has zero or 4 chars (then with 1 or 2 equal signs - the 
+                original text's lenght wasn'T a multiple of 3) 
+        The line separator has two chars: 0x0d 0x0a
+
+AcceptCredentials(sessionID, credentials, 0, FALSE)
+- sessionID needs to be the same as while generating the key pair
+- credentials is the base64 encoded PKCS#7 object containing the cert. 
+
+CRL's and CA certs are not required simply just the client cert. (It seems to 
+me that both are not even checked somehow.) The only format of the base64 
+encoded object I succesfully used was all characters in a very long string 
+without line feeds or carriage returns. (Hey, it doesn't matter, only a 
+computer reads it!)
+
+The result should be S_OK. For error handling see the example that comes with 
+certenr3.dll.
+
+A note about ASN.1 character encodings. certenr3.dll seems to know only about 
+2 of them: UniversalString and PrintableString. First it is definitely wrong 
+for an email address which is IA5STRING (checked by ssleay's ca). Second 
+unfortunately MSIE (at least until version 3.02) can't handle UniversalString 
+correctly - they just blow up you cert store! Therefore ssleay's ca (starting 
+from version 0.8.0) tries to convert the encodings automatically to IA5STRING 
+or TeletexString. The beef is it will work only for the latin-1 (western) 
+charset. Microsoft still has to do abit of homework...
+
+3.) An example
+--------------
+
+At least you need two steps: generating the key & request and then installing 
+the certificate. A real world CA would have some more steps involved, eg. 
+accepting some license. Note that both scripts shown below are just 
+experimental state without any warrenty!
+
+First how to generate a request. Note that we can't use a static page because 
+of the sessionID. I generate it from system time plus pid and hope it is 
+unique enough. Your are free to feed it through md5 to get more impressive 
+ID's ;-) Then the intended text is read in with sed which inserts the 
+sessionID. 
+
+-----BEGIN ms-enroll.cgi-----
+#!/bin/sh
+SESSION_ID=`date '+%y%m%d%H%M%S'`$$
+echo Content-type: text/html
+echo
+sed s/template_for_sessId/$SESSION_ID/ <<EOF
+<HTML><HEAD>
+<TITLE>Certificate Enrollment Test Page</TITLE>
+</HEAD><BODY>
+
+<OBJECT
+    classid="clsid:33BEC9E0-F78F-11cf-B782-00C04FD7BF43"
+    codebase=certenr3.dll
+    id=certHelper
+    >
+</OBJECT>
+
+<CENTER>
+<H2>enrollment for a personal cert</H2>
+<BR><HR WIDTH=50%><BR><P>
+<FORM NAME="MSIE_Enrollment" ACTION="ms-gencert.cgi" ENCTYPE=x-www-form-
+encoded METHOD=POST>
+<TABLE>
+    <TR><TD>Country</TD><TD><INPUT NAME="Country" VALUE=""></TD></TR>
+    <TR><TD>State</TD><TD><INPUT NAME="StateOrProvince" VALUE=""></TD></TR>
+    <TR><TD>Location</TD><TD><INPUT NAME="Location" VALUE=""></TD></TR>
+    <TR><TD>Organization</TD><TD><INPUT NAME="Organization" 
+VALUE=""></TD></TR>
+    <TR><TD>Organizational Unit</TD>
+        <TD><INPUT NAME="OrganizationalUnit" VALUE=""></TD></TR>
+    <TR><TD>Name</TD><TD><INPUT NAME="CommonName" VALUE=""></TD></TR>
+    <TR><TD>eMail Address</TD>
+        <TD><INPUT NAME="EmailAddress" VALUE=""></TD></TR>
+    <TR><TD></TD>
+        <TD><INPUT TYPE="BUTTON" NAME="submit" VALUE="Beantragen"></TD></TR>
+</TABLE>
+        <INPUT TYPE="hidden" NAME="SessionId" VALUE="template_for_sessId">
+        <INPUT TYPE="hidden" NAME="Request" VALUE="">
+</FORM>
+<BR><HR WIDTH=50%><BR><P>
+</CENTER>
+
+<SCRIPT LANGUAGE=VBS>
+    Dim DN
+
+    Sub Submit_OnClick
+        Dim TheForm
+        Set TheForm = Document.MSIE_Enrollment
+        sessionId       = TheForm.SessionId.value
+        reqHardware     = FALSE
+        C               = TheForm.Country.value
+        SP              = TheForm.StateOrProvince.value
+        L               = TheForm.Location.value
+        O               = TheForm.Organization.value
+        OU              = TheForm.OrganizationalUnit.value
+        CN              = TheForm.CommonName.value
+        Email           = TheForm.EmailAddress.value
+        szPurpose       = "ClientAuth"
+        doAcceptanceUINow   = FALSE
+        doOnline        = TRUE
+
+        DN = ""
+
+        Call Add_RDN("C", C)
+        Call Add_RDN("S", SP)
+        Call Add_RDN("L", L)
+        Call Add_RDN("O", O)
+        Call Add_RDN("OU", OU)
+        Call Add_RDN("CN", CN)
+        Call Add_RDN("1.2.840.113549.1.9.1", Email)
+                      ' rsadsi
+                                     ' pkcs
+                                       ' pkcs9
+                                         ' eMailAddress
+        On Error Resume Next
+        sz10 = certHelper.GenerateKeyPair(sessionId, _
+                FALSE, DN, 0, ClientAuth, FASLE, TRUE, 1)_
+        theError = Err.Number
+        On Error Goto 0
+        if (sz10 = Empty OR theError <> 0) Then
+            sz = "The error '" & Hex(theError) & "' occurred." & chr(13) & _
+                chr(10) & "Your credentials could not be generated."
+            result = MsgBox(sz, 0, "Credentials Enrollment")
+            Exit Sub
+        else 
+            TheForm.Request.value = sz10
+            TheForm.Submit
+        end if
+    End Sub
+
+    Sub Add_RDN(sn, value)
+        if (value <> "") then
+            if (DN <> "") then
+                DN = DN & "; "
+            end if
+            DN = DN & sn & "=" & value
+        end if
+    End Sub
+</SCRIPT>
+</BODY>
+</HTML>
+EOF
+-----END ms-enroll.cgi-----
+
+Second, how to extract the request and feed the certificate back? We need to 
+"normalize" the base64 encoding of the PKCS#10 format which means 
+regenerating the lines and wrapping with BEGIN and END line. This is done by 
+gawk. The request is taken by ca the normal way. Then the cert needs to be 
+packed into a PKCS#7 structure (note: the use of a CRL is necessary for 
+crl2pkcs7 as of version 0.6.6. Starting with 0.8.0 it it might probably be 
+ommited). Finally we need to format the PKCS#7 object and generate the HTML 
+text. I use two templates to have a clearer script.
+
+1st note: postit2 is slightly modified from a program I found at ncsa's ftp 
+site. Grab it from http://www.easterngraphics.com/certs/IX9704/postit2.c. You 
+need utils.c from there too.
+
+2nd note: I'm note quite sure wether the gawk script really handles all 
+possible inputs for the request right! Today I don't use this construction 
+anymore myself.
+
+3d note: the cert must be of version 3! This could be done with the nsComment 
+line in ssleay.cnf...
+
+------BEGIN ms-gencert.cgi-----
+#!/bin/sh
+FILE="/tmp/"`date '+%y%m%d%H%M%S'-`$$
+rm -f "$FILE".*
+
+HOME=`pwd`; export HOME  # as ssleay.cnf insists on having such an env var
+cd /usr/local/ssl #where demoCA (as named in ssleay.conf) is located
+
+postit2 -s " " -i 0x0d > "$FILE".inp  # process the FORM vars
+
+SESSION_ID=`gawk '$1 == "SessionId" { print $2; exit }' "$FILE".inp`
+
+gawk \
+        'BEGIN { \
+                OFS = ""; \
+                print "-----BEGIN CERTIFICATE REQUEST-----"; \
+                req_seen=0 \
+        } \
+        $1 == "Request" { \
+                req_seen=1; \
+                if (length($2) == 72) print($2); \
+                lastline=$2; \
+                next; \
+        } \
+        { \
+                if (req_seen == 1) { \
+                        if (length($1) >= 72) print($1); \
+                        else if (length(lastline) < 72) { \
+                                req_seen=0; \
+                                print (lastline,$1); \
+                        } \
+                lastline=$1; \
+                } \
+        } \
+        END { \
+                print "-----END CERTIFICATE REQUEST-----"; \
+        }' > "$FILE".pem < "$FILE".inp 
+
+ssleay ca -batch -in "$FILE".pem -key passwd -out "$FILE".out
+ssleay crl2pkcs7 -certfile "$FILE".out -out "$FILE".pkcs7 -in demoCA/crl.pem
+
+sed s/template_for_sessId/$SESSION_ID/ <ms-enroll2a.html >"$FILE".cert
+/usr/local/bin/gawk \
+        'BEGIN  { \
+                OFS = ""; \
+                dq = sprintf("%c",34); \
+        } \
+        $0 ~ "PKCS7" { next; } \
+        { \
+                print dq$0dq" & _"; \
+        }' <"$FILE".pkcs7 >> "$FILE".cert
+cat  ms-enroll2b.html >>"$FILE".cert
+
+echo Content-type: text/html
+echo Content-length: `wc -c "$FILE".cert`
+echo
+cat "$FILE".cert
+rm -f "$FILE".*
+-----END ms-gencert.cgi-----
+
+----BEGIN ms-enroll2a.html----
+<HTML><HEAD><TITLE>Certificate Acceptance Test Page</TITLE></HEAD><BODY>
+
+<OBJECT
+    classid="clsid:33BEC9E0-F78F-11cf-B782-00C04FD7BF43"
+    codebase=certenr3.dll
+    id=certHelper
+    >
+</OBJECT>
+
+<CENTER>
+<H2>Your personal certificate</H2>
+<BR><HR WIDTH=50%><BR><P>
+Press the button!
+<P><INPUT TYPE=BUTTON VALUE="Nimm mich!" NAME="InstallCert">
+</CENTER>
+<BR><HR WIDTH=50%><BR>
+
+<SCRIPT LANGUAGE=VBS>
+    Sub InstallCert_OnClick
+
+        sessionId       = "template_for_sessId"
+credentials = "" & _
+----END ms-enroll2a.html----
+
+----BEGIN ms-enroll2b.html----
+""
+        On Error Resume Next
+        result = certHelper.AcceptCredentials(sessionId, credentials, 0, 
+FALSE)
+        if (IsEmpty(result)) Then
+           sz = "The error '" & Err.Number & "' occurred." & chr(13) & 
+chr(10) & "This Digital ID could not be registered."
+           msgOut = MsgBox(sz, 0, "Credentials Registration Error")
+           navigate "error.html"
+        else
+           sz = "Digital ID successfully registered."
+           msgOut = MsgBox(sz, 0, "Credentials Registration")
+           navigate "success.html"
+        end if
+        Exit Sub
+    End Sub
+</SCRIPT>
+</BODY>
+</HTML>
+----END ms-enroll2b.html----
+
+4.) What do do with the cert?
+-----------------------------
+
+The cert is visible (without restarting MSIE) under the following menu:
+View->Options->Security->Personal certs. You can examine it's contents at 
+least partially.
+
+To use it for client authentication you need to use SSL3.0 (fortunately 
+SSLeay supports it with 0.8.0). Furthermore MSIE is told to only supports a 
+kind of automatic selection of certs (I personally wasn't able to test it 
+myself). But there is a requirement that the issuer of the server cert and 
+the issuer of the client cert needs to be the same (according to a developer 
+from MS). Which means: you need may more then one cert to talk to all 
+servers...
+
+I'm sure we will get a bit more experience after ApacheSSL is available for 
+SSLeay 0.8.8.
+
+
+I hope you enjoyed reading and that in future questions on this topic will 
+rarely appear on ssl-users@moncom.com ;-)
+
+Ilmenau, 9th of June 1997
+Holger Reif <reif@prakinf.tu-ilmenau.de>
+-- 
+read you later  -  Holger Reif
+----------------------------------------  Signaturprojekt Deutsche Einheit
+TU Ilmenau - Informatik - Telematik                      (Verdamp lang her)
+Holger.Reif@PrakInf.TU-Ilmenau.DE         Alt wie ein Baum werden, um ueber
+http://Remus.PrakInf.TU-Ilmenau.DE/Reif/  alle 7 Bruecken gehen zu koennen
+
diff --git a/src/lib/libssl/src/doc/ns-ca.doc b/src/lib/libssl/src/doc/ns-ca.doc
new file mode 100644
index 0000000000..836883e1a0
--- /dev/null
+++ b/src/lib/libssl/src/doc/ns-ca.doc
@@ -0,0 +1,154 @@
+The following documentation was supplied by Jeff Barber, who provided the
+patch to the CA program to add this functionality.
+
+eric
+--
+Jeff Barber                                Email: jeffb@issl.atl.hp.com
+
+Hewlett Packard                            Phone: (404) 648-9503
+Internet and System Security Lab           Fax:   (404) 648-9516
+
+                         oo
+---------------------cut /\ here for ns-ca.doc ------------------------------
+
+This document briefly describes how to use SSLeay to implement a 
+certificate authority capable of dynamically serving up client
+certificates for version 3.0 beta 5 (and presumably later) versions of
+the Netscape Navigator.  Before describing how this is done, it's
+important to understand a little about how the browser implements its
+client certificate support.  This is documented in some detail in the
+URLs based at <URL:http://home.netscape.com/eng/security/certs.html>.
+Here's a brief overview:
+
+-       The Navigator supports a new HTML tag "KEYGEN" which will cause
+        the browser to generate an RSA key pair when you submit a form
+        containing the tag.  The public key, along with an optional
+        challenge (supposedly provided for use in certificate revocation
+        but I don't use it) is signed, DER-encoded, base-64 encoded
+        and sent to the web server as the value of the variable
+        whose NAME is provided in the KEYGEN tag.  The private key is
+        stored by the browser in a local key database.
+
+        This "Signed Public Key And Challenge" (SPKAC) arrives formatted
+        into 64 character lines (which are of course URL-encoded when 
+        sent via HTTP -- i.e. spaces, newlines and most punctuatation are
+        encoded as "%HH" where HH is the hex equivalent of the ASCII code).
+        Note that the SPKAC does not contain the other usual attributes
+        of a certificate request, especially the subject name fields.
+        These must be otherwise encoded in the form for submission along
+        with the SPKAC.
+
+-       Either immediately (in response to this form submission), or at
+        some later date (a real CA will probably verify your identity in
+        some way before issuing the certificate), a web server can send a
+        certificate based on the public key and other attributes back to
+        the browser by encoding it in DER (the binary form) and sending it
+        to the browser as MIME type:
+        "Content-type: application/x-x509-user-cert"
+
+        The browser uses the public key encoded in the certificate to
+        associate the certificate with the appropriate private key in
+        its local key database.  Now, the certificate is "installed".
+
+-       When a server wants to require authentication based on client
+        certificates, it uses the right signals via the SSL protocol to
+        trigger the Navigator to ask you which certificate you want to
+        send.  Whether the certificate is accepted is dependent on CA
+        certificates and so forth installed in the server and is beyond
+        the scope of this document.
+
+
+Now, here's how the SSLeay package can be used to provide client 
+certficates:
+
+-       You prepare a file for input to the SSLeay ca application.
+        The file contains a number of "name = value" pairs that identify
+        the subject.  The names here are the same subject name component
+        identifiers used in the CA section of the lib/ssleay.conf file,
+        such as "emailAddress", "commonName" "organizationName" and so
+        forth.  Both the long version and the short version (e.g. "Email",
+        "CN", "O") can be used.
+
+        One more name is supported: this one is "SPKAC".  Its value
+        is simply the value of the base-64 encoded SPKAC sent by the
+        browser (with all the newlines and other space charaters
+        removed -- and newline escapes are NOT supported).
+
+        [ As of SSLeay 0.6.4, multiple lines are supported.
+          Put a \ at the end of each line and it will be joined with the
+          previous line with the '\n' removed - eay ]
+        
+        Here's a sample input file:
+
+C = US
+SP = Georgia
+O = Some Organization, Inc.
+OU = Netscape Compatibility Group
+CN = John X. Doe
+Email = jxdoe@someorg.com
+SPKAC = MIG0MGAwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwmk6FMJ4uAVIYbcvIOx5+bDGTfvL8X5gE+R67ccMk6rCSGbVQz2cetyQtnI+VIs0NwdD6wjuSuVtVFbLoHonowIDAQABFgAwDQYJKoZIhvcNAQEEBQADQQBFZDUWFl6BJdomtN1Bi53mwijy1rRgJ4YirF15yBEDM3DjAQkKXHYOIX+qpz4KXKnl6EYxTnGSFL5wWt8X2iyx
+
+-       You execute the ca command (either from a CGI program run out of
+        the web server, or as a later manual task) giving it the above
+        file as input.  For example, if the file were named /tmp/cert.req,
+        you'd run:
+        $SSLDIR/bin/ca -spkac /tmp/cert.req -out /tmp/cert
+
+        The output is in DER format (binary) if a -out argument is 
+        provided, as above; otherwise, it's in the PEM format (base-64
+        encoded DER).  Also, the "-batch" switch is implied by the
+        "-spkac" so you don't get asked whether to complete the signing
+        (probably it shouldn't work this way but I was only interested
+        in hacking together an online CA that could be used for issuing
+        test certificates).
+
+        The "-spkac" capability doesn't support multiple files (I think).
+
+        Any CHALLENGE provided in the SPKAC is simply ignored.
+
+        The interactions between the identification fields you provide
+        and those identified in your lib/ssleay.conf are the same as if
+        you did an ordinary "ca -in infile -out outfile" -- that is, if
+        something is marked as required in the ssleay.conf file and it
+        isn't found in the -spkac file, the certificate won't be issued.
+
+-       Now, you pick up the output from /tmp/cert and pass it back to
+        the Navigator prepending the Content-type string described earlier.
+
+-       In order to run the ca command out of a CGI program, you must
+        provide a password to decrypt the CA's private key.  You can
+        do this by using "echo MyKeyPassword | $SSLDIR/bin/ca ..."
+        I think there's a way to not encrypt the key file in the first
+        place, but I didn't see how to do that, so I made a small change
+        to the library that allows the password to be accepted from a pipe.
+        Either way is UTTERLY INSECURE and a real CA would never do that.
+
+        [ You can use the 'ssleay rsa' command to remove the password
+          from the private key, or you can use the '-key' option to the
+          ca command to specify the decryption key on the command line
+          or use the -nodes option when generating the key.
+          ca will try to clear the command line version of the password
+          but for quite a few operating systems, this is not possible.
+          - eric ]
+
+So, what do you have to do to make use of this stuff to create an online 
+demo CA capability with SSLeay?
+
+1       Create an HTML form for your users.  The form should contain
+        fields for all of the required or optional fields in ssleay.conf.
+        The form must contain a KEYGEN tag somewhere with at least a NAME
+        attribute.
+
+2       Create a CGI program to process the form input submitted by the
+        browser.  The CGI program must URL-decode the variables and create
+        the file described above, containing subject identification info
+        as well as the SPKAC block.  It should then run the the ca program
+        with the -spkac option.  If it works (check the exit status),
+        return the new certificate with the appropriate MIME type.  If not,
+        return the output of the ca command with MIME type "text/plain".
+
+3       Set up your web server to accept connections signed by your demo
+        CA.  This probably involves obtaining the PEM-encoded CA certificate
+        (ordinarily in $SSLDIR/CA/cacert.pem) and installing it into a
+        server database.  See your server manual for instructions.
+
diff --git a/src/lib/libssl/src/doc/obj.doc b/src/lib/libssl/src/doc/obj.doc
new file mode 100644
index 0000000000..bad347c936
--- /dev/null
+++ b/src/lib/libssl/src/doc/obj.doc
@@ -0,0 +1,69 @@
+The Object library.
+
+As part of my Crypto library, I found I required a method of identifying various
+objects.  These objects normally had 3 different values associated with
+them, a short text name, a long (or lower case) text name, and an
+ASN.1 Object Identifier (which is a sequence of numbers).
+This library contains a static list of objects and functions to lookup
+according to one type and to return the other types.
+
+To use these routines, 'Object.h' needs to be included.
+
+For each supported object, #define entries are defined as follows
+#define SN_Algorithm                    "Algorithm"
+#define LN_algorithm                    "algorithm"
+#define NID_algorithm                   38
+#define OBJ_algorithm                   1L,3L,14L,3L,2L
+
+SN_  stands for short name.
+LN_  stands for either long name or lowercase name.
+NID_ stands for Numeric ID.  I each object has a unique NID and this
+     should be used internally to identify objects.
+OBJ_ stands for ASN.1 Object Identifier or ASN1_OBJECT as defined in the
+     ASN1 routines.  These values are used in ASN1 encoding.
+
+The following functions are to be used to return pointers into a static
+definition of these types.  What this means is "don't try to free() any
+pointers returned from these functions.
+
+ASN1_OBJECT *OBJ_nid2obj(
+int n);
+        Return the ASN1_OBJECT that corresponds to a NID of n.
+        
+char *OBJ_nid2ln(
+int n);
+        Return the long/lower case name of the object represented by the
+        NID of n.
+        
+char *OBJ_nid2sn(
+int n);
+        Return the short name for the object represented by the NID of n.
+
+ASN1_OBJECT *OBJ_dup(
+ASN1_OBJECT *o);
+        Duplicate and return a new ASN1_OBJECT that is the same as the
+        passed parameter.
+        
+int OBJ_obj2nid(
+ASN1_OBJECT *o);
+        Given ASN1_OBJECT o, return the NID that corresponds.
+        
+int OBJ_ln2nid(
+char *s);
+        Given the long/lower case name 's', return the NID of the object.
+        
+int OBJ_sn2nid(
+char *s);
+        Given the short name 's', return the NID of the object.
+        
+char *OBJ_bsearch(
+char *key,
+char *base,
+int num,
+int size,
+int (*cmp)());
+        Since I have come across a few platforms that do not have the
+        bsearch() function, OBJ_bsearch is my version of that function.
+        Feel free to use this function, but you may as well just use the
+        normal system bsearch(3) if it is present.  This version also
+        has tolerance of being passed NULL pointers.
diff --git a/src/lib/libssl/src/doc/rand.doc b/src/lib/libssl/src/doc/rand.doc
new file mode 100644
index 0000000000..da02a07f64
--- /dev/null
+++ b/src/lib/libssl/src/doc/rand.doc
@@ -0,0 +1,141 @@
+My Random number library.
+
+These routines can be used to generate pseudo random numbers and can be
+used to 'seed' the pseudo random number generator (RNG).  The RNG make no
+effort to reproduce the same random number stream with each execution.
+Various other routines in the SSLeay library 'seed' the RNG when suitable
+'random' input data is available.  Read the section at the end for details
+on the design of the RNG.
+
+void RAND_bytes(
+unsigned char *buf,
+int num);
+        This routine puts 'num' random bytes into 'buf'.  One should make
+        sure RAND_seed() has been called before using this routine.
+        
+void RAND_seed(
+unsigned char *buf,
+int num);
+        This routine adds more 'seed' data the RNG state.  'num' bytes
+        are added to the RNG state, they are taken from 'buf'.  This
+        routine can be called with sensitive data such as user entered
+        passwords.  This sensitive data is in no way recoverable from
+        the RAND library routines or state.  Try to pass as much data
+        from 'random' sources as possible into the RNG via this function.
+        Also strongly consider using the RAND_load_file() and
+        RAND_write_file() routines.
+
+void RAND_cleanup();
+        When a program has finished with the RAND library, if it so
+        desires, it can 'zero' all RNG state.
+        
+The following 3 routines are convenience routines that can be used to
+'save' and 'restore' data from/to the RNG and it's state.
+Since the more 'random' data that is feed as seed data the better, why not
+keep it around between executions of the program?  Of course the
+application should pass more 'random' data in via RAND_seed() and 
+make sure no-one can read the 'random' data file.
+        
+char *RAND_file_name(
+char *buf,
+int size);
+        This routine returns a 'default' name for the location of a 'rand'
+        file.  The 'rand' file should keep a sequence of random bytes used
+        to initialise the RNG.  The filename is put in 'buf'.  Buf is 'size'
+        bytes long.  Buf is returned if things go well, if they do not,
+        NULL is returned.  The 'rand' file name is generated in the
+        following way.  First, if there is a 'RANDFILE' environment
+        variable, it is returned.  Second, if there is a 'HOME' environment
+        variable, $HOME/.rand is returned.  Third, NULL is returned.  NULL
+        is also returned if a buf would overflow.
+
+int RAND_load_file(
+char *file,
+long number);
+        This function 'adds' the 'file' into the RNG state.  It does this by
+        doing a RAND_seed() on the value returned from a stat() system call
+        on the file and if 'number' is non-zero, upto 'number' bytes read
+        from the file.  The number of bytes passed to RAND_seed() is returned.
+
+int RAND_write_file(
+char *file),
+        RAND_write_file() writes N random bytes to the file 'file', where
+        N is the size of the internal RND state (currently 1k).
+        This is a suitable method of saving RNG state for reloading via
+        RAND_load_file().
+
+What follows is a description of this RNG and a description of the rational
+behind it's design.
+
+It should be noted that this RNG is intended to be used to generate
+'random' keys for various ciphers including generation of DH and RSA keys.  
+
+It should also be noted that I have just created a system that I am happy with.
+It may be overkill but that does not worry me.  I have not spent that much
+time on this algorithm so if there are glaring errors, please let me know.
+Speed has not been a consideration in the design of these routines.
+
+First up I will state the things I believe I need for a good RNG.
+1) A good hashing algorithm to mix things up and to convert the RNG 'state'
+   to random numbers.
+2) An initial source of random 'state'.
+3) The state should be very large.  If the RNG is being used to generate
+   4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
+   If your RNG state only has 128 bits, you are obviously limiting the
+   search space to 128 bits, not 2048.  I'm probably getting a little
+   carried away on this last point but it does indicate that it may not be
+   a bad idea to keep quite a lot of RNG state.  It should be easier to
+   break a cipher than guess the RNG seed data.
+4) Any RNG seed data should influence all subsequent random numbers
+   generated.  This implies that any random seed data entered will have
+   an influence on all subsequent random numbers generated.
+5) When using data to seed the RNG state, the data used should not be
+   extractable from the RNG state.  I believe this should be a
+   requirement because one possible source of 'secret' semi random
+   data would be a private key or a password.  This data must
+   not be disclosed by either subsequent random numbers or a
+   'core' dump left by a program crash.
+6) Given the same initial 'state', 2 systems should deviate in their RNG state
+   (and hence the random numbers generated) over time if at all possible.
+7) Given the random number output stream, it should not be possible to determine
+   the RNG state or the next random number.
+
+
+The algorithm is as follows.
+
+There is global state made up of a 1023 byte buffer (the 'state'), a
+working message digest ('md') and a counter ('count').
+
+Whenever seed data is added, it is inserted into the 'state' as
+follows.
+        The input is chopped up into units of 16 bytes (or less for
+        the last block).  Each of these blocks is run through the MD5
+        message digest.  The data passed to the MD5 digest is the
+        current 'md', the same number of bytes from the 'state'
+        (the location determined by in incremented looping index) as
+        the current 'block' and the new key data 'block'.  The result
+        of this is kept in 'md' and also xored into the 'state' at the
+        same locations that were used as input into the MD5.
+        I believe this system addresses points 1 (MD5), 3 (the 'state'),
+        4 (via the 'md'), 5 (by the use of MD5 and xor).
+
+When bytes are extracted from the RNG, the following process is used.
+For each group of 8 bytes (or less), we do the following,
+        Input into MD5, the top 8 bytes from 'md', the byte that are
+        to be overwritten by the random bytes and bytes from the
+        'state' (incrementing looping index).  From this digest output
+        (which is kept in 'md'), the top (upto) 8 bytes are
+        returned to the caller and the bottom (upto) 8 bytes are xored
+        into the 'state'.
+        Finally, after we have finished 'generation' random bytes for the
+        called, 'count' (which is incremented) and 'md' are fed into MD5 and
+        the results are kept in 'md'.
+        I believe the above addressed points 1 (use of MD5), 6 (by
+        hashing into the 'state' the 'old' data from the caller that
+        is about to be overwritten) and 7 (by not using the 8 bytes
+        given to the caller to update the 'state', but they are used
+        to update 'md').
+
+So of the points raised, only 2 is not addressed, but sources of
+random data will always be a problem.
+        
diff --git a/src/lib/libssl/src/doc/rc2.doc b/src/lib/libssl/src/doc/rc2.doc
new file mode 100644
index 0000000000..efab015bd1
--- /dev/null
+++ b/src/lib/libssl/src/doc/rc2.doc
@@ -0,0 +1,165 @@
+The RC2 library.
+
+RC2 is a block cipher that operates on 64bit (8 byte) quantities.  It
+uses variable size key, but 128bit (16 byte) key would normally be considered
+good.  It can be used in all the modes that DES can be used.  This
+library implements the ecb, cbc, cfb64, ofb64 modes.
+
+I have implemented this library from an article posted to sci.crypt on
+11-Feb-1996.  I personally don't know how far to trust the RC2 cipher.
+While it is capable of having a key of any size, not much reseach has
+publically been done on it at this point in time (Apr-1996)
+since the cipher has only been public for a few months :-)
+It is of a similar speed to DES and IDEA, so unless it is required for
+meeting some standard (SSLv2, perhaps S/MIME), it would probably be advisable
+to stick to IDEA, or for the paranoid, Tripple DES.
+
+Mind you, having said all that, I should mention that I just read alot and
+implement ciphers, I'm a 'babe in the woods' when it comes to evaluating
+ciphers :-).
+
+For all calls that have an 'input' and 'output' variables, they can be the
+same.
+
+This library requires the inclusion of 'rc2.h'.
+
+All of the encryption functions take what is called an RC2_KEY as an 
+argument.  An RC2_KEY is an expanded form of the RC2 key.
+For all modes of the RC2 algorithm, the RC2_KEY used for
+decryption is the same one that was used for encryption.
+
+The define RC2_ENCRYPT is passed to specify encryption for the functions
+that require an encryption/decryption flag. RC2_DECRYPT is passed to
+specify decryption.
+
+Please note that any of the encryption modes specified in my DES library
+could be used with RC2.  I have only implemented ecb, cbc, cfb64 and
+ofb64 for the following reasons.
+- ecb is the basic RC2 encryption.
+- cbc is the normal 'chaining' form for block ciphers.
+- cfb64 can be used to encrypt single characters, therefore input and output
+  do not need to be a multiple of 8.
+- ofb64 is similar to cfb64 but is more like a stream cipher, not as
+  secure (not cipher feedback) but it does not have an encrypt/decrypt mode.
+- If you want triple RC2, thats 384 bits of key and you must be totally
+  obsessed with security.  Still, if you want it, it is simple enough to
+  copy the function from the DES library and change the des_encrypt to
+  RC2_encrypt; an exercise left for the paranoid reader :-).
+
+The functions are as follows:
+
+void RC2_set_key(
+RC2_KEY *ks;
+int len;
+unsigned char *key;
+int bits;
+        RC2_set_key converts an 'len' byte key into a RC2_KEY.
+        A 'ks' is an expanded form of the 'key' which is used to
+        perform actual encryption.  It can be regenerated from the RC2 key
+        so it only needs to be kept when encryption or decryption is about
+        to occur.  Don't save or pass around RC2_KEY's since they
+        are CPU architecture dependent, 'key's are not.  RC2 is an
+        interesting cipher in that it can be used with a variable length
+        key.  'len' is the length of 'key' to be used as the key.
+        A 'len' of 16 is recomended.  The 'bits' argument is an
+        interesting addition which I only found out about in Aug 96.
+        BSAFE uses this parameter to 'limit' the number of bits used
+        for the key.  To use the 'key' unmodified, set bits to 1024.
+        This is what old versions of my RC2 library did (SSLeay 0.6.3).
+        RSAs BSAFE library sets this parameter to be 128 if 128 bit
+        keys are being used.  So to be compatable with BSAFE, set it
+        to 128, if you don't want to reduce RC2's key length, leave it
+        at 1024.
+        
+void RC2_encrypt(
+unsigned long *data,
+RC2_KEY *key,
+int encrypt);
+        This is the RC2 encryption function that gets called by just about
+        every other RC2 routine in the library.  You should not use this
+        function except to implement 'modes' of RC2.  I say this because the
+        functions that call this routine do the conversion from 'char *' to
+        long, and this needs to be done to make sure 'non-aligned' memory
+        access do not occur.
+        Data is a pointer to 2 unsigned long's and key is the
+        RC2_KEY to use.  Encryption or decryption is indicated by 'encrypt'.
+        which can have the values RC2_ENCRYPT or RC2_DECRYPT.
+
+void RC2_ecb_encrypt(
+unsigned char *in,
+unsigned char *out,
+RC2_KEY *key,
+int encrypt);
+        This is the basic Electronic Code Book form of RC2 (in DES this
+        mode is called Electronic Code Book so I'm going to use the term
+        for rc2 as well.
+        Input is encrypted into output using the key represented by
+        key.  Depending on the encrypt, encryption or
+        decryption occurs.  Input is 8 bytes long and output is 8 bytes.
+        
+void RC2_cbc_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+RC2_KEY *ks,
+unsigned char *ivec,
+int encrypt);
+        This routine implements RC2 in Cipher Block Chaining mode.
+        Input, which should be a multiple of 8 bytes is encrypted
+        (or decrypted) to output which will also be a multiple of 8 bytes.
+        The number of bytes is in length (and from what I've said above,
+        should be a multiple of 8).  If length is not a multiple of 8, bad 
+        things will probably happen.  ivec is the initialisation vector.
+        This function updates iv after each call so that it can be passed to
+        the next call to RC2_cbc_encrypt().
+        
+void RC2_cfb64_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+RC2_KEY *schedule,
+unsigned char *ivec,
+int *num,
+int encrypt);
+        This is one of the more useful functions in this RC2 library, it
+        implements CFB mode of RC2 with 64bit feedback.
+        This allows you to encrypt an arbitrary number of bytes,
+        you do not require 8 byte padding.  Each call to this
+        routine will encrypt the input bytes to output and then update ivec
+        and num.  Num contains 'how far' we are though ivec.
+        'Encrypt' is used to indicate encryption or decryption.
+        CFB64 mode operates by using the cipher to generate a stream
+        of bytes which is used to encrypt the plain text.
+        The cipher text is then encrypted to generate the next 64 bits to
+        be xored (incrementally) with the next 64 bits of plain
+        text.  As can be seen from this, to encrypt or decrypt,
+        the same 'cipher stream' needs to be generated but the way the next
+        block of data is gathered for encryption is different for
+        encryption and decryption.
+        
+void RC2_ofb64_encrypt(
+unsigned char *in,
+unsigned char *out,
+long length,
+RC2_KEY *schedule,
+unsigned char *ivec,
+int *num);
+        This functions implements OFB mode of RC2 with 64bit feedback.
+        This allows you to encrypt an arbitrary number of bytes,
+        you do not require 8 byte padding.  Each call to this
+        routine will encrypt the input bytes to output and then update ivec
+        and num.  Num contains 'how far' we are though ivec.
+        This is in effect a stream cipher, there is no encryption or
+        decryption mode.
+        
+For reading passwords, I suggest using des_read_pw_string() from my DES library.
+To generate a password from a text string, I suggest using MD5 (or MD2) to
+produce a 16 byte message digest that can then be passed directly to
+RC2_set_key().
+
+=====
+For more information about the specific RC2 modes in this library
+(ecb, cbc, cfb and ofb), read the section entitled 'Modes of DES' from the
+documentation on my DES library.  What is said about DES is directly
+applicable for RC2.
+
diff --git a/src/lib/libssl/src/doc/rc4.doc b/src/lib/libssl/src/doc/rc4.doc
new file mode 100644
index 0000000000..4b2897eb74
--- /dev/null
+++ b/src/lib/libssl/src/doc/rc4.doc
@@ -0,0 +1,44 @@
+The RC4 library.
+RC4 is a stream cipher that operates on a byte stream.  It can be used with
+any length key but I would recommend normally using 16 bytes.
+
+This library requires the inclusion of 'rc4.h'.
+
+The RC4 encryption function takes what is called an RC4_KEY as an argument.
+The RC4_KEY is generated by the RC4_set_key function from the key bytes.
+
+RC4, being a stream cipher, does not have an encryption or decryption mode.
+It produces a stream of bytes that the input stream is xor'ed against and
+so decryption is just a case of 'encrypting' again with the same key.
+
+I have only put in one 'mode' for RC4 which is the normal one.  This means
+there is no initialisation vector and there is no feedback of the cipher
+text into the cipher.  This implies that you should not ever use the
+same key twice if you can help it.  If you do, you leave yourself open to
+known plain text attacks; if you know the plain text and
+corresponding cipher text in one message, all messages that used the same
+key can have the cipher text decoded for the corresponding positions in the
+cipher stream.
+
+The main positive feature of RC4 is that it is a very fast cipher; about 4
+times faster that DES.  This makes it ideally suited to protocols where the
+key is randomly chosen, like SSL.
+
+The functions are as follows:
+
+void RC4_set_key(
+RC4_KEY *key;
+int len;
+unsigned char *data);
+        This function initialises the RC4_KEY structure with the key passed
+        in 'data', which is 'len' bytes long.  The key data can be any
+        length but 16 bytes seems to be a good number.
+
+void RC4(
+RC4_KEY *key;
+unsigned long len;
+unsigned char *in;
+unsigned char *out);
+        Do the actual RC4 encryption/decryption.  Using the 'key', 'len'
+        bytes are transformed from 'in' to 'out'.  As mentioned above,
+        decryption is the operation as encryption.
diff --git a/src/lib/libssl/src/doc/readme b/src/lib/libssl/src/doc/readme
new file mode 100644
index 0000000000..824d4fd0e2
--- /dev/null
+++ b/src/lib/libssl/src/doc/readme
@@ -0,0 +1,6 @@
+This is the old 0.6.6 docuementation.  Most of the cipher stuff is still
+relevent but I'm working (very slowly) on new docuemtation.
+The current version can be found online at
+
+http://www.cryptsoft.com/ssleay/doc
+
diff --git a/src/lib/libssl/src/doc/ref.doc b/src/lib/libssl/src/doc/ref.doc
new file mode 100644
index 0000000000..211559900d
--- /dev/null
+++ b/src/lib/libssl/src/doc/ref.doc
@@ -0,0 +1,48 @@
+I have lots more references etc, and will update this list in the future,
+30 Aug 1996 - eay
+
+
+SSL     The SSL Protocol - from Netscapes.
+
+RC4     Newsgroups: sci.crypt
+        From: sterndark@netcom.com (David Sterndark)
+        Subject: RC4 Algorithm revealed.
+        Message-ID: <sternCvKL4B.Hyy@netcom.com>
+
+RC2     Newsgroups: sci.crypt
+        From: pgut01@cs.auckland.ac.nz (Peter Gutmann)
+        Subject: Specification for Ron Rivests Cipher No.2
+        Message-ID: <4fk39f$f70@net.auckland.ac.nz>
+
+MD2     RFC1319 The MD2 Message-Digest Algorithm
+MD5     RFC1321 The MD5 Message-Digest Algorithm
+
+X509 Certificates
+        RFC1421 Privacy Enhancement for Internet Electronic Mail: Part I
+        RFC1422 Privacy Enhancement for Internet Electronic Mail: Part II
+        RFC1423 Privacy Enhancement for Internet Electronic Mail: Part III
+        RFC1424 Privacy Enhancement for Internet Electronic Mail: Part IV
+
+RSA and various standard encoding
+        PKCS#1 RSA Encryption Standard
+        PKCS#5 Password-Based Encryption Standard
+        PKCS#7 Cryptographic Message Syntax Standard
+        A Layman's Guide to a Subset of ASN.1, BER, and DER
+        An Overview of the PKCS Standards
+        Some Examples of the PKCS Standards
+
+IDEA    Chapter 3 The Block Cipher IDEA
+
+RSA, prime number generation and bignum algorithms
+        Introduction To Algorithms,
+        Thomas Cormen, Charles Leiserson, Ronald Rivest,
+        Section 29 Arithmetic Circuits
+        Section 33 Number-Theoretic Algorithms
+
+Fast Private Key algorithm
+        Fast Decipherment Algorithm for RSA Public-Key Cryptosystem
+        J.-J. Quisquater and C. Couvreur, Electronics Letters,
+        14th October 1982, Vol. 18 No. 21
+
+Prime number generation and bignum algorithms.
+        PGP-2.3a
diff --git a/src/lib/libssl/src/doc/req.1 b/src/lib/libssl/src/doc/req.1
new file mode 100644
index 0000000000..684fda580e
--- /dev/null
+++ b/src/lib/libssl/src/doc/req.1
@@ -0,0 +1,137 @@
+The 'req' command is used to manipulate and deal with pkcs#10
+certificate requests.
+
+It's default mode of operation is to load a certificate and then
+write it out again.
+
+By default the 'req' is read from stdin in 'PEM' format.
+The -inform option can be used to specify 'pem' format or 'der'
+format.  PEM format is the base64 encoding of the DER format.
+
+By default 'req' then writes the request back out. -outform can be used
+to indicate the desired output format, be it 'pem' or 'der'.
+
+To specify an input file, use the '-in' option and the '-out' option
+can be used to specify the output file.
+
+If you wish to perform a command and not output the certificate
+request afterwards, use the '-noout' option.
+
+When a certificate is loaded, it can be printed in a human readable
+ascii format via the '-text' option.
+
+To check that the signature on a certificate request is correct, use
+the '-verify' option to make sure that the private key contained in the
+certificate request corresponds to the signature.
+
+Besides the default mode, there is also the 'generate a certificate
+request' mode.  There are several flags that trigger this mode.
+
+-new will generate a new RSA key (if required) and then prompts
+the user for details for the certificate request.
+-newkey has an argument that is the number of bits to make the new
+key.  This function also triggers '-new'.
+
+The '-new' option can have a key to use specified instead of having to
+load one, '-key' is used to specify the file containg the key.
+-keyform can be used to specify the format of the key.  Only
+'pem' and 'der' formats are supported, later, 'netscape' format may be added.
+
+Finally there is the '-x509' options which makes req output a self
+signed x509 certificate instead of a certificate request.
+
+Now as you may have noticed, there are lots of default options that
+cannot be specified via the command line.  They are held in a 'template'
+or 'configuration file'.  The -config option specifies which configuration
+file to use.  See conf.doc for details on the syntax of this file.
+
+The req command uses the 'req' section of the config file.
+
+---
+# The following variables are defined.  For this example I will populate
+# the various values
+[ req ]
+default_bits    = 512           # default number of bits to use.
+default_keyfile = testkey.pem   # Where to write the generated keyfile
+                                # if not specified.
+distinguished_name= req_dn      # The section that contains the
+                                # information about which 'object' we
+                                # want to put in the DN.
+attributes      = req_attr      # The objects we want for the
+                                # attributes field.
+encrypt_rsa_key = no            # Should we encrypt newly generated
+                                # keys.  I strongly recommend 'yes'.
+
+# The distinguished name section.  For the following entries, the
+# object names must exist in the SSLeay header file objects.h.  If they
+# do not, they will be silently ignored.  The entries have the following
+# format.
+# <object_name>         => string to prompt with
+# <object_name>_default => default value for people
+# <object_name>_value   => Automatically use this value for this field.
+# <object_name>_min     => minimum number of characters for data (def. 0)
+# <object_name>_max     => maximum number of characters for data (def. inf.)
+# All of these entries are optional except for the first one.
+[ req_dn ]
+countryName                     = Country Name (2 letter code)
+countryName_default             = AU
+
+stateOrProvinceName             = State or Province Name (full name)
+stateOrProvinceName_default     = Queensland
+
+localityName                    = Locality Name (eg, city)
+
+organizationName                = Organization Name (eg, company)
+organizationName_default        = Mincom Pty Ltd
+
+organizationalUnitName          = Organizational Unit Name (eg, section)
+organizationalUnitName_default  = MTR
+
+commonName                      = Common Name (eg, YOUR name)
+commonName_max                  = 64
+
+emailAddress                    = Email Address
+emailAddress_max                = 40
+
+# The next section is the attributes section.  This is exactly the
+# same as for the previous section except that the resulting objects are
+# put in the attributes field. 
+[ req_attr ]
+challengePassword               = A challenge password
+challengePassword_min           = 4
+challengePassword_max           = 20
+
+unstructuredName                = An optional company name
+
+----
+Also note that the order that attributes appear in this file is the
+order they will be put into the distinguished name.
+
+Once this request has been generated, it can be sent to a CA for
+certifying.
+
+----
+A few quick examples....
+
+To generate a new request and a new key
+req -new
+
+To generate a new request and a 1058 bit key
+req -newkey 1058
+
+To generate a new request using a pre-existing key
+req -new -key key.pem
+
+To generate a self signed x509 certificate from a certificate
+request using a supplied key, and we want to see the text form of the
+output certificate (which we will put in the file selfSign.pem
+req -x509 -in req.pem -key key.pem -text -out selfSign.pem
+
+Verify that the signature is correct on a certificate request.
+req -verify -in req.pem
+
+Verify that the signature was made using a specified public key.
+req -verify -in req.pem -key key.pem
+
+Print the contents of a certificate request
+req -text -in req.pem
diff --git a/src/lib/libssl/src/doc/rsa.doc b/src/lib/libssl/src/doc/rsa.doc
new file mode 100644
index 0000000000..f260452bc6
--- /dev/null
+++ b/src/lib/libssl/src/doc/rsa.doc
@@ -0,0 +1,135 @@
+The RSA encryption and utility routines.
+
+The RSA routines are built on top of a big number library (the BN library).
+There are support routines in the X509 library for loading and manipulating
+the various objects in the RSA library.  When errors are returned, read
+about the ERR library for how to access the error codes.
+
+All RSA encryption is done according to the PKCS-1 standard which is
+compatible with PEM and RSAref.  This means that any values being encrypted
+must be less than the size of the modulus in bytes, minus 10, bytes long.
+
+This library uses RAND_bytes()() for it's random data, make sure to feed
+RAND_seed() with lots of interesting and varied data before using these
+routines.
+
+The RSA library has one specific data type, the RSA structure.
+It is composed of 8 BIGNUM variables (see the BN library for details) and
+can hold either a private RSA key or a public RSA key.
+Some RSA libraries have different structures for public and private keys, I
+don't.  For my libraries, a public key is determined by the fact that the
+RSA->d value is NULL.  These routines will operate on any size RSA keys.
+While I'm sure 4096 bit keys are very very secure, they take a lot longer
+to process that 1024 bit keys :-).
+
+The function in the RSA library are as follows.
+
+RSA *RSA_new();
+        This function creates a new RSA object.  The sub-fields of the RSA
+        type are also malloced so you should always use this routine to
+        create RSA variables.
+        
+void RSA_free(
+RSA *rsa);
+        This function 'frees' an RSA structure.  This routine should always
+        be used to free the RSA structure since it will also 'free' any
+        sub-fields of the RSA type that need freeing.
+        
+int RSA_size(
+RSA *rsa);      
+        This function returns the size of the RSA modulus in bytes.  Why do
+        I need this you may ask, well the reason is that when you encrypt
+        with RSA, the output string will be the size of the RSA modulus.
+        So the output for the RSA_encrypt and the input for the RSA_decrypt
+        routines need to be RSA_size() bytes long, because this is how many
+        bytes are expected.
+        
+For the following 4 RSA encryption routines, it should be noted that
+RSA_private_decrypt() should be used on the output from 
+RSA_public_encrypt() and RSA_public_decrypt() should be used on
+the output from RSA_private_encrypt().
+        
+int RSA_public_encrypt(
+int from_len;
+unsigned char *from     
+unsigned char *to       
+RSA *rsa);
+        This function implements RSA public encryption, the rsa variable
+        should be a public key (but can be a private key).  'from_len'
+        bytes taken from 'from' and encrypted and put into 'to'.  'to' needs
+        to be at least RSA_size(rsa) bytes long.  The number of bytes
+        written into 'to' is returned.  -1 is returned on an error.  The
+        operation performed is
+        to = from^rsa->e mod rsa->n.
+        
+int RSA_private_encrypt(
+int from_len;
+unsigned char *from     
+unsigned char *to       
+RSA *rsa);
+        This function implements RSA private encryption, the rsa variable
+        should be a private key.  'from_len' bytes taken from
+        'from' and encrypted and put into 'to'.  'to' needs
+        to be at least RSA_size(rsa) bytes long.  The number of bytes
+        written into 'to' is returned.  -1 is returned on an error.  The
+        operation performed is
+        to = from^rsa->d mod rsa->n.
+
+int RSA_public_decrypt(
+int from_len;
+unsigned char *from     
+unsigned char *to       
+RSA *rsa);
+        This function implements RSA public decryption, the rsa variable
+        should be a public key (but can be a private key).  'from_len'
+        bytes are taken from 'from' and decrypted.  The decrypted data is
+        put into 'to'.  The number of bytes encrypted is returned.  -1 is
+        returned to indicate an error. The operation performed is
+        to = from^rsa->e mod rsa->n.
+
+int RSA_private_decrypt(
+int from_len;
+unsigned char *from     
+unsigned char *to       
+RSA *rsa);
+        This function implements RSA private decryption, the rsa variable
+        should be a private key.  'from_len' bytes are taken
+        from 'from' and decrypted.  The decrypted data is
+        put into 'to'.  The number of bytes encrypted is returned.  -1 is
+        returned to indicate an error. The operation performed is
+        to = from^rsa->d mod rsa->n.
+
+int RSA_mod_exp(
+BIGNUM *n;
+BIGNUM *p;
+RSA *rsa);
+        Normally you will never use this routine.
+        This is really an internal function which is called by
+        RSA_private_encrypt() and RSA_private_decrypt().  It performs
+        n=n^p mod rsa->n except that it uses the 5 extra variables in the
+        RSA structure to make this more efficient.
+        
+RSA *RSA_generate_key(
+int bits;
+unsigned long e;
+void (*callback)();
+char *cb_arg;
+        This routine is used to generate RSA private keys.  It takes
+        quite a period of time to run and should only be used to
+        generate initial private keys that should then be stored
+        for later use.  The passed callback function 
+        will be called periodically so that feedback can be given
+        as to how this function is progressing.
+        'bits' is the length desired for the modulus, so it would be 1024
+        to generate a 1024 bit private key.
+        'e' is the value to use for the public exponent 'e'.  Traditionally
+        it is set to either 3 or 0x10001.
+        The callback function (if not NULL) is called in the following
+        situations.
+        when we have generated a suspected prime number to test,
+        callback(0,num1++,cb_arg).  When it passes a prime number test,
+        callback(1,num2++,cb_arg).  When it is rejected as one of
+        the 2 primes required due to gcd(prime,e value) != 0,
+        callback(2,num3++,cb_arg).  When finally accepted as one
+        of the 2 primes, callback(3,num4++,cb_arg).
+
diff --git a/src/lib/libssl/src/doc/rsaref.doc b/src/lib/libssl/src/doc/rsaref.doc
new file mode 100644
index 0000000000..0505b76f76
--- /dev/null
+++ b/src/lib/libssl/src/doc/rsaref.doc
@@ -0,0 +1,35 @@
+This package can be compiled to use the RSAref library.
+This library is not allowed outside of the USA but inside the USA it is
+claimed by RSA to be the only RSA public key library that can be used
+besides BSAFE..
+
+There are 2 files, rsaref/rsaref.c and rsaref/rsaref.h that contain the glue
+code to use RSAref.  These files were written by looking at the PGP
+source code and seeing which routines it used to access RSAref.
+I have also been sent by some-one a copy of the RSAref header file that
+contains the library error codes.
+
+[ Jun 1996 update - I have recently gotten hold of RSAref 2.0 from
+  South Africa and have been doing some performace tests. ]
+        
+They have now been tested against the recently announced RSAEURO
+library.
+
+There are 2 ways to use SSLeay and RSAref.  First, to build so that
+the programs must be linked with RSAref, add '-DRSAref' to CFLAG in the top
+level makefile and -lrsaref (or where ever you are keeping RSAref) to
+EX_LIBS.
+
+To build a makefile via util/mk1mf.pl to do this, use the 'rsaref' option.
+
+The second method is to build as per normal and link applications with
+the RSAglue library.  The correct library order would be
+cc -o cmd cmd.o -lssl -lRSAglue -lcrypto -lrsaref -ldes
+The RSAglue library is built in the rsa directory and is NOT
+automatically installed.
+
+Be warned that the RSAEURO library, that is claimed to be compatible
+with RSAref contains a different value for the maximum number of bits
+supported.  This changes structure sizes and so if you are using
+RSAEURO, change the value of RSAref_MAX_BITS in rsa/rsaref.h
+
diff --git a/src/lib/libssl/src/doc/s_mult.doc b/src/lib/libssl/src/doc/s_mult.doc
new file mode 100644
index 0000000000..726085bc57
--- /dev/null
+++ b/src/lib/libssl/src/doc/s_mult.doc
@@ -0,0 +1,17 @@
+s_mult is a test program I hacked up on a Sunday for testing non-blocking
+IO.  It has a select loop at it's centre that handles multiple readers
+and writers.
+
+Try the following command
+ssleay s_mult -echo -nbio -ssl -v
+echo - sends any sent text back to the sender
+nbio - turns on non-blocking IO
+ssl  - accept SSL connections, default is normal text
+v    - print lots
+        type Q<cr> to quit
+
+In another window, run the following
+ssleay s_client -pause </etc/termcap
+
+The pause option puts in a 1 second pause in each read(2)/write(2) call
+so the other end will have read()s fail.
diff --git a/src/lib/libssl/src/doc/session.doc b/src/lib/libssl/src/doc/session.doc
new file mode 100644
index 0000000000..ffccb0306e
--- /dev/null
+++ b/src/lib/libssl/src/doc/session.doc
@@ -0,0 +1,297 @@
+I have just checked over and re-worked the session stuff.
+The following brief example will ignore all setup information to do with
+authentication.
+
+Things operate as follows.
+
+The SSL environment has a 'context', a SSL_CTX structure.  This holds the
+cached SSL_SESSIONS (which can be reused) and the certificate lookup
+information.  Each SSL structure needs to be associated with a SSL_CTX.
+Normally only one SSL_CTX structure is needed per program.
+
+SSL_CTX *SSL_CTX_new(void ); 
+void    SSL_CTX_free(SSL_CTX *);
+These 2 functions create and destroy SSL_CTX structures
+
+The SSL_CTX has a session_cache_mode which is by default,
+in SSL_SESS_CACHE_SERVER mode.  What this means is that the library
+will automatically add new session-id's to the cache apon sucsessful
+SSL_accept() calls.
+If SSL_SESS_CACHE_CLIENT is set, then client certificates are also added
+to the cache.
+SSL_set_session_cache_mode(ctx,mode)  will set the 'mode' and
+SSL_get_session_cache_mode(ctx) will get the cache 'mode'.
+The modes can be
+SSL_SESS_CACHE_OFF      - no caching
+SSL_SESS_CACHE_CLIENT   - only SSL_connect()
+SSL_SESS_CACHE_SERVER   - only SSL_accept()
+SSL_SESS_NO_CACHE_BOTH  - Either SSL_accept() or SSL_connect().
+If SSL_SESS_CACHE_NO_AUTO_CLEAR is set, old timed out sessions are
+not automatically removed each 255, SSL_connect()s or SSL_accept()s.
+
+By default, apon every 255 successful SSL_connect() or SSL_accept()s,
+the cache is flush.  Please note that this could be expensive on
+a heavily loaded SSL server, in which case, turn this off and
+clear the cache of old entries 'manually' (with one of the functions
+listed below) every few hours.  Perhaps I should up this number, it is hard
+to say.  Remember, the '255' new calls is just a mechanims to get called
+every now and then, in theory at most 255 new session-id's will have been
+added but if 100 are added every minute, you would still have
+500 in the cache before any would start being flushed (assuming a 3 minute
+timeout)..
+
+int SSL_CTX_sess_hits(SSL_CTX *ctx);
+int SSL_CTX_sess_misses(SSL_CTX *ctx);
+int SSL_CTX_sess_timeouts(SSL_CTX *ctx);
+These 3 functions return statistics about the SSL_CTX.  These 3 are the
+number of session id reuses.  hits is the number of reuses, misses are the
+number of lookups that failed, and timeouts is the number of cached
+entries ignored because they had timeouted.
+
+ctx->new_session_cb is a function pointer to a function of type
+int new_session_callback(SSL *ssl,SSL_SESSION *new);
+This function, if set in the SSL_CTX structure is called whenever a new
+SSL_SESSION is added to the cache.  If the callback returns non-zero, it
+means that the application will have to do a SSL_SESSION_free()
+on the structure (this is
+to do with the cache keeping the reference counts correct, without the
+application needing to know about it.
+The 'active' parameter is the current SSL session for which this connection
+was created.
+
+void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,int (*cb)());
+to set the callback,
+int (*cb)() SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)
+to get the callback.
+
+If the 'get session' callback is set, when a session id is looked up and
+it is not in the session-id cache, this callback is called.  The callback is
+of the form
+SSL_SESSION *get_session_callback(unsigned char *sess_id,int sess_id_len,
+        int *copy);
+
+The get_session_callback is intended to return null if no session id is found.
+The reference count on the SSL_SESSION in incremented by the SSL library,
+if copy is 1.  Otherwise, the reference count is not modified.
+
+void SSL_CTX_sess_set_get_cb(ctx,cb) sets the callback and
+int (*cb)()SSL_CTX_sess_get_get_cb(ctx) returns the callback.
+
+These callbacks are basically indended to be used by processes to
+send their session-id's to other processes.  I currently have not implemented
+non-blocking semantics for these callbacks, it is upto the appication
+to make the callbacks effiecent if they require blocking (perhaps
+by 'saving' them and then 'posting them' when control returns from
+the SSL_accept().
+
+LHASH *SSL_CTX_sessions(SSL_CTX *ctx)
+This returns the session cache.  The lhash strucutre can be accessed for
+statistics about the cache.
+
+void lh_stats(LHASH *lh, FILE *out);
+void lh_node_stats(LHASH *lh, FILE *out);
+void lh_node_usage_stats(LHASH *lh, FILE *out);
+
+can be used to print details about it's activity and current state.
+You can also delve directly into the lhash structure for 14 different
+counters that are kept against the structure.  When I wrote the lhash library,
+I was interested in gathering statistics :-).
+Have a read of doc/lhash.doc in the SSLeay distribution area for more details
+on the lhash library.
+
+Now as mentioned ealier, when a SSL is created, it needs a SSL_CTX.
+SSL *   SSL_new(SSL_CTX *);
+
+This stores a session.  A session is secret information shared between 2
+SSL contexts.  It will only be created if both ends of the connection have
+authenticated their peer to their satisfaction.  It basically contains
+the information required to use a particular secret key cipher.
+
+To retrieve the SSL_CTX being used by a SSL,
+SSL_CTX *SSL_get_SSL_CTX(SSL *s);
+
+Now when a SSL session is established between to programs, the 'session'
+information that is cached in the SSL_CTX can me manipulated by the
+following functions.
+int SSL_set_session(SSL *s, SSL_SESSION *session);
+This will set the SSL_SESSION to use for the next SSL_connect().  If you use
+this function on an already 'open' established SSL connection, 'bad things
+will happen'.  This function is meaning-less when used on a ssl strucutre
+that is just about to be used in a SSL_accept() call since the
+SSL_accept() will either create a new session or retrieve one from the
+cache.
+
+SSL_SESSION *SSL_get_session(SSL *s);
+This will return the SSL_SESSION for the current SSL, NULL if there is
+no session associated with the SSL structure.
+
+The SSL sessions are kept in the SSL_CTX in a hash table, to remove a
+session
+void    SSL_CTX_remove_session(SSL_CTX *,SSL_SESSION *c);
+and to add one
+int    SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
+SSL_CTX_add_session() returns 1 if the session was already in the cache (so it
+was not added).
+Whenever a new session is created via SSL_connect()/SSL_accept(),
+they are automatically added to the cache, depending on the session_cache_mode
+settings.  SSL_set_session()
+does not add it to the cache.  Just call SSL_CTX_add_session() if you do want the
+session added.  For a 'client' this would not normally be the case.
+SSL_CTX_add_session() is not normally ever used, except for doing 'evil' things
+which the next 2 funtions help you do.
+
+int     i2d_SSL_SESSION(SSL_SESSION *in,unsigned char **pp);
+SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a,unsigned char **pp,long length);
+These 2 functions are in the standard ASN1 library form and can be used to
+load and save to a byte format, the SSL_SESSION structure.
+With these functions, you can save and read these structures to a files or
+arbitary byte string.
+The PEM_write_SSL_SESSION(fp,x) and PEM_read_SSL_SESSION(fp,x,cb) will
+write to a file pointer in base64 encoding.
+
+What you can do with this, is pass session information between separate
+processes.  Please note, that you will probably also need to modify the
+timeout information on the SSL_SESSIONs.
+
+long SSL_get_time(SSL_SESSION *s)
+will return the 'time' that the session
+was loaded.  The timeout is relative to this time.  This information is
+saved when the SSL_SESSION is converted to binarary but it is stored
+in as a unix long, which is rather OS dependant, but easy to convert back.
+
+long SSL_set_time(SSL_SESSION *s,long t) will set the above mentioned time.
+The time value is just the value returned from time(3), and should really
+be defined by be to be time_t.
+
+long SSL_get_timeout(SSL_SESSION *s);
+long SSL_set_timeout(SSL_SESSION *s,long t);
+These 2 retrieve and set the timeout which is just a number of secconds
+from the 'SSL_get_time()' value.  When this time period has elapesed,
+the session will no longer be in the cache (well it will actually be removed
+the next time it is attempted to be retrieved, so you could 'bump'
+the timeout so it remains valid).
+The 'time' and 'timeout' are set on a session when it is created, not reset
+each time it is reused.  If you did wish to 'bump it', just after establishing
+a connection, do a
+SSL_set_time(ssl,time(NULL));
+
+You can also use
+SSL_CTX_set_timeout(SSL_CTX *ctx,unsigned long t) and
+SSL_CTX_get_timeout(SSL_CTX *ctx) to manipulate the default timeouts for
+all SSL connections created against a SSL_CTX.  If you set a timeout in
+an SSL_CTX, all new SSL's created will inherit the timeout.  It can be over
+written by the SSL_set_timeout(SSL *s,unsigned long t) function call.
+If you 'set' the timeout back to 0, the system default will be used.
+
+SSL_SESSION *SSL_SESSION_new();
+void SSL_SESSION_free(SSL_SESSION *ses);
+These 2 functions are used to create and dispose of SSL_SESSION functions.
+You should not ever normally need to use them unless you are using 
+i2d_SSL_SESSION() and/or d2i_SSL_SESSION().  If you 'load' a SSL_SESSION
+via d2i_SSL_SESSION(), you will need to SSL_SESSION_free() it.
+Both SSL_set_session() and SSL_CTX_add_session() will 'take copies' of the
+structure (via reference counts) when it is passed to them.
+
+SSL_CTX_flush_sessions(ctx,time);
+The first function will clear all sessions from the cache, which have expired
+relative to 'time' (which could just be time(NULL)).
+
+SSL_CTX_flush_sessions(ctx,0);
+This is a special case that clears everything.
+
+As a final comment, a 'session' is not enough to establish a new
+connection.  If a session has timed out, a certificate and private key
+need to have been associated with the SSL structure.
+SSL_copy_session_id(SSL *to,SSL *from); will copy not only the session
+strucutre but also the private key and certificate associated with
+'from'.
+
+EXAMPLES.
+
+So lets play at being a wierd SSL server.
+
+/* setup a context */
+ctx=SSL_CTX_new();
+
+/* Lets load some session from binary into the cache, why one would do
+ * this is not toally clear, but passing between programs does make sense
+ * Perhaps you are using 4096 bit keys and are happy to keep them
+ * valid for a week, to avoid the RSA overhead of 15 seconds, I'm not toally
+ * sure, perhaps this is a process called from an SSL inetd and this is being 
+ * passed to the application. */
+session=d2i_SSL_SESSION(....)
+SSL_CTX_add_session(ctx,session);
+
+/* Lets even add a session from a file */
+session=PEM_read_SSL_SESSION(....)
+SSL_CTX_add_session(ctx,session);
+
+/* create a new SSL structure */
+ssl=SSL_new(ctx);
+
+/* At this point we want to be able to 'create' new session if
+ * required, so we need a certificate and RSAkey. */
+SSL_use_RSAPrivateKey_file(ssl,...)
+SSL_use_certificate_file(ssl,...)
+
+/* Now since we are a server, it make little sence to load a session against
+ * the ssl strucutre since a SSL_accept() will either create a new session or
+ * grab an existing one from the cache. */
+
+/* grab a socket descriptor */
+fd=accept(...);
+
+/* associated it with the ssl strucutre */
+SSL_set_fd(ssl,fd);
+
+SSL_accept(ssl); /* 'do' SSL using out cert and RSA key */
+
+/* Lets print out the session details or lets save it to a file,
+ * perhaps with a secret key cipher, so that we can pass it to the FBI
+ * when they want to decode the session :-).  While we have RSA
+ * this does not matter much but when I do SSLv3, this will allow a mechanism
+ * for the server/client to record the information needed to decode
+ * the traffic that went over the wire, even when using Diffie-Hellman */
+PEM_write_SSL_SESSION(SSL_get_session(ssl),stdout,....)
+
+Lets 'connect' back to the caller using the same session id.
+
+ssl2=SSL_new(ctx);
+fd2=connect(them);
+SSL_set_fd(ssl2,fd2);
+SSL_set_session(ssl2,SSL_get_session(ssl));
+SSL_connect(ssl2);
+
+/* what the hell, lets accept no more connections using this session */
+SSL_CTX_remove_session(SSL_get_SSL_CTX(ssl),SSL_get_session(ssl));
+
+/* we could have just as easily used ssl2 since they both are using the
+ * same session.
+ * You will note that both ssl and ssl2 are still using the session, and
+ * the SSL_SESSION structure will be free()ed when both ssl and ssl2
+ * finish using the session.  Also note that you could continue to initiate
+ * connections using this session by doing SSL_get_session(ssl) to get the
+ * existing session, but SSL_accept() will not be able to find it to
+ * use for incoming connections.
+ * Of corse, the session will timeout at the far end and it will no
+ * longer be accepted after a while.  The time and timeout are ignored except
+ * by SSL_accept(). */
+
+/* Since we have had our server running for 10 weeks, and memory is getting
+ * short, perhaps we should clear the session cache to remove those
+ * 100000 session entries that have expired.  Some may consider this
+ * a memory leak :-) */
+
+SSL_CTX_flush_sessions(ctx,time(NULL));
+
+/* Ok, after a bit more time we wish to flush all sessions from the cache
+ * so that all new connections will be authenticated and incure the
+ * public key operation overhead */
+
+SSL_CTX_flush_sessions(ctx,0);
+
+/* As a final note, to copy everything to do with a SSL, use */
+SSL_copy_session_id(SSL *to,SSL *from);
+/* as this also copies the certificate and RSA key so new session can
+ * be established using the same details */
+
diff --git a/src/lib/libssl/src/doc/sha.doc b/src/lib/libssl/src/doc/sha.doc
new file mode 100644
index 0000000000..895fa182ed
--- /dev/null
+++ b/src/lib/libssl/src/doc/sha.doc
@@ -0,0 +1,52 @@
+The SHA (Secure Hash Algorithm) library.
+SHA is a message digest algorithm that can be used to condense an arbitrary
+length message down to a 20 byte hash.  The functions all need to be passed
+a SHA_CTX which is used to hold the SHA context during multiple SHA_Update()
+function calls.  The normal method of use for this library is as follows
+This library contains both SHA and SHA-1 digest algorithms.  SHA-1 is
+an update to SHA (which should really be called SHA-0 now) which
+tweaks the algorithm slightly.  The SHA-1 algorithm is used by simply
+using SHA1_Init(), SHA1_Update(), SHA1_Final() and SHA1() instead of the
+SHA*() calls
+
+SHA_Init(...);
+SHA_Update(...);
+...
+SHA_Update(...);
+SHA_Final(...);
+
+This library requires the inclusion of 'sha.h'.
+
+The functions are as follows:
+
+void SHA_Init(
+SHA_CTX *c);
+        This function needs to be called to initiate a SHA_CTX structure for
+        use.
+        
+void SHA_Update(
+SHA_CTX *c;
+unsigned char *data;
+unsigned long len);
+        This updates the message digest context being generated with 'len'
+        bytes from the 'data' pointer.  The number of bytes can be any
+        length.
+
+void SHA_Final(
+unsigned char *md;
+SHA_CTX *c;
+        This function is called when a message digest of the data digested
+        with SHA_Update() is wanted.  The message digest is put in the 'md'
+        array and is SHA_DIGEST_LENGTH (20) bytes long.
+
+unsigned char *SHA(
+unsigned char *d;
+unsigned long n;
+unsigned char *md;
+        This function performs a SHA_Init(), followed by a SHA_Update()
+        followed by a SHA_Final() (using a local SHA_CTX).
+        The resulting digest is put into 'md' if it is not NULL.
+        Regardless of the value of 'md', the message
+        digest is returned from the function.  If 'md' was NULL, the message
+        digest returned is being stored in a static structure.
+        
diff --git a/src/lib/libssl/src/doc/speed.doc b/src/lib/libssl/src/doc/speed.doc
new file mode 100644
index 0000000000..11dfa85f08
--- /dev/null
+++ b/src/lib/libssl/src/doc/speed.doc
@@ -0,0 +1,96 @@
+To get an idea of the performance of this library, use
+ssleay speed
+
+perl util/sp-diff.pl file1 file2
+
+will print out the relative differences between the 2 files which are
+expected to be the output from the speed program.
+
+The performace of the library is very dependant on the Compiler
+quality and various flags used to build.
+
+---
+
+These are some numbers I did comparing RSAref and SSLeay on a Pentium 100.
+[ These numbers are all out of date, as of SSL - 0.6.1 the RSA
+operations are about 2 times faster, so check the version number ]
+
+RSA performance.
+
+SSLeay 0.6.0
+Pentium 100, 32meg, Windows NT Workstation 3.51
+linux - gcc v 2.7.0 -O3 -fomit-frame-pointer -m486
+and
+Windows NT  - Windows NT 3.51 - Visual C++ 4.1   - 586 code + 32bit assember
+Windows 3.1 - Windows NT 3.51 - Visual C++ 1.52c - 286 code + 32bit assember
+NT Dos Shell- Windows NT 3.51 - Visual C++ 1.52c - 286 code + 16bit assember
+
+Times are how long it takes to do an RSA private key operation.
+
+               512bits 1024bits
+-------------------------------
+SSLeay NT dll   0.042s   0.202s see above
+SSLeay linux    0.046s   0.218s Assember inner loops (normal build) 
+SSLeay linux    0.067s   0.380s Pure C code with BN_LLONG defined
+SSLeay W3.1 dll 0.108s   0.478s see above
+SSLeay linux    0.109s   0.713s C without BN_LLONG.
+RSAref2.0 linux 0.149s   0.936s
+SSLeay MS-DOS   0.197s   1.049s see above
+
+486DX66, 32meg, Windows NT Server 3.51
+               512bits 1024bits
+-------------------------------
+SSLeay NT dll   0.084s   0.495s <- SSLeay 0.6.3
+SSLeay NT dll   0.154s   0.882s
+SSLeay W3.1 dll 0.335s   1.538s
+SSLeay MS-DOS   0.490s   2.790s
+
+What I find cute is that I'm still faster than RSAref when using standard C,
+without using the 'long long' data type :-), %35 faster for 512bit and we
+scale up to 3.2 times faster for the 'default linux' build.  I should mention
+that people should 'try' to use either x86-lnx.s (elf), x86-lnxa.s or
+x86-sol.s for any x86 based unix they are building on.  The only problems
+with be with syntax but the performance gain is quite large, especially for
+servers.  The code is very simple, you just need to modify the 'header'.
+
+The message is, if you are stuck using RSAref, the RSA performance will be
+bad. Considering the code was compiled for a pentium, the 486DX66 number
+would indicate 'Use RSAref and turn you Pentium 100 into a 486DX66' :-). 
+[ As of verson 0.6.1, it would be correct to say 'turn you pentium 100
+ into a 486DX33' :-) ]
+
+I won't tell people if the DLL's are using RSAref or my stuff if no-one
+asks :-).
+
+eric
+
+PS while I know I could speed things up further, I will probably not do
+   so due to the effort involved.  I did do some timings on the
+   SSLeay bignum format -> RSAref number format conversion that occurs
+   each time RSAref is used by SSLeay, and the numbers are trivial.
+   0.00012s a call for 512bit vs 0.149s for the time spent in the function.
+   0.00018s for 1024bit vs 0.938s.  Insignificant.
+   So the 'way to go', to support faster RSA libraries, if people are keen,
+   is to write 'glue' code in a similar way that I do for RSAref and send it
+   to me :-).
+   My base library still has the advantage of being able to operate on 
+   any size numbers, and is not that far from the performance from the
+   leaders in the field. (-%30?)
+   [ Well as of 0.6.1 I am now the leader in the filed on x86 (we at
+     least very close :-) ]
+
+   I suppose I should also mention some other numbers RSAref numbers, again
+   on my Pentium.
+                DES CBC         EDE-DES         MD5
+   RSAref linux  830k/s          302k/s         4390k/s
+   SSLeay linux  855k/s          319k/s        10025k/s
+   SSLeay NT    1158k/s          410k/s        10470k/s
+   SSLeay w31    378k/s          143k/s         2383k/s (fully 16bit)
+
+   Got to admit that Visual C++ 4.[01] is a damn fine compiler :-)
+--
+Eric Young                  | BOOL is tri-state according to Bill Gates.
+AARNet: eay@cryptsoft.com   | RTFM Win32 GetMessage().
+
+
+
diff --git a/src/lib/libssl/src/doc/ssl-ciph.doc b/src/lib/libssl/src/doc/ssl-ciph.doc
new file mode 100644
index 0000000000..33a7e41f0e
--- /dev/null
+++ b/src/lib/libssl/src/doc/ssl-ciph.doc
@@ -0,0 +1,84 @@
+This is a quick high level summery of how things work now.
+
+Each SSLv2 and SSLv3 cipher is composed of 4 major attributes plus a few extra
+minor ones.
+
+They are 'The key exchange algorithm', which is RSA for SSLv2 but can also
+be Diffle-Hellman for SSLv3.
+
+An 'Authenticion algorithm', which can be RSA, Diffle-Helman, DSS or
+none.
+
+The cipher
+
+The MAC digest.
+
+A cipher can also be an export cipher and is either an SSLv2 or a
+SSLv3 ciphers.
+
+To specify which ciphers to use, one can either specify all the ciphers,
+one at a time, or use 'aliases' to specify the preference and order for
+the ciphers.
+
+There are a large number of aliases, but the most importaint are
+kRSA, kDHr, kDHd and kEDH for key exchange types.
+
+aRSA, aDSS, aNULL and aDH for authentication
+DES, 3DES, RC4, RC2, IDEA and eNULL for ciphers
+MD5, SHA0 and SHA1 digests
+
+Now where this becomes interesting is that these can be put together to
+specify the order and ciphers you wish to use.
+
+To speed this up there are also aliases for certian groups of ciphers.
+The main ones are
+SSLv2   - all SSLv2 ciphers
+SSLv3   - all SSLv3 ciphers
+EXP     - all export ciphers
+LOW     - all low strngth ciphers (no export ciphers, normally single DES)
+MEDIUM  - 128 bit encryption
+HIGH    - Triple DES
+
+These aliases can be joined in a : separated list which specifies to
+add ciphers, move them to the current location and delete them.
+
+A simpler way to look at all of this is to use the 'ssleay ciphers -v' command.
+The default library cipher spec is
+!ADH:RC4+RSA:HIGH:MEDIUM:LOW:EXP:+SSLv2:+EXP
+which means, first, remove from consideration any ciphers that do not
+authenticate.  Next up, use ciphers using RC4 and RSA.  Next include the HIGH,
+MEDIUM and the LOW security ciphers.  Finish up by adding all the export
+ciphers on the end, then 'pull' all the SSLv2 and export ciphers to
+the end of the list.
+
+The results are
+$ ssleay ciphers -v '!ADH:RC4+RSA:HIGH:MEDIUM:LOW:EXP:+SSLv2:+EXP'
+
+RC4-SHA                 SSLv3 Kx=RSA      Au=RSA  Enc=RC4(128)  Mac=SHA1
+RC4-MD5                 SSLv3 Kx=RSA      Au=RSA  Enc=RC4(128)  Mac=MD5 
+EDH-RSA-DES-CBC3-SHA    SSLv3 Kx=DH       Au=RSA  Enc=3DES(168) Mac=SHA1
+EDH-DSS-DES-CBC3-SHA    SSLv3 Kx=DH       Au=DSS  Enc=3DES(168) Mac=SHA1
+DES-CBC3-SHA            SSLv3 Kx=RSA      Au=RSA  Enc=3DES(168) Mac=SHA1
+IDEA-CBC-MD5            SSLv3 Kx=RSA      Au=RSA  Enc=IDEA(128) Mac=SHA1
+EDH-RSA-DES-CBC-SHA     SSLv3 Kx=DH       Au=RSA  Enc=DES(56)   Mac=SHA1
+EDH-DSS-DES-CBC-SHA     SSLv3 Kx=DH       Au=DSS  Enc=DES(56)   Mac=SHA1
+DES-CBC-SHA             SSLv3 Kx=RSA      Au=RSA  Enc=DES(56)   Mac=SHA1
+DES-CBC3-MD5            SSLv2 Kx=RSA      Au=RSA  Enc=3DES(168) Mac=MD5 
+DES-CBC-MD5             SSLv2 Kx=RSA      Au=RSA  Enc=DES(56)   Mac=MD5 
+IDEA-CBC-MD5            SSLv2 Kx=RSA      Au=RSA  Enc=IDEA(128) Mac=MD5 
+RC2-CBC-MD5             SSLv2 Kx=RSA      Au=RSA  Enc=RC2(128)  Mac=MD5 
+RC4-MD5                 SSLv2 Kx=RSA      Au=RSA  Enc=RC4(128)  Mac=MD5 
+EXP-EDH-RSA-DES-CBC     SSLv3 Kx=DH(512)  Au=RSA  Enc=DES(40)   Mac=SHA1 export
+EXP-EDH-DSS-DES-CBC-SHA SSLv3 Kx=DH(512)  Au=DSS  Enc=DES(40)   Mac=SHA1 export
+EXP-DES-CBC-SHA         SSLv3 Kx=RSA(512) Au=RSA  Enc=DES(40)   Mac=SHA1 export
+EXP-RC2-CBC-MD5         SSLv3 Kx=RSA(512) Au=RSA  Enc=RC2(40)   Mac=MD5  export
+EXP-RC4-MD5             SSLv3 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export
+EXP-RC2-CBC-MD5         SSLv2 Kx=RSA(512) Au=RSA  Enc=RC2(40)   Mac=MD5  export
+EXP-RC4-MD5             SSLv2 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export
+
+I would recoment people use the 'ssleay ciphers -v "text"'
+command to check what they are going to use.
+
+Anyway, I'm falling asleep here so I'll do some more tomorrow.
+
+eric
diff --git a/src/lib/libssl/src/doc/ssl.doc b/src/lib/libssl/src/doc/ssl.doc
new file mode 100644
index 0000000000..1f89cd5db2
--- /dev/null
+++ b/src/lib/libssl/src/doc/ssl.doc
@@ -0,0 +1,172 @@
+SSL_CTX_sessions(SSL_CTX *ctx) - the session-id hash table.
+
+/* Session-id cache stats */
+SSL_CTX_sess_number
+SSL_CTX_sess_connect
+SSL_CTX_sess_connect_good
+SSL_CTX_sess_accept
+SSL_CTX_sess_accept_good
+SSL_CTX_sess_hits
+SSL_CTX_sess_cb_hits
+SSL_CTX_sess_misses
+SSL_CTX_sess_timeouts
+
+/* Session-id application notification callbacks */
+SSL_CTX_sess_set_new_cb
+SSL_CTX_sess_get_new_cb
+SSL_CTX_sess_set_get_cb
+SSL_CTX_sess_get_get_cb
+
+/* Session-id cache operation mode */
+SSL_CTX_set_session_cache_mode
+SSL_CTX_get_session_cache_mode
+
+/* Set default timeout values to use. */
+SSL_CTX_set_timeout
+SSL_CTX_get_timeout
+
+/* Global  SSL initalisation informational callback */
+SSL_CTX_set_info_callback
+SSL_CTX_get_info_callback
+SSL_set_info_callback
+SSL_get_info_callback
+
+/* If the SSL_accept/SSL_connect returned with -1, these indicate when
+ * we should re-call *.
+SSL_want
+SSL_want_nothing
+SSL_want_read
+SSL_want_write
+SSL_want_x509_lookup
+
+/* Where we are in SSL initalisation, used in non-blocking, perhaps
+ * have a look at ssl/bio_ssl.c */
+SSL_state
+SSL_is_init_finished
+SSL_in_init
+SSL_in_connect_init
+SSL_in_accept_init
+
+/* Used to set the 'inital' state so SSL_in_connect_init and SSL_in_accept_init
+ * can be used to work out which function to call. */
+SSL_set_connect_state
+SSL_set_accept_state
+
+/* Where to look for certificates for authentication */
+SSL_set_default_verify_paths /* calles SSL_load_verify_locations */
+SSL_load_verify_locations
+
+/* get info from an established connection */
+SSL_get_session
+SSL_get_certificate
+SSL_get_SSL_CTX
+
+SSL_CTX_new
+SSL_CTX_free
+SSL_new
+SSL_clear
+SSL_free
+
+SSL_CTX_set_cipher_list
+SSL_get_cipher
+SSL_set_cipher_list
+SSL_get_cipher_list
+SSL_get_shared_ciphers
+
+SSL_accept
+SSL_connect
+SSL_read
+SSL_write
+
+SSL_debug
+
+SSL_get_read_ahead
+SSL_set_read_ahead
+SSL_set_verify
+
+SSL_pending
+
+SSL_set_fd
+SSL_set_rfd
+SSL_set_wfd
+SSL_set_bio
+SSL_get_fd
+SSL_get_rbio
+SSL_get_wbio
+
+SSL_use_RSAPrivateKey
+SSL_use_RSAPrivateKey_ASN1
+SSL_use_RSAPrivateKey_file
+SSL_use_PrivateKey
+SSL_use_PrivateKey_ASN1
+SSL_use_PrivateKey_file
+SSL_use_certificate
+SSL_use_certificate_ASN1
+SSL_use_certificate_file
+
+ERR_load_SSL_strings
+SSL_load_error_strings
+
+/* human readable version of the 'state' of the SSL connection. */
+SSL_state_string
+SSL_state_string_long
+/* These 2 report what kind of IO operation the library was trying to
+ * perform last.  Probably not very usefull. */
+SSL_rstate_string
+SSL_rstate_string_long
+
+SSL_get_peer_certificate
+
+SSL_SESSION_new
+SSL_SESSION_print_fp
+SSL_SESSION_print
+SSL_SESSION_free
+i2d_SSL_SESSION
+d2i_SSL_SESSION
+
+SSL_get_time
+SSL_set_time
+SSL_get_timeout
+SSL_set_timeout
+SSL_copy_session_id
+SSL_set_session
+SSL_CTX_add_session
+SSL_CTX_remove_session
+SSL_CTX_flush_sessions
+
+BIO_f_ssl
+
+/* used to hold information as to why a certificate verification failed */
+SSL_set_verify_result
+SSL_get_verify_result
+
+/* can be used by the application to associate data with an SSL structure.
+ * It needs to be 'free()ed' by the application */
+SSL_set_app_data
+SSL_get_app_data
+
+/* The following all set values that are kept in the SSL_CTX but
+ * are used as the default values when an SSL session is created.
+ * They are over writen by the relevent SSL_xxxx functions */
+
+/* SSL_set_verify */
+void SSL_CTX_set_default_verify
+
+/* This callback, if set, totaly overrides the normal SSLeay verification
+ * functions and should return 1 on sucesss and 0 on failure */
+void SSL_CTX_set_cert_verify_callback
+
+/* The following are the same as the equivilent SSL_xxx functions.
+ * Only one copy of this information is kept and if a particular
+ * SSL structure has a local override, it is totally separate structure.
+ */
+int SSL_CTX_use_RSAPrivateKey
+int SSL_CTX_use_RSAPrivateKey_ASN1
+int SSL_CTX_use_RSAPrivateKey_file
+int SSL_CTX_use_PrivateKey
+int SSL_CTX_use_PrivateKey_ASN1
+int SSL_CTX_use_PrivateKey_file
+int SSL_CTX_use_certificate
+int SSL_CTX_use_certificate_ASN1
+int SSL_CTX_use_certificate_file
+
diff --git a/src/lib/libssl/src/doc/ssl_ctx.doc b/src/lib/libssl/src/doc/ssl_ctx.doc
new file mode 100644
index 0000000000..508394e75f
--- /dev/null
+++ b/src/lib/libssl/src/doc/ssl_ctx.doc
@@ -0,0 +1,68 @@
+This is now a bit dated, quite a few of the SSL_ functions could be
+SSL_CTX_ functions.  I will update this in the future. 30 Aug 1996
+
+From eay@orb.mincom.oz.au Mon Dec 11 21:37:08 1995
+Received: by orb.mincom.oz.au id AA00696
+  (5.65c/IDA-1.4.4 for eay); Mon, 11 Dec 1995 11:37:08 +1000
+Date: Mon, 11 Dec 1995 11:37:08 +1000 (EST)
+From: Eric Young <eay@mincom.oz.au>
+X-Sender: eay@orb
+To: sameer <sameer@c2.org>
+Cc: Eric Young <eay@mincom.oz.au>
+Subject: Re: PEM_readX509 oesn't seem to be working
+In-Reply-To: <199512110102.RAA12521@infinity.c2.org>
+Message-Id: <Pine.SOL.3.91.951211112115.28608D-100000@orb>
+Mime-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Status: RO
+X-Status: 
+
+On Sun, 10 Dec 1995, sameer wrote:
+>       OK, that's solved. I've found out that it is saying "no
+> certificate set" in SSL_accept because s->conn == NULL
+> so there is some place I need to initialize s->conn that I am
+> not initializing it.
+
+The full order of things for a server should be.
+
+ctx=SSL_CTX_new();
+
+/* The next line should not really be using ctx->cert but I'll leave it 
+ * this way right now... I don't want a X509_ routine to know about an SSL
+ * structure, there should be an SSL_load_verify_locations... hmm, I may 
+ * add it tonight.
+ */
+X509_load_verify_locations(ctx->cert,CAfile,CApath);
+
+/* Ok now for each new connection we do the following */
+con=SSL_new(ctx);
+SSL_set_fd(con,s);
+SSL_set_verify(con,verify,verify_callback);
+
+/* set the certificate and private key to use. */
+SSL_use_certificate_ASN1(con,X509_certificate);
+SSL_use_RSAPrivateKey_ASN1(con,RSA_private_key);
+
+SSL_accept(con);
+
+SSL_read(con)/SSL_write(con);
+
+There is a bit more than that but that is basically the structure.
+
+Create a context and specify where to lookup certificates.
+
+foreach connection
+        {
+        create a SSL structure
+        set the certificate and private key
+        do a SSL_accept
+        
+        we should now be ok
+        }
+
+eric
+--
+Eric Young                  | Signature removed since it was generating
+AARNet: eay@mincom.oz.au    | more followups than the message contents :-)
+
+
diff --git a/src/lib/libssl/src/doc/ssleay.doc b/src/lib/libssl/src/doc/ssleay.doc
new file mode 100644
index 0000000000..a0e86aef7c
--- /dev/null
+++ b/src/lib/libssl/src/doc/ssleay.doc
@@ -0,0 +1,213 @@
+SSLeay: a cryptographic kitchen sink.
+
+1st December 1995
+Way back at the start of April 1995, I was looking for a mindless
+programming project.  A friend of mine (Tim Hudson) said "why don't you do SSL,
+it has DES encryption in it and I would not mind using it in a SSL telnet".
+While it was true I had written a DES library in previous years, litle
+did I know what an expansive task SSL would turn into.
+
+First of all, the SSL protocol contains DES encryption.  Well and good.  My
+DES library was fast and portable.  It also contained the RSA's RC4 stream
+cipher.  Again, not a problem, some-one had just posted to sci.crypt
+something that was claimed to be RC4.  It also contained IDEA, I had the
+specifications, not a problem to implement.  MD5, an RFC, trivial, at most
+I could spend a week or so trying to see if I could speed up the
+implementation.  All in all a nice set of ciphers.
+Then the first 'expantion of the scope', RSA public key
+encryption.  Since I did not knowing a thing about public key encryption
+or number theory, this appeared quite a daunting task.  Just writing a
+big number library would be problomatic in itself, let alone making it fast.
+At this point the scope of 'implementing SSL' expands eponentialy.
+First of all, the RSA private keys  were being kept in ASN.1 format.
+Thankfully the RSA PKCS series of documents explains this format.  So I now
+needed to be able to encode and decode arbitary ASN.1 objects.  The Public
+keys were embeded in X509 certificates.  Hmm... these are not only
+ASN.1 objects but they make up a heirachy of authentication.  To
+authenticate a X509 certificate one needs to retrieve it's issuers
+certificate etc etc.  Hmm..., so I also need to implement some kind
+of certificate management software.  I would also have to implement
+software to authenticate certificates.  At this point the support code made
+the SSL part of my library look quite small.
+Around this time, the first version of SSLeay was released.
+
+Ah, but here was the problem, I was not happy with the code so far.  As may
+have become obvious, I had been treating all of this as a learning
+exersize, so I have completely written the library myself.  As such, due
+to the way it had grown like a fungus, much of the library was not
+'elagent' or neat.  There were global and static variables all over the
+place, the SSL part did not even handle non-blocking IO.
+The Great rewrite began.
+
+As of this point in time, the 'Great rewrite' has almost finished.  So what
+follows is an approximate list of what is actually SSLeay 0.5.0
+
+/********* This needs to be updated for 0.6.0+ *************/
+
+---
+The library contains the following routines.  Please note that most of these
+functions are not specfic for SSL or any other particular cipher
+implementation.  I have tried to make all the routines as general purpose
+as possible.  So you should not think of this library as an SSL
+implemtation, but rather as a library of cryptographic functions
+that also contains SSL.  I refer to each of these function groupings as
+libraries since they are often capable of functioning as independant
+libraries
+
+First up, the general ciphers and message digests supported by the library.
+
+MD2     rfc???, a standard 'by parts' interface to this algorithm.
+MD5     rfc???, the same type of interface as for the MD2 library except a
+        different algorithm.
+SHA     THe Secure Hash Algorithm.  Again the same type of interface as
+        MD2/MD5 except the digest is 20 bytes.
+SHA1    The 'revised' version of SHA.  Just about identical to SHA except
+        for one tweak of an inner loop.
+DES     This is my libdes library that has been floating around for the last
+        few years.  It has been enhanced for no other reason than completeness.
+        It now supports ecb, cbc, cfb, ofb, cfb64, ofb64 in normal mode and
+        triple DES modes of ecb, cbc, cfb64 and ofb64.  cfb64 and ofb64 are
+        functional interfaces to the 64 bit modes of cfb and ofb used in
+        such a way thay they function as single character interfaces.
+RC4     The RSA Inc. stream cipher.
+RC2     The RSA Inc. block cipher.
+IDEA    An implmentation of the IDEA cipher, the library supports ecb, cbc,
+        cfb64 and ofb64 modes of operation.
+
+Now all the above mentioned ciphers and digests libraries support high
+speed, minimal 'crap in the way' type interfaces.  For fastest and
+lowest level access, these routines should be used directly.
+
+Now there was also the matter of public key crypto systems.  These are
+based on large integer arithmatic.
+
+BN      This is my large integer library.  It supports all the normal
+        arithmentic operations.  It uses malloc extensivly and as such has
+        no limits of the size of the numbers being manipulated.  If you
+        wish to use 4000 bit RSA moduli, these routines will handle it.
+        This library also contains routines to 'generate' prime numbers and
+        to test for primality.  The RSA and DH libraries sit on top of this
+        library.  As of this point in time, I don't support SHA, but
+        when I do add it, it will just sit on top of the routines contained
+        in this library.
+RSA     This implements the RSA public key algorithm.  It also contains
+        routines that will generate a new private/public key pair.
+        All the RSA functions conform to the PKCS#1 standard.
+DH      This is an implementation of the
+        Diffie-Hellman protocol.  There are all the require routines for
+        the protocol, plus extra routines that can be used to generate a
+        strong prime for use with a specified generator.  While this last
+        routine is not generally required by applications implementing DH,
+        It is present for completeness and because I thing it is much
+        better to be able to 'generate' your own 'magic' numbers as oposed
+        to using numbers suplied by others.  I conform to the PKCS#3
+        standard where required.
+
+You may have noticed the preceeding section mentions the 'generation' of
+prime numbers.  Now this requries the use of 'random numbers'. 
+
+RAND    This psuedo-random number library is based on MD5 at it's core
+        and a large internal state (2k bytes).  Once you have entered enough
+        seed data into this random number algorithm I don't feel
+        you will ever need to worry about it generating predictable output.
+        Due to the way I am writing a portable library, I have left the
+        issue of how to get good initial random seed data upto the
+        application but I do have support routines for saving and loading a
+        persistant random number state for use between program runs.
+        
+Now to make all these ciphers easier to use, a higher level
+interface was required.  In this form, the same function would be used to
+encrypt 'by parts', via any one of the above mentioned ciphers.
+
+EVP     The Digital EnVeloPe library is quite large.  At it's core are
+        function to perform encryption and decryption by parts while using
+        an initial parameter to specify which of the 17 different ciphers
+        or 4 different message digests to use.  On top of these are implmented
+        the digital signature functions, sign, verify, seal and open.
+        Base64 encoding of binary data is also done in this library.
+
+PEM     rfc???? describe the format for Privacy Enhanced eMail.
+        As part of this standard, methods of encoding digital enveloped
+        data is an ascii format are defined.  As such, I use a form of these
+        to encode enveloped data.  While at this point in time full support
+        for PEM has not been built into the library, a minimal subset of
+        the secret key and Base64 encoding is present.  These reoutines are
+        mostly used to Ascii encode binary data with a 'type' associated
+        with it and perhaps details of private key encryption used to
+        encrypt the data.
+        
+PKCS7   This is another Digital Envelope encoding standard which uses ASN.1
+        to encode the data.  At this point in time, while there are some
+        routines to encode and decode this binary format, full support is
+        not present.
+        
+As Mentioned, above, there are several different ways to encode
+data structures.
+
+ASN1    This library is more a set of primatives used to encode the packing
+        and unpacking of data structures.  It is used by the X509
+        certificate standard and by the PKCS standards which are used by
+        this library.  It also contains routines for duplicating and signing
+        the structures asocisated with X509.
+        
+X509    The X509 library contains routines for packing and unpacking,
+        verifying and just about every thing else you would want to do with
+        X509 certificates.
+
+PKCS7   PKCS-7 is a standard for encoding digital envelope data
+        structures.  At this point in time the routines will load and save
+        DER forms of these structees.  They need to be re-worked to support
+        the BER form which is the normal way PKCS-7 is encoded.  If the
+        previous 2 sentances don't make much sense, don't worry, this
+        library is not used by this version of SSLeay anyway.
+
+OBJ     ASN.1 uses 'object identifiers' to identify objects.  A set of
+        functions were requred to translate from ASN.1 to an intenger, to a
+        character string.  This library provieds these translations
+        
+Now I mentioned an X509 library.  X509 specified a hieachy of certificates
+which needs to be traversed to authenticate particular certificates.
+
+METH    This library is used to push 'methods' of retrieving certificates
+        into the library.  There are some supplied 'methods' with SSLeay
+        but applications can add new methods if they so desire.
+        This library has not been finished and is not being used in this
+        version.
+        
+Now all the above are required for use in the initial point of this project.
+
+SSL     The SSL protocol.  This is a full implmentation of SSL v 2.  It
+        support both server and client authentication.  SSL v 3 support
+        will be added when the SSL v 3 specification is released in it's
+        final form.
+
+Now quite a few of the above mentioned libraries rely on a few 'complex'
+data structures.  For each of these I have a library.
+
+Lhash   This is a hash table library which is used extensivly.
+
+STACK   An implemetation of a Stack data structure.
+
+BUF     A simple character array structure that also support a function to
+        check that the array is greater that a certain size, if it is not,
+        it is realloced so that is it.
+        
+TXT_DB  A simple memory based text file data base.  The application can specify
+        unique indexes that will be enforced at update time.
+
+CONF    Most of the programs written for this library require a configuration
+        file.  Instead of letting programs constantly re-implment this
+        subsystem, the CONF library provides a consistant and flexable
+        interface to not only configuration files but also environment
+        variables.
+
+But what about when something goes wrong?
+The one advantage (and perhaps disadvantage) of all of these
+functions being in one library was the ability to implement a
+single error reporting system.
+        
+ERR     This library is used to report errors.  The error system records
+        library number, function number (in the library) and reason
+        number.  Multiple errors can be reported so that an 'error' trace
+        is created.  The errors can be printed in numeric or textual form.
+
diff --git a/src/lib/libssl/src/doc/ssluse.doc b/src/lib/libssl/src/doc/ssluse.doc
new file mode 100644
index 0000000000..2e3a26cbf3
--- /dev/null
+++ b/src/lib/libssl/src/doc/ssluse.doc
@@ -0,0 +1,45 @@
+We have an SSL_CTX which contains global information for lots of
+SSL connections.  The session-id cache and the certificate verificate cache.
+It also contains default values for use when certificates are used.
+
+SSL_CTX
+        default cipher list
+        session-id cache
+        certificate cache
+        default session-id timeout period
+        New session-id callback
+        Required session-id callback
+        session-id stats
+        Informational callback
+        Callback that is set, overrides the SSLeay X509 certificate
+          verification
+        The default Certificate/Private Key pair
+        Default read ahead mode.
+        Default verify mode and verify callback.  These are not used
+          if the over ride callback mentioned above is used.
+        
+Each SSL can have the following defined for it before a connection is made.
+
+Certificate
+Private key
+Ciphers to use
+Certificate verify mode and callback
+IO object to use in the comunication.
+Some 'read-ahead' mode information.
+A previous session-id to re-use.
+
+A connection is made by using SSL_connect or SSL_accept.
+When non-blocking IO is being used, there are functions that can be used
+to determin where and why the SSL_connect or SSL_accept did not complete.
+This information can be used to recall the functions when the 'error'
+condition has dissapeared.
+
+After the connection has been made, information can be retrived about the
+SSL session and the session-id values that have been decided apon.
+The 'peer' certificate can be retrieved.
+
+The session-id values include
+'start time'
+'timeout length'
+
+
diff --git a/src/lib/libssl/src/doc/stack.doc b/src/lib/libssl/src/doc/stack.doc
new file mode 100644
index 0000000000..7c20b1b664
--- /dev/null
+++ b/src/lib/libssl/src/doc/stack.doc
@@ -0,0 +1,96 @@
+The stack data structure is used to store an ordered list of objects.
+It is basically misnamed to call it a stack but it can function that way
+and that is what I originally used it for.  Due to the way element
+pointers are kept in a malloc()ed array, the most efficient way to use this
+structure is to add and delete elements from the end via sk_pop() and
+sk_push().  If you wish to do 'lookups' sk_find() is quite efficient since
+it will sort the stack (if required) and then do a binary search to lookup 
+the requested item.  This sorting occurs automatically so just sk_push()
+elements on the stack and don't worry about the order.  Do remember that if
+you do a sk_find(), the order of the elements will change.
+
+You should never need to 'touch' this structure directly.
+typedef struct stack_st
+        {
+        unsigned int num;
+        char **data;
+        int sorted;
+
+        unsigned int num_alloc;
+        int (*comp)();
+        } STACK;
+
+'num' holds the number of elements in the stack, 'data' is the array of
+elements.  'sorted' is 1 is the list has been sorted, 0 if not.
+
+num_alloc is the number of 'nodes' allocated in 'data'.  When num becomes
+larger than num_alloc, data is realloced to a larger size.
+If 'comp' is set, it is a function that is used to compare 2 of the items
+in the stack.  The function should return -1, 0 or 1, depending on the
+ordering.
+
+#define sk_num(sk)      ((sk)->num)
+#define sk_value(sk,n)  ((sk)->data[n])
+
+These 2 macros should be used to access the number of elements in the
+'stack' and to access a pointer to one of the values.
+
+STACK *sk_new(int (*c)());
+        This creates a new stack.  If 'c', the comparison function, is not
+specified, the various functions that operate on a sorted 'stack' will not
+work (sk_find()).  NULL is returned on failure.
+
+void sk_free(STACK *);
+        This function free()'s a stack structure.  The elements in the
+stack will not be freed so one should 'pop' and free all elements from the
+stack before calling this function or call sk_pop_free() instead.
+
+void sk_pop_free(STACK *st; void (*func)());
+        This function calls 'func' for each element on the stack, passing
+the element as the argument.  sk_free() is then called to free the 'stack'
+structure.
+
+int sk_insert(STACK *sk,char *data,int where);
+        This function inserts 'data' into stack 'sk' at location 'where'.
+If 'where' is larger that the number of elements in the stack, the element
+is put at the end.  This function tends to be used by other 'stack'
+functions.  Returns 0 on failure, otherwise the number of elements in the
+new stack.
+
+char *sk_delete(STACK *st,int loc);
+        Remove the item a location 'loc' from the stack and returns it.
+Returns NULL if the 'loc' is out of range.
+
+char *sk_delete_ptr(STACK *st, char *p);
+        If the data item pointed to by 'p' is in the stack, it is deleted
+from the stack and returned.  NULL is returned if the element is not in the
+stack.
+
+int sk_find(STACK *st,char *data);
+        Returns the location that contains a value that is equal to 
+the 'data' item.  If the comparison function was not set, this function
+does a linear search.  This function actually qsort()s the stack if it is not
+in order and then uses bsearch() to do the initial search.  If the
+search fails,, -1 is returned.  For mutliple items with the same
+value, the index of the first in the array is returned.
+
+int sk_push(STACK *st,char *data);
+        Append 'data' to the stack.  0 is returned if there is a failure
+(due to a malloc failure), else 1.  This is 
+sk_insert(st,data,sk_num(st));
+
+int sk_unshift(STACK *st,char *data);
+        Prepend 'data' to the front (location 0) of the stack.  This is
+sk_insert(st,data,0);
+
+char *sk_shift(STACK *st);
+        Return and delete from the stack the first element in the stack.
+This is sk_delete(st,0);
+
+char *sk_pop(STACK *st);
+        Return and delete the last element on the stack.  This is
+sk_delete(st,sk_num(sk)-1);
+
+void sk_zero(STACK *st);
+        Removes all items from the stack.  It does not 'free'
+pointers but is a quick way to clear a 'stack of references'.
diff --git a/src/lib/libssl/src/doc/threads.doc b/src/lib/libssl/src/doc/threads.doc
new file mode 100644
index 0000000000..251061e896
--- /dev/null
+++ b/src/lib/libssl/src/doc/threads.doc
@@ -0,0 +1,90 @@
+How to compile SSLeay for multi-threading.
+
+Well basically it is quite simple, set the compiler flags and build.
+I have only really done much testing under Solaris and Windows NT.
+If you library supports localtime_r() and gmtime_r() add,
+-DTHREADS to the makefile parameters.  You can probably survive with out
+this define unless you are going to have multiple threads generating
+certificates at once.  It will not affect the SSL side of things.
+
+The approach I have taken to doing locking is to make the application provide
+callbacks to perform locking and so that the SSLeay library can distinguish
+between threads (for the error state).
+
+To have a look at an example program, 'cd mt; vi mttest.c'.
+To build under solaris, sh solaris.sh, for Windows NT or Windows 95,
+win32.bat
+
+This will build mttest which will fire up 10 threads that talk SSL
+to each other 10 times.
+To enable everything to work, the application needs to call
+
+CRYPTO_set_id_callback(id_function);
+CRYPTO_set_locking_callback(locking_function);
+
+before any multithreading is started.
+id_function does not need to be defined under Windows NT or 95, the
+correct function will be called if it is not.  Under unix, getpid()
+is call if the id_callback is not defined, for solaris this is wrong
+(since threads id's are not pid's) but under IRIX it is correct
+(threads are just processes sharing the data segement).
+
+The locking_callback is used to perform locking by the SSLeay library.
+eg.
+
+void solaris_locking_callback(mode,type,file,line)
+int mode;
+int type;
+char *file;
+int line;
+        {
+        if (mode & CRYPTO_LOCK)
+                mutex_lock(&(lock_cs[type]));
+        else
+                mutex_unlock(&(lock_cs[type]));
+        }
+
+Now in this case I have used mutexes instead of read/write locks, since they
+are faster and there are not many read locks in SSLeay, you may as well
+always use write locks.  file and line are __FILE__ and __LINE__ from
+the compile and can be usefull when debugging.
+
+Now as you can see, 'type' can be one of a range of values, these values are
+defined in crypto/crypto.h
+CRYPTO_get_lock_name(type) will return a text version of what the lock is.
+There are CRYPTO_NUM_LOCKS locks required, so under solaris, the setup
+for multi-threading can be
+
+static mutex_t lock_cs[CRYPTO_NUM_LOCKS];
+
+void thread_setup()
+        {
+        int i;
+
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                mutex_init(&(lock_cs[i]),USYNC_THREAD,NULL);
+        CRYPTO_set_id_callback((unsigned long (*)())solaris_thread_id);
+        CRYPTO_set_locking_callback((void (*)())solaris_locking_callback);
+        }
+
+As a final note, under Windows NT or Windows 95, you have to be careful
+not to mix the various threaded, unthreaded and debug libraries.
+Normally if they are mixed incorrectly, mttest will crash just after printing
+out some usage statistics at the end.  This is because the
+different system libraries use different malloc routines and if
+data is malloc()ed inside crypt32.dll or ssl32.dll and then free()ed by a
+different library malloc, things get very confused.
+
+The default SSLeay DLL builds use /MD, so if you use this on your
+application, things will work as expected.  If you use /MDd,
+you will probably have to rebuild SSLeay using this flag.
+I should modify util/mk1mf.pl so it does all this correctly, but 
+this has not been done yet.
+
+One last warning.  Because locking overheads are actually quite large, the
+statistics collected against the SSL_CTX for successfull connections etc
+are not locked when updated.  This does make it possible for these
+values to be slightly lower than they should be, if you are
+running multithreaded on a multi-processor box, but this does not really
+matter much.
+
diff --git a/src/lib/libssl/src/doc/txt_db.doc b/src/lib/libssl/src/doc/txt_db.doc
new file mode 100644
index 0000000000..3a5b0d50a1
--- /dev/null
+++ b/src/lib/libssl/src/doc/txt_db.doc
@@ -0,0 +1,4 @@
+TXT_DB, a simple text based in memory database.
+
+It holds rows of ascii data, for which the only special character is '\0'.
+The rows can be of an unlimited length.
diff --git a/src/lib/libssl/src/doc/verify b/src/lib/libssl/src/doc/verify
new file mode 100644
index 0000000000..b78d96159d
--- /dev/null
+++ b/src/lib/libssl/src/doc/verify
@@ -0,0 +1,22 @@
+X509_verify_cert_chain(
+        CERT_STORE *cert_store,
+        STACK /* X509 */ *certs,
+        int *verify_result,
+        int (*verify_error_callback)()
+        char *argument_to_callback, /* SSL */
+
+app_verify_callback(
+        char *app_verify_arg, /* from SSL_CTX */
+        STACK /* X509 */ *certs,
+        int *verify_result,
+        int (*verify_error_callback)()
+        SSL *s,
+
+int X509_verify_cert(
+        CERT_STORE *cert_store,
+        X509 *x509,
+        int *verify_result,
+        int (*verify_error_callback)(),
+        char *arg,
+
+
diff --git a/src/lib/libssl/src/doc/why.doc b/src/lib/libssl/src/doc/why.doc
new file mode 100644
index 0000000000..a1ac84bd27
--- /dev/null
+++ b/src/lib/libssl/src/doc/why.doc
@@ -0,0 +1,79 @@
+This file is more of a note for other people who wish to understand why
+the build environment is the way it is :-).
+
+The include files 'depend' as follows.
+Each of 
+crypto/*/*.c includes crypto/cryptlib.h
+ssl/*.c include ssl/ssl_locl.h
+apps/*.c include apps/apps.h
+crypto/cryptlib.h, ssl/ssl_locl.h and apps/apps.h
+all include e_os.h which contains OS/environment specific information.
+If you need to add something todo with a particular environment,
+add it to this file.  It is worth remembering that quite a few libraries,
+like lhash, des, md, sha etc etc do not include crypto/cryptlib.h.  This
+is because these libraries should be 'independantly compilable' and so I
+try to keep them this way.
+e_os.h is not so much a part of SSLeay, as the placing in one spot all the
+evil OS dependant muck.
+
+I wanted to automate as many things as possible.  This includes
+error number generation.  A
+make errors
+will scan the source files for error codes, append them to the correct
+header files, and generate the functions to print the text version
+of the error numbers.  So don't even think about adding error numbers by
+hand, put them in the form
+XXXerr(XXXX_F_XXXX,YYYY_R_YYYY);
+on line and it will be automatically picked up my a make errors.
+
+In a similar vein, programs to be added into ssleay in the apps directory
+just need to have an entry added to E_EXE in makefile.ssl and
+everthing will work as expected.  Don't edit progs.h by hand.
+
+make links re-generates the symbolic links that are used.  The reason why
+I keep everything in its own directory, and don't put all the
+test programs and header files in 'test' and 'include' is because I want
+to keep the 'sub-libraries' independant.  I still 'pull' out
+indervidual libraries for use in specific projects where the code is
+required.  I have used the 'lhash' library in just about every software
+project I have worked on :-).
+
+make depend generates dependancies and
+make dclean removes them.
+
+You will notice that I use perl quite a bit when I could be using 'sed'.
+The reason I decided to do this was to just stick to one 'extra' program.
+For Windows NT, I have perl and no sed.
+
+The util/mk1mf.pl program can be used to generate a single makefile.
+I use this because makefiles under Microsoft are horrific.
+Each C compiler seems to have different linker formats, which have
+to be used because the retarted C compilers explode when you do
+cl -o file *.o.
+
+Now some would argue that I should just use the single makefile.  I don't
+like it during develoment for 2 reasons.  First, the actuall make
+command takes a long time.  For my current setup, if I'm in
+crypto/bn and I type make, only the crypto/bn directory gets rebuilt,
+which is nice when you are modifying prototypes in bn.h which
+half the SSLeay depends on.  The second is that to add a new souce file
+I just plonk it in at the required spot in the local makefile.  This
+then alows me to keep things local, I don't need to modify a 'global'
+tables (the make for unix, the make for NT, the make for w31...).
+When I am ripping apart a library structure, it is nice to only
+have to worry about one directory :-).
+
+Having said all this, for the hell of it I put together 2 files that
+#include all the souce code (generated by doing a ls */*.o after a build).
+crypto.c takes only 30 seconds to build under NT and 2 minutes under linux
+for my pentium100.  Much faster that the normal build :-).
+Again, the problem is that when using libraries, every program linked
+to libcrypto.a would suddenly get 330k of library when it may only need
+1k.  This technique does look like a nice way to do shared libraries though.
+
+Oh yes, as a final note, to 'build' a distribution, I just type
+make dist.
+This cleans and packages everything.  The directory needs to be called
+SSLeay since the make does a 'cd ..' and renames and tars things up.
+
+
diff --git a/src/lib/libssl/src/makefile.one b/src/lib/libssl/src/makefile.one
new file mode 100644
index 0000000000..b0931e0d6f
--- /dev/null
+++ b/src/lib/libssl/src/makefile.one
@@ -0,0 +1,1781 @@
+# This makefile has been automatically generated from the SSLeay distribution.
+# This single makefile will build the complete SSLeay distribution and
+# by default leave the 'intertesting' output files in ./out and the stuff
+# that needs deleting in ./tmp.
+# The file was generated by running 'make makefile.one', which
+# does a 'make files', which writes all the environment variables from all
+# the makefiles to the file call MINFO.  This file is used by
+# util/mk1mf.pl to generate makefile.one.
+# The 'makefile per directory' system suites me when developing this
+# library and also so I can 'distribute' indervidual library sections.
+# The one monster makefile better suits building in non-unix
+# environments.
+
+INSTALLTOP=/usr/local/ssl
+
+# Set your compiler options
+CC=cc
+CFLAG=-O -DTERMIO
+APP_CFLAG=
+LIB_CFLAG=
+SHLIB_CFLAG=
+APP_EX_OBJ=
+SHLIB_EX_OBJ=
+# add extra libraries to this define, for solaris -lsocket -lnsl would
+# be added
+EX_LIBS=
+
+# The SSLeay directory
+SRC_D=.
+
+LINK=${CC}
+LFLAGS=${CFLAGS}
+
+BN_MULW_OBJ=
+BN_MULW_SRC=
+DES_ENC_OBJ=
+DES_ENC_SRC=
+DES_CRYPT_OBJ=
+DES_CRYPT_SRC=
+BF_ENC_OBJ=
+BF_ENC_SRC=
+CAST_ENC_OBJ=
+CAST_ENC_SRC=
+RC4_ENC_OBJ=
+RC4_ENC_SRC=
+RC5_ENC_OBJ=
+RC5_ENC_SRC=
+MD5_ASM_OBJ=
+MD5_ASM_SRC=
+SHA1_ASM_OBJ=
+SHA1_ASM_SRC=
+RMD160_ASM_OBJ=
+RMD160_ASM_SRC=
+
+# The output directory for everything intersting
+OUT_D=out
+# The output directory for all the temporary muck
+TMP_D=tmp
+# The output directory for the header files
+INC_D=outinc
+
+CP=/bin/cp
+RM=/bin/rm -f
+RANLIB=$(SRC_D)/util/ranlib.sh
+MKDIR=mkdir
+MKLIB=ar r
+MLFLAGS=
+ASM=as
+
+######################################################
+# You should not need to touch anything below this point
+######################################################
+
+E_EXE=ssleay
+SSL=ssl
+CRYPTO=crypto
+RSAGLUE=RSAglue
+
+# BIN_D  - Binary output directory
+# TEST_D - Binary test file output directory
+# LIB_D  - library output directory
+BIN_D=$(OUT_D)
+TEST_D=$(OUT_D)
+LIB_D=$(OUT_D)
+
+# INCL_D - local library directory
+# OBJ_D  - temp object file directory
+OBJ_D=$(TMP_D)
+INCL_D=$(TMP_D)
+
+O_SSL=     $(LIB_D)/lib$(SSL).a
+O_CRYPTO=  $(LIB_D)/lib$(CRYPTO).a
+O_RSAGLUE= $(LIB_D)/lib$(RSAGLUE).a
+SO_SSL=    lib$(SSL)
+SO_CRYPTO= lib$(CRYPTO)
+L_SSL=     $(LIB_D)/$(SSL).a
+L_CRYPTO=  $(LIB_D)/$(CRYPTO).a
+
+L_LIBS= $(L_SSL) $(L_CRYPTO)
+#L_LIBS= $(O_SSL) $(O_RSAGLUE) -lrsaref $(O_CRYPTO)
+
+######################################################
+# Don't touch anything below this point
+######################################################
+
+INC=-I$(INC_D) -I$(INCL_D)
+APP_CFLAGS=$(INC) $(CFLAG) $(APP_CFLAG)
+LIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG)
+SHLIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG) $(SHLIB_CFLAG)
+LIBS_DEP=$(O_CRYPTO) $(O_RSAGLUE) $(O_SSL)
+
+#############################################
+HEADER=$(INCL_D)/cryptlib.h \
+        $(INCL_D)/date.h $(INCL_D)/md5_locl.h $(INCL_D)/sha_locl.h \
+        $(INCL_D)/rmd_locl.h $(INCL_D)/rmdconst.h $(INCL_D)/des_locl.h \
+        $(INCL_D)/rpc_des.h $(INCL_D)/podd.h $(INCL_D)/sk.h \
+        $(INCL_D)/spr.h $(INCL_D)/des_ver.h $(INCL_D)/rc2_locl.h \
+        $(INCL_D)/rc4_locl.h $(INCL_D)/rc5_locl.h $(INCL_D)/idea_lcl.h \
+        $(INCL_D)/bf_pi.h $(INCL_D)/bf_locl.h $(INCL_D)/cast_s.h \
+        $(INCL_D)/cast_lcl.h $(INCL_D)/bn_lcl.h $(INCL_D)/bn_prime.h \
+        $(INCL_D)/obj_dat.h $(INCL_D)/conf_lcl.h $(INCL_D)/ssl_locl.h \
+        $(INCL_D)/rsaref.h $(INCL_D)/apps.h $(INCL_D)/progs.h \
+        $(INCL_D)/s_apps.h $(INCL_D)/testdsa.h $(INCL_D)/testrsa.h
+
+EXHEADER=$(INC_D)/e_os.h \
+        $(INC_D)/crypto.h $(INC_D)/cryptall.h $(INC_D)/md2.h \
+        $(INC_D)/md5.h $(INC_D)/sha.h $(INC_D)/mdc2.h \
+        $(INC_D)/hmac.h $(INC_D)/ripemd.h $(INC_D)/des.h \
+        $(INC_D)/rc2.h $(INC_D)/rc4.h $(INC_D)/rc5.h \
+        $(INC_D)/idea.h $(INC_D)/blowfish.h $(INC_D)/cast.h \
+        $(INC_D)/bn.h $(INC_D)/rsa.h $(INC_D)/dsa.h \
+        $(INC_D)/dh.h $(INC_D)/buffer.h $(INC_D)/bio.h \
+        $(INC_D)/bss_file.c $(INC_D)/stack.h $(INC_D)/lhash.h \
+        $(INC_D)/rand.h $(INC_D)/err.h $(INC_D)/objects.h \
+        $(INC_D)/evp.h $(INC_D)/pem.h $(INC_D)/asn1.h \
+        $(INC_D)/asn1_mac.h $(INC_D)/x509.h $(INC_D)/x509_vfy.h \
+        $(INC_D)/conf.h $(INC_D)/txt_db.h $(INC_D)/pkcs7.h \
+        $(INC_D)/ssl.h $(INC_D)/ssl2.h $(INC_D)/ssl3.h \
+        $(INC_D)/ssl23.h $(INC_D)/tls1.h
+
+T_OBJ=$(OBJ_D)/md2test.o \
+        $(OBJ_D)/md5test.o $(OBJ_D)/shatest.o $(OBJ_D)/sha1test.o \
+        $(OBJ_D)/mdc2test.o $(OBJ_D)/hmactest.o $(OBJ_D)/rmdtest.o \
+        $(OBJ_D)/destest.o $(OBJ_D)/rc2test.o $(OBJ_D)/rc4test.o \
+        $(OBJ_D)/rc5test.o $(OBJ_D)/ideatest.o $(OBJ_D)/bftest.o \
+        $(OBJ_D)/casttest.o $(OBJ_D)/bntest.o $(OBJ_D)/exptest.o \
+        $(OBJ_D)/dsatest.o $(OBJ_D)/dhtest.o $(OBJ_D)/randtest.o \
+        $(OBJ_D)/ssltest.o
+
+E_OBJ=$(OBJ_D)/verify.o \
+        $(OBJ_D)/asn1pars.o $(OBJ_D)/req.o $(OBJ_D)/dgst.o \
+        $(OBJ_D)/dh.o $(OBJ_D)/enc.o $(OBJ_D)/gendh.o \
+        $(OBJ_D)/errstr.o $(OBJ_D)/ca.o $(OBJ_D)/pkcs7.o \
+        $(OBJ_D)/crl2p7.o $(OBJ_D)/crl.o $(OBJ_D)/rsa.o \
+        $(OBJ_D)/dsa.o $(OBJ_D)/dsaparam.o $(OBJ_D)/x509.o \
+        $(OBJ_D)/genrsa.o $(OBJ_D)/s_server.o $(OBJ_D)/s_client.o \
+        $(OBJ_D)/speed.o $(OBJ_D)/s_time.o $(OBJ_D)/apps.o \
+        $(OBJ_D)/s_cb.o $(OBJ_D)/s_socket.o $(OBJ_D)/version.o \
+        $(OBJ_D)/sess_id.o $(OBJ_D)/ciphers.o $(OBJ_D)/ssleay.o
+
+CRYPTOOBJ=$(OBJ_D)/cryptlib.o \
+        $(OBJ_D)/mem.o $(OBJ_D)/cversion.o $(OBJ_D)/ex_data.o \
+        $(OBJ_D)/cpt_err.o $(OBJ_D)/md2_dgst.o $(OBJ_D)/md2_one.o \
+        $(OBJ_D)/md5_dgst.o $(OBJ_D)/md5_one.o $(OBJ_D)/sha_dgst.o \
+        $(OBJ_D)/sha1dgst.o $(OBJ_D)/sha_one.o $(OBJ_D)/sha1_one.o \
+        $(OBJ_D)/mdc2dgst.o $(OBJ_D)/mdc2_one.o $(OBJ_D)/hmac.o \
+        $(OBJ_D)/rmd_dgst.o $(OBJ_D)/rmd_one.o $(OBJ_D)/set_key.o \
+        $(OBJ_D)/ecb_enc.o $(OBJ_D)/cbc_enc.o $(OBJ_D)/ecb3_enc.o \
+        $(OBJ_D)/cfb64enc.o $(OBJ_D)/cfb64ede.o $(OBJ_D)/cfb_enc.o \
+        $(OBJ_D)/ofb64ede.o $(OBJ_D)/enc_read.o $(OBJ_D)/enc_writ.o \
+        $(OBJ_D)/ofb64enc.o $(OBJ_D)/ofb_enc.o $(OBJ_D)/str2key.o \
+        $(OBJ_D)/pcbc_enc.o $(OBJ_D)/qud_cksm.o $(OBJ_D)/rand_key.o \
+        $(OBJ_D)/des_enc.o $(OBJ_D)/fcrypt_b.o $(OBJ_D)/read2pwd.o \
+        $(OBJ_D)/fcrypt.o $(OBJ_D)/xcbc_enc.o $(OBJ_D)/read_pwd.o \
+        $(OBJ_D)/rpc_enc.o $(OBJ_D)/cbc_cksm.o $(OBJ_D)/supp.o \
+        $(OBJ_D)/rc2_ecb.o $(OBJ_D)/rc2_skey.o $(OBJ_D)/rc2_cbc.o \
+        $(OBJ_D)/rc2cfb64.o $(OBJ_D)/rc2ofb64.o $(OBJ_D)/rc4_skey.o \
+        $(OBJ_D)/rc4_enc.o $(OBJ_D)/rc5_skey.o $(OBJ_D)/rc5_ecb.o \
+        $(OBJ_D)/rc5_enc.o $(OBJ_D)/rc5cfb64.o $(OBJ_D)/rc5ofb64.o \
+        $(OBJ_D)/i_cbc.o $(OBJ_D)/i_cfb64.o $(OBJ_D)/i_ofb64.o \
+        $(OBJ_D)/i_ecb.o $(OBJ_D)/i_skey.o $(OBJ_D)/bf_skey.o \
+        $(OBJ_D)/bf_ecb.o $(OBJ_D)/bf_enc.o $(OBJ_D)/bf_cfb64.o \
+        $(OBJ_D)/bf_ofb64.o $(OBJ_D)/c_skey.o $(OBJ_D)/c_ecb.o \
+        $(OBJ_D)/c_enc.o $(OBJ_D)/c_cfb64.o $(OBJ_D)/c_ofb64.o \
+        $(OBJ_D)/bn_add.o $(OBJ_D)/bn_div.o $(OBJ_D)/bn_exp.o \
+        $(OBJ_D)/bn_lib.o $(OBJ_D)/bn_mod.o $(OBJ_D)/bn_mul.o \
+        $(OBJ_D)/bn_print.o $(OBJ_D)/bn_rand.o $(OBJ_D)/bn_shift.o \
+        $(OBJ_D)/bn_sub.o $(OBJ_D)/bn_word.o $(OBJ_D)/bn_blind.o \
+        $(OBJ_D)/bn_gcd.o $(OBJ_D)/bn_prime.o $(OBJ_D)/bn_err.o \
+        $(OBJ_D)/bn_sqr.o $(OBJ_D)/bn_mulw.o $(OBJ_D)/bn_recp.o \
+        $(OBJ_D)/bn_mont.o $(OBJ_D)/bn_mpi.o $(OBJ_D)/rsa_eay.o \
+        $(OBJ_D)/rsa_gen.o $(OBJ_D)/rsa_lib.o $(OBJ_D)/rsa_sign.o \
+        $(OBJ_D)/rsa_saos.o $(OBJ_D)/rsa_err.o $(OBJ_D)/rsa_pk1.o \
+        $(OBJ_D)/rsa_ssl.o $(OBJ_D)/rsa_none.o $(OBJ_D)/dsa_gen.o \
+        $(OBJ_D)/dsa_key.o $(OBJ_D)/dsa_lib.o $(OBJ_D)/dsa_vrf.o \
+        $(OBJ_D)/dsa_sign.o $(OBJ_D)/dsa_err.o $(OBJ_D)/dh_gen.o \
+        $(OBJ_D)/dh_key.o $(OBJ_D)/dh_lib.o $(OBJ_D)/dh_check.o \
+        $(OBJ_D)/dh_err.o $(OBJ_D)/buffer.o $(OBJ_D)/buf_err.o \
+        $(OBJ_D)/bio_lib.o $(OBJ_D)/bio_cb.o $(OBJ_D)/bio_err.o \
+        $(OBJ_D)/bss_mem.o $(OBJ_D)/bss_null.o $(OBJ_D)/bss_fd.o \
+        $(OBJ_D)/bss_file.o $(OBJ_D)/bss_sock.o $(OBJ_D)/bss_conn.o \
+        $(OBJ_D)/bf_null.o $(OBJ_D)/bf_buff.o $(OBJ_D)/b_print.o \
+        $(OBJ_D)/b_dump.o $(OBJ_D)/b_sock.o $(OBJ_D)/bss_acpt.o \
+        $(OBJ_D)/bf_nbio.o $(OBJ_D)/stack.o $(OBJ_D)/lhash.o \
+        $(OBJ_D)/lh_stats.o $(OBJ_D)/md_rand.o $(OBJ_D)/randfile.o \
+        $(OBJ_D)/err.o $(OBJ_D)/err_all.o $(OBJ_D)/err_prn.o \
+        $(OBJ_D)/obj_dat.o $(OBJ_D)/obj_lib.o $(OBJ_D)/obj_err.o \
+        $(OBJ_D)/encode.o $(OBJ_D)/digest.o $(OBJ_D)/evp_enc.o \
+        $(OBJ_D)/evp_key.o $(OBJ_D)/e_ecb_d.o $(OBJ_D)/e_cbc_d.o \
+        $(OBJ_D)/e_cfb_d.o $(OBJ_D)/e_ofb_d.o $(OBJ_D)/e_ecb_i.o \
+        $(OBJ_D)/e_cbc_i.o $(OBJ_D)/e_cfb_i.o $(OBJ_D)/e_ofb_i.o \
+        $(OBJ_D)/e_ecb_3d.o $(OBJ_D)/e_cbc_3d.o $(OBJ_D)/e_rc4.o \
+        $(OBJ_D)/names.o $(OBJ_D)/e_cfb_3d.o $(OBJ_D)/e_ofb_3d.o \
+        $(OBJ_D)/e_xcbc_d.o $(OBJ_D)/e_ecb_r2.o $(OBJ_D)/e_cbc_r2.o \
+        $(OBJ_D)/e_cfb_r2.o $(OBJ_D)/e_ofb_r2.o $(OBJ_D)/e_ecb_bf.o \
+        $(OBJ_D)/e_cbc_bf.o $(OBJ_D)/e_cfb_bf.o $(OBJ_D)/e_ofb_bf.o \
+        $(OBJ_D)/e_ecb_c.o $(OBJ_D)/e_cbc_c.o $(OBJ_D)/e_cfb_c.o \
+        $(OBJ_D)/e_ofb_c.o $(OBJ_D)/e_ecb_r5.o $(OBJ_D)/e_cbc_r5.o \
+        $(OBJ_D)/e_cfb_r5.o $(OBJ_D)/e_ofb_r5.o $(OBJ_D)/m_null.o \
+        $(OBJ_D)/m_md2.o $(OBJ_D)/m_md5.o $(OBJ_D)/m_sha.o \
+        $(OBJ_D)/m_sha1.o $(OBJ_D)/m_dss.o $(OBJ_D)/m_dss1.o \
+        $(OBJ_D)/m_mdc2.o $(OBJ_D)/m_ripemd.o $(OBJ_D)/p_open.o \
+        $(OBJ_D)/p_seal.o $(OBJ_D)/p_sign.o $(OBJ_D)/p_verify.o \
+        $(OBJ_D)/p_lib.o $(OBJ_D)/p_enc.o $(OBJ_D)/p_dec.o \
+        $(OBJ_D)/bio_md.o $(OBJ_D)/bio_b64.o $(OBJ_D)/bio_enc.o \
+        $(OBJ_D)/evp_err.o $(OBJ_D)/e_null.o $(OBJ_D)/c_all.o \
+        $(OBJ_D)/evp_lib.o $(OBJ_D)/pem_sign.o $(OBJ_D)/pem_seal.o \
+        $(OBJ_D)/pem_info.o $(OBJ_D)/pem_lib.o $(OBJ_D)/pem_all.o \
+        $(OBJ_D)/pem_err.o $(OBJ_D)/a_object.o $(OBJ_D)/a_bitstr.o \
+        $(OBJ_D)/a_utctm.o $(OBJ_D)/a_int.o $(OBJ_D)/a_octet.o \
+        $(OBJ_D)/a_print.o $(OBJ_D)/a_type.o $(OBJ_D)/a_set.o \
+        $(OBJ_D)/a_dup.o $(OBJ_D)/a_d2i_fp.o $(OBJ_D)/a_i2d_fp.o \
+        $(OBJ_D)/a_sign.o $(OBJ_D)/a_digest.o $(OBJ_D)/a_verify.o \
+        $(OBJ_D)/x_algor.o $(OBJ_D)/x_val.o $(OBJ_D)/x_pubkey.o \
+        $(OBJ_D)/x_sig.o $(OBJ_D)/x_req.o $(OBJ_D)/x_attrib.o \
+        $(OBJ_D)/x_name.o $(OBJ_D)/x_cinf.o $(OBJ_D)/x_x509.o \
+        $(OBJ_D)/x_crl.o $(OBJ_D)/x_info.o $(OBJ_D)/x_spki.o \
+        $(OBJ_D)/d2i_r_pr.o $(OBJ_D)/i2d_r_pr.o $(OBJ_D)/d2i_r_pu.o \
+        $(OBJ_D)/i2d_r_pu.o $(OBJ_D)/d2i_s_pr.o $(OBJ_D)/i2d_s_pr.o \
+        $(OBJ_D)/d2i_s_pu.o $(OBJ_D)/i2d_s_pu.o $(OBJ_D)/d2i_pu.o \
+        $(OBJ_D)/d2i_pr.o $(OBJ_D)/i2d_pu.o $(OBJ_D)/i2d_pr.o \
+        $(OBJ_D)/t_req.o $(OBJ_D)/t_x509.o $(OBJ_D)/t_pkey.o \
+        $(OBJ_D)/p7_i_s.o $(OBJ_D)/p7_signi.o $(OBJ_D)/p7_signd.o \
+        $(OBJ_D)/p7_recip.o $(OBJ_D)/p7_enc_c.o $(OBJ_D)/p7_evp.o \
+        $(OBJ_D)/p7_dgst.o $(OBJ_D)/p7_s_e.o $(OBJ_D)/p7_enc.o \
+        $(OBJ_D)/p7_lib.o $(OBJ_D)/f_int.o $(OBJ_D)/f_string.o \
+        $(OBJ_D)/i2d_dhp.o $(OBJ_D)/i2d_dsap.o $(OBJ_D)/d2i_dhp.o \
+        $(OBJ_D)/d2i_dsap.o $(OBJ_D)/n_pkey.o $(OBJ_D)/a_hdr.o \
+        $(OBJ_D)/x_pkey.o $(OBJ_D)/a_bool.o $(OBJ_D)/x_exten.o \
+        $(OBJ_D)/asn1_par.o $(OBJ_D)/asn1_lib.o $(OBJ_D)/asn1_err.o \
+        $(OBJ_D)/a_meth.o $(OBJ_D)/a_bytes.o $(OBJ_D)/evp_asn1.o \
+        $(OBJ_D)/x509_def.o $(OBJ_D)/x509_d2.o $(OBJ_D)/x509_r2x.o \
+        $(OBJ_D)/x509_cmp.o $(OBJ_D)/x509_obj.o $(OBJ_D)/x509_req.o \
+        $(OBJ_D)/x509_vfy.o $(OBJ_D)/x509_set.o $(OBJ_D)/x509rset.o \
+        $(OBJ_D)/x509_err.o $(OBJ_D)/x509name.o $(OBJ_D)/x509_v3.o \
+        $(OBJ_D)/x509_ext.o $(OBJ_D)/x509pack.o $(OBJ_D)/x509type.o \
+        $(OBJ_D)/x509_lu.o $(OBJ_D)/x_all.o $(OBJ_D)/x509_txt.o \
+        $(OBJ_D)/by_file.o $(OBJ_D)/by_dir.o $(OBJ_D)/v3_net.o \
+        $(OBJ_D)/v3_x509.o $(OBJ_D)/conf.o $(OBJ_D)/conf_err.o \
+        $(OBJ_D)/txt_db.o $(OBJ_D)/pk7_lib.o $(OBJ_D)/pkcs7err.o \
+        $(OBJ_D)/pk7_doit.o
+
+SSLOBJ=$(OBJ_D)/s2_meth.o \
+        $(OBJ_D)/s2_srvr.o $(OBJ_D)/s2_clnt.o $(OBJ_D)/s2_lib.o \
+        $(OBJ_D)/s2_enc.o $(OBJ_D)/s2_pkt.o $(OBJ_D)/s3_meth.o \
+        $(OBJ_D)/s3_srvr.o $(OBJ_D)/s3_clnt.o $(OBJ_D)/s3_lib.o \
+        $(OBJ_D)/s3_enc.o $(OBJ_D)/s3_pkt.o $(OBJ_D)/s3_both.o \
+        $(OBJ_D)/s23_meth.o $(OBJ_D)/s23_srvr.o $(OBJ_D)/s23_clnt.o \
+        $(OBJ_D)/s23_lib.o $(OBJ_D)/s23_pkt.o $(OBJ_D)/t1_meth.o \
+        $(OBJ_D)/t1_srvr.o $(OBJ_D)/t1_clnt.o $(OBJ_D)/t1_lib.o \
+        $(OBJ_D)/t1_enc.o $(OBJ_D)/ssl_lib.o $(OBJ_D)/ssl_err2.o \
+        $(OBJ_D)/ssl_cert.o $(OBJ_D)/ssl_sess.o $(OBJ_D)/ssl_ciph.o \
+        $(OBJ_D)/ssl_stat.o $(OBJ_D)/ssl_rsa.o $(OBJ_D)/ssl_asn1.o \
+        $(OBJ_D)/ssl_txt.o $(OBJ_D)/ssl_algs.o $(OBJ_D)/bio_ssl.o \
+        $(OBJ_D)/ssl_err.o
+
+RSAGLUEOBJ=$(OBJ_D)/rsaref.o \
+        $(OBJ_D)/rsar_err.o
+
+T_EXE=$(TEST_D)/md2test \
+        $(TEST_D)/md5test $(TEST_D)/shatest $(TEST_D)/sha1test \
+        $(TEST_D)/mdc2test $(TEST_D)/hmactest $(TEST_D)/rmdtest \
+        $(TEST_D)/destest $(TEST_D)/rc2test $(TEST_D)/rc4test \
+        $(TEST_D)/rc5test $(TEST_D)/ideatest $(TEST_D)/bftest \
+        $(TEST_D)/casttest $(TEST_D)/bntest $(TEST_D)/exptest \
+        $(TEST_D)/dsatest $(TEST_D)/dhtest $(TEST_D)/randtest \
+        $(TEST_D)/ssltest
+
+###################################################################
+all: banner $(TMP_D) $(BIN_D) $(TEST_D) $(LIB_D) $(INC_D) headers lib exe
+
+banner:
+
+
+$(TMP_D):
+        $(MKDIR) $(TMP_D)
+
+$(BIN_D):
+        $(MKDIR) $(BIN_D)
+
+$(TEST_D):
+        $(MKDIR) $(TEST_D)
+
+$(LIB_D):
+        $(MKDIR) $(LIB_D)
+
+$(INC_D):
+        $(MKDIR) $(INC_D)
+
+headers: $(HEADER) $(EXHEADER)
+
+lib: $(LIBS_DEP)
+
+exe: $(T_EXE) $(BIN_D)/$(E_EXE)
+
+install:
+        $(MKDIR) $(INSTALLTOP)
+        $(MKDIR) $(INSTALLTOP)/bin
+        $(MKDIR) $(INSTALLTOP)/include
+        $(MKDIR) $(INSTALLTOP)/lib
+        $(CP) $(INC_D)/*.[ch] $(INSTALLTOP)/include
+        $(CP) $(BIN_D)/$(E_EXE) $(INSTALLTOP)/bin
+        $(CP) $(O_SSL) $(INSTALLTOP)/lib
+        $(CP) $(O_CRYPTO) $(INSTALLTOP)/lib
+
+clean:
+        $(RM) $(TMP_D)/*.*
+
+vclean:
+        $(RM) $(TMP_D)/*.*
+        $(RM) $(OUT_D)/*.*
+
+$(INCL_D)/cryptlib.h: $(SRC_D)/crypto/cryptlib.h
+        $(CP) $(SRC_D)/crypto/cryptlib.h $(INCL_D)/cryptlib.h
+
+$(INCL_D)/date.h: $(SRC_D)/crypto/date.h
+        $(CP) $(SRC_D)/crypto/date.h $(INCL_D)/date.h
+
+$(INCL_D)/md5_locl.h: $(SRC_D)/crypto/md5/md5_locl.h
+        $(CP) $(SRC_D)/crypto/md5/md5_locl.h $(INCL_D)/md5_locl.h
+
+$(INCL_D)/sha_locl.h: $(SRC_D)/crypto/sha/sha_locl.h
+        $(CP) $(SRC_D)/crypto/sha/sha_locl.h $(INCL_D)/sha_locl.h
+
+$(INCL_D)/rmd_locl.h: $(SRC_D)/crypto/ripemd/rmd_locl.h
+        $(CP) $(SRC_D)/crypto/ripemd/rmd_locl.h $(INCL_D)/rmd_locl.h
+
+$(INCL_D)/rmdconst.h: $(SRC_D)/crypto/ripemd/rmdconst.h
+        $(CP) $(SRC_D)/crypto/ripemd/rmdconst.h $(INCL_D)/rmdconst.h
+
+$(INCL_D)/des_locl.h: $(SRC_D)/crypto/des/des_locl.h
+        $(CP) $(SRC_D)/crypto/des/des_locl.h $(INCL_D)/des_locl.h
+
+$(INCL_D)/rpc_des.h: $(SRC_D)/crypto/des/rpc_des.h
+        $(CP) $(SRC_D)/crypto/des/rpc_des.h $(INCL_D)/rpc_des.h
+
+$(INCL_D)/podd.h: $(SRC_D)/crypto/des/podd.h
+        $(CP) $(SRC_D)/crypto/des/podd.h $(INCL_D)/podd.h
+
+$(INCL_D)/sk.h: $(SRC_D)/crypto/des/sk.h
+        $(CP) $(SRC_D)/crypto/des/sk.h $(INCL_D)/sk.h
+
+$(INCL_D)/spr.h: $(SRC_D)/crypto/des/spr.h
+        $(CP) $(SRC_D)/crypto/des/spr.h $(INCL_D)/spr.h
+
+$(INCL_D)/des_ver.h: $(SRC_D)/crypto/des/des_ver.h
+        $(CP) $(SRC_D)/crypto/des/des_ver.h $(INCL_D)/des_ver.h
+
+$(INCL_D)/rc2_locl.h: $(SRC_D)/crypto/rc2/rc2_locl.h
+        $(CP) $(SRC_D)/crypto/rc2/rc2_locl.h $(INCL_D)/rc2_locl.h
+
+$(INCL_D)/rc4_locl.h: $(SRC_D)/crypto/rc4/rc4_locl.h
+        $(CP) $(SRC_D)/crypto/rc4/rc4_locl.h $(INCL_D)/rc4_locl.h
+
+$(INCL_D)/rc5_locl.h: $(SRC_D)/crypto/rc5/rc5_locl.h
+        $(CP) $(SRC_D)/crypto/rc5/rc5_locl.h $(INCL_D)/rc5_locl.h
+
+$(INCL_D)/idea_lcl.h: $(SRC_D)/crypto/idea/idea_lcl.h
+        $(CP) $(SRC_D)/crypto/idea/idea_lcl.h $(INCL_D)/idea_lcl.h
+
+$(INCL_D)/bf_pi.h: $(SRC_D)/crypto/bf/bf_pi.h
+        $(CP) $(SRC_D)/crypto/bf/bf_pi.h $(INCL_D)/bf_pi.h
+
+$(INCL_D)/bf_locl.h: $(SRC_D)/crypto/bf/bf_locl.h
+        $(CP) $(SRC_D)/crypto/bf/bf_locl.h $(INCL_D)/bf_locl.h
+
+$(INCL_D)/cast_s.h: $(SRC_D)/crypto/cast/cast_s.h
+        $(CP) $(SRC_D)/crypto/cast/cast_s.h $(INCL_D)/cast_s.h
+
+$(INCL_D)/cast_lcl.h: $(SRC_D)/crypto/cast/cast_lcl.h
+        $(CP) $(SRC_D)/crypto/cast/cast_lcl.h $(INCL_D)/cast_lcl.h
+
+$(INCL_D)/bn_lcl.h: $(SRC_D)/crypto/bn/bn_lcl.h
+        $(CP) $(SRC_D)/crypto/bn/bn_lcl.h $(INCL_D)/bn_lcl.h
+
+$(INCL_D)/bn_prime.h: $(SRC_D)/crypto/bn/bn_prime.h
+        $(CP) $(SRC_D)/crypto/bn/bn_prime.h $(INCL_D)/bn_prime.h
+
+$(INCL_D)/obj_dat.h: $(SRC_D)/crypto/objects/obj_dat.h
+        $(CP) $(SRC_D)/crypto/objects/obj_dat.h $(INCL_D)/obj_dat.h
+
+$(INCL_D)/conf_lcl.h: $(SRC_D)/crypto/conf/conf_lcl.h
+        $(CP) $(SRC_D)/crypto/conf/conf_lcl.h $(INCL_D)/conf_lcl.h
+
+$(INCL_D)/ssl_locl.h: $(SRC_D)/ssl/ssl_locl.h
+        $(CP) $(SRC_D)/ssl/ssl_locl.h $(INCL_D)/ssl_locl.h
+
+$(INCL_D)/rsaref.h: $(SRC_D)/rsaref/rsaref.h
+        $(CP) $(SRC_D)/rsaref/rsaref.h $(INCL_D)/rsaref.h
+
+$(INCL_D)/apps.h: $(SRC_D)/apps/apps.h
+        $(CP) $(SRC_D)/apps/apps.h $(INCL_D)/apps.h
+
+$(INCL_D)/progs.h: $(SRC_D)/apps/progs.h
+        $(CP) $(SRC_D)/apps/progs.h $(INCL_D)/progs.h
+
+$(INCL_D)/s_apps.h: $(SRC_D)/apps/s_apps.h
+        $(CP) $(SRC_D)/apps/s_apps.h $(INCL_D)/s_apps.h
+
+$(INCL_D)/testdsa.h: $(SRC_D)/apps/testdsa.h
+        $(CP) $(SRC_D)/apps/testdsa.h $(INCL_D)/testdsa.h
+
+$(INCL_D)/testrsa.h: $(SRC_D)/apps/testrsa.h
+        $(CP) $(SRC_D)/apps/testrsa.h $(INCL_D)/testrsa.h
+
+$(INC_D)/e_os.h: $(SRC_D)/./e_os.h
+        $(CP) $(SRC_D)/./e_os.h $(INC_D)/e_os.h
+
+$(INC_D)/crypto.h: $(SRC_D)/crypto/crypto.h
+        $(CP) $(SRC_D)/crypto/crypto.h $(INC_D)/crypto.h
+
+$(INC_D)/cryptall.h: $(SRC_D)/crypto/cryptall.h
+        $(CP) $(SRC_D)/crypto/cryptall.h $(INC_D)/cryptall.h
+
+$(INC_D)/md2.h: $(SRC_D)/crypto/md2/md2.h
+        $(CP) $(SRC_D)/crypto/md2/md2.h $(INC_D)/md2.h
+
+$(INC_D)/md5.h: $(SRC_D)/crypto/md5/md5.h
+        $(CP) $(SRC_D)/crypto/md5/md5.h $(INC_D)/md5.h
+
+$(INC_D)/sha.h: $(SRC_D)/crypto/sha/sha.h
+        $(CP) $(SRC_D)/crypto/sha/sha.h $(INC_D)/sha.h
+
+$(INC_D)/mdc2.h: $(SRC_D)/crypto/mdc2/mdc2.h
+        $(CP) $(SRC_D)/crypto/mdc2/mdc2.h $(INC_D)/mdc2.h
+
+$(INC_D)/hmac.h: $(SRC_D)/crypto/hmac/hmac.h
+        $(CP) $(SRC_D)/crypto/hmac/hmac.h $(INC_D)/hmac.h
+
+$(INC_D)/ripemd.h: $(SRC_D)/crypto/ripemd/ripemd.h
+        $(CP) $(SRC_D)/crypto/ripemd/ripemd.h $(INC_D)/ripemd.h
+
+$(INC_D)/des.h: $(SRC_D)/crypto/des/des.h
+        $(CP) $(SRC_D)/crypto/des/des.h $(INC_D)/des.h
+
+$(INC_D)/rc2.h: $(SRC_D)/crypto/rc2/rc2.h
+        $(CP) $(SRC_D)/crypto/rc2/rc2.h $(INC_D)/rc2.h
+
+$(INC_D)/rc4.h: $(SRC_D)/crypto/rc4/rc4.h
+        $(CP) $(SRC_D)/crypto/rc4/rc4.h $(INC_D)/rc4.h
+
+$(INC_D)/rc5.h: $(SRC_D)/crypto/rc5/rc5.h
+        $(CP) $(SRC_D)/crypto/rc5/rc5.h $(INC_D)/rc5.h
+
+$(INC_D)/idea.h: $(SRC_D)/crypto/idea/idea.h
+        $(CP) $(SRC_D)/crypto/idea/idea.h $(INC_D)/idea.h
+
+$(INC_D)/blowfish.h: $(SRC_D)/crypto/bf/blowfish.h
+        $(CP) $(SRC_D)/crypto/bf/blowfish.h $(INC_D)/blowfish.h
+
+$(INC_D)/cast.h: $(SRC_D)/crypto/cast/cast.h
+        $(CP) $(SRC_D)/crypto/cast/cast.h $(INC_D)/cast.h
+
+$(INC_D)/bn.h: $(SRC_D)/crypto/bn/bn.h
+        $(CP) $(SRC_D)/crypto/bn/bn.h $(INC_D)/bn.h
+
+$(INC_D)/rsa.h: $(SRC_D)/crypto/rsa/rsa.h
+        $(CP) $(SRC_D)/crypto/rsa/rsa.h $(INC_D)/rsa.h
+
+$(INC_D)/dsa.h: $(SRC_D)/crypto/dsa/dsa.h
+        $(CP) $(SRC_D)/crypto/dsa/dsa.h $(INC_D)/dsa.h
+
+$(INC_D)/dh.h: $(SRC_D)/crypto/dh/dh.h
+        $(CP) $(SRC_D)/crypto/dh/dh.h $(INC_D)/dh.h
+
+$(INC_D)/buffer.h: $(SRC_D)/crypto/buffer/buffer.h
+        $(CP) $(SRC_D)/crypto/buffer/buffer.h $(INC_D)/buffer.h
+
+$(INC_D)/bio.h: $(SRC_D)/crypto/bio/bio.h
+        $(CP) $(SRC_D)/crypto/bio/bio.h $(INC_D)/bio.h
+
+$(INC_D)/bss_file.c: $(SRC_D)/crypto/bio/bss_file.c
+        $(CP) $(SRC_D)/crypto/bio/bss_file.c $(INC_D)/bss_file.c
+
+$(INC_D)/stack.h: $(SRC_D)/crypto/stack/stack.h
+        $(CP) $(SRC_D)/crypto/stack/stack.h $(INC_D)/stack.h
+
+$(INC_D)/lhash.h: $(SRC_D)/crypto/lhash/lhash.h
+        $(CP) $(SRC_D)/crypto/lhash/lhash.h $(INC_D)/lhash.h
+
+$(INC_D)/rand.h: $(SRC_D)/crypto/rand/rand.h
+        $(CP) $(SRC_D)/crypto/rand/rand.h $(INC_D)/rand.h
+
+$(INC_D)/err.h: $(SRC_D)/crypto/err/err.h
+        $(CP) $(SRC_D)/crypto/err/err.h $(INC_D)/err.h
+
+$(INC_D)/objects.h: $(SRC_D)/crypto/objects/objects.h
+        $(CP) $(SRC_D)/crypto/objects/objects.h $(INC_D)/objects.h
+
+$(INC_D)/evp.h: $(SRC_D)/crypto/evp/evp.h
+        $(CP) $(SRC_D)/crypto/evp/evp.h $(INC_D)/evp.h
+
+$(INC_D)/pem.h: $(SRC_D)/crypto/pem/pem.h
+        $(CP) $(SRC_D)/crypto/pem/pem.h $(INC_D)/pem.h
+
+$(INC_D)/asn1.h: $(SRC_D)/crypto/asn1/asn1.h
+        $(CP) $(SRC_D)/crypto/asn1/asn1.h $(INC_D)/asn1.h
+
+$(INC_D)/asn1_mac.h: $(SRC_D)/crypto/asn1/asn1_mac.h
+        $(CP) $(SRC_D)/crypto/asn1/asn1_mac.h $(INC_D)/asn1_mac.h
+
+$(INC_D)/x509.h: $(SRC_D)/crypto/x509/x509.h
+        $(CP) $(SRC_D)/crypto/x509/x509.h $(INC_D)/x509.h
+
+$(INC_D)/x509_vfy.h: $(SRC_D)/crypto/x509/x509_vfy.h
+        $(CP) $(SRC_D)/crypto/x509/x509_vfy.h $(INC_D)/x509_vfy.h
+
+$(INC_D)/conf.h: $(SRC_D)/crypto/conf/conf.h
+        $(CP) $(SRC_D)/crypto/conf/conf.h $(INC_D)/conf.h
+
+$(INC_D)/txt_db.h: $(SRC_D)/crypto/txt_db/txt_db.h
+        $(CP) $(SRC_D)/crypto/txt_db/txt_db.h $(INC_D)/txt_db.h
+
+$(INC_D)/pkcs7.h: $(SRC_D)/crypto/pkcs7/pkcs7.h
+        $(CP) $(SRC_D)/crypto/pkcs7/pkcs7.h $(INC_D)/pkcs7.h
+
+$(INC_D)/ssl.h: $(SRC_D)/ssl/ssl.h
+        $(CP) $(SRC_D)/ssl/ssl.h $(INC_D)/ssl.h
+
+$(INC_D)/ssl2.h: $(SRC_D)/ssl/ssl2.h
+        $(CP) $(SRC_D)/ssl/ssl2.h $(INC_D)/ssl2.h
+
+$(INC_D)/ssl3.h: $(SRC_D)/ssl/ssl3.h
+        $(CP) $(SRC_D)/ssl/ssl3.h $(INC_D)/ssl3.h
+
+$(INC_D)/ssl23.h: $(SRC_D)/ssl/ssl23.h
+        $(CP) $(SRC_D)/ssl/ssl23.h $(INC_D)/ssl23.h
+
+$(INC_D)/tls1.h: $(SRC_D)/ssl/tls1.h
+        $(CP) $(SRC_D)/ssl/tls1.h $(INC_D)/tls1.h
+
+$(OBJ_D)/md2test.o: $(SRC_D)/crypto/md2/md2test.c
+        $(CC) -o $(OBJ_D)/md2test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/md2/md2test.c
+
+$(OBJ_D)/md5test.o: $(SRC_D)/crypto/md5/md5test.c
+        $(CC) -o $(OBJ_D)/md5test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/md5/md5test.c
+
+$(OBJ_D)/shatest.o: $(SRC_D)/crypto/sha/shatest.c
+        $(CC) -o $(OBJ_D)/shatest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/sha/shatest.c
+
+$(OBJ_D)/sha1test.o: $(SRC_D)/crypto/sha/sha1test.c
+        $(CC) -o $(OBJ_D)/sha1test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/sha/sha1test.c
+
+$(OBJ_D)/mdc2test.o: $(SRC_D)/crypto/mdc2/mdc2test.c
+        $(CC) -o $(OBJ_D)/mdc2test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/mdc2/mdc2test.c
+
+$(OBJ_D)/hmactest.o: $(SRC_D)/crypto/hmac/hmactest.c
+        $(CC) -o $(OBJ_D)/hmactest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/hmac/hmactest.c
+
+$(OBJ_D)/rmdtest.o: $(SRC_D)/crypto/ripemd/rmdtest.c
+        $(CC) -o $(OBJ_D)/rmdtest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/ripemd/rmdtest.c
+
+$(OBJ_D)/destest.o: $(SRC_D)/crypto/des/destest.c
+        $(CC) -o $(OBJ_D)/destest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/des/destest.c
+
+$(OBJ_D)/rc2test.o: $(SRC_D)/crypto/rc2/rc2test.c
+        $(CC) -o $(OBJ_D)/rc2test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/rc2/rc2test.c
+
+$(OBJ_D)/rc4test.o: $(SRC_D)/crypto/rc4/rc4test.c
+        $(CC) -o $(OBJ_D)/rc4test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/rc4/rc4test.c
+
+$(OBJ_D)/rc5test.o: $(SRC_D)/crypto/rc5/rc5test.c
+        $(CC) -o $(OBJ_D)/rc5test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/rc5/rc5test.c
+
+$(OBJ_D)/ideatest.o: $(SRC_D)/crypto/idea/ideatest.c
+        $(CC) -o $(OBJ_D)/ideatest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/idea/ideatest.c
+
+$(OBJ_D)/bftest.o: $(SRC_D)/crypto/bf/bftest.c
+        $(CC) -o $(OBJ_D)/bftest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/bf/bftest.c
+
+$(OBJ_D)/casttest.o: $(SRC_D)/crypto/cast/casttest.c
+        $(CC) -o $(OBJ_D)/casttest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/cast/casttest.c
+
+$(OBJ_D)/bntest.o: $(SRC_D)/crypto/bn/bntest.c
+        $(CC) -o $(OBJ_D)/bntest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/bn/bntest.c
+
+$(OBJ_D)/exptest.o: $(SRC_D)/crypto/bn/exptest.c
+        $(CC) -o $(OBJ_D)/exptest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/bn/exptest.c
+
+$(OBJ_D)/dsatest.o: $(SRC_D)/crypto/dsa/dsatest.c
+        $(CC) -o $(OBJ_D)/dsatest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/dsa/dsatest.c
+
+$(OBJ_D)/dhtest.o: $(SRC_D)/crypto/dh/dhtest.c
+        $(CC) -o $(OBJ_D)/dhtest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/dh/dhtest.c
+
+$(OBJ_D)/randtest.o: $(SRC_D)/crypto/rand/randtest.c
+        $(CC) -o $(OBJ_D)/randtest.o $(APP_CFLAGS) -c $(SRC_D)/crypto/rand/randtest.c
+
+$(OBJ_D)/ssltest.o: $(SRC_D)/ssl/ssltest.c
+        $(CC) -o $(OBJ_D)/ssltest.o $(APP_CFLAGS) -c $(SRC_D)/ssl/ssltest.c
+
+$(OBJ_D)/verify.o: $(SRC_D)/apps/verify.c
+        $(CC) -o $(OBJ_D)/verify.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/verify.c
+
+$(OBJ_D)/asn1pars.o: $(SRC_D)/apps/asn1pars.c
+        $(CC) -o $(OBJ_D)/asn1pars.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/asn1pars.c
+
+$(OBJ_D)/req.o: $(SRC_D)/apps/req.c
+        $(CC) -o $(OBJ_D)/req.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/req.c
+
+$(OBJ_D)/dgst.o: $(SRC_D)/apps/dgst.c
+        $(CC) -o $(OBJ_D)/dgst.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/dgst.c
+
+$(OBJ_D)/dh.o: $(SRC_D)/apps/dh.c
+        $(CC) -o $(OBJ_D)/dh.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/dh.c
+
+$(OBJ_D)/enc.o: $(SRC_D)/apps/enc.c
+        $(CC) -o $(OBJ_D)/enc.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/enc.c
+
+$(OBJ_D)/gendh.o: $(SRC_D)/apps/gendh.c
+        $(CC) -o $(OBJ_D)/gendh.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/gendh.c
+
+$(OBJ_D)/errstr.o: $(SRC_D)/apps/errstr.c
+        $(CC) -o $(OBJ_D)/errstr.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/errstr.c
+
+$(OBJ_D)/ca.o: $(SRC_D)/apps/ca.c
+        $(CC) -o $(OBJ_D)/ca.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/ca.c
+
+$(OBJ_D)/pkcs7.o: $(SRC_D)/apps/pkcs7.c
+        $(CC) -o $(OBJ_D)/pkcs7.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/pkcs7.c
+
+$(OBJ_D)/crl2p7.o: $(SRC_D)/apps/crl2p7.c
+        $(CC) -o $(OBJ_D)/crl2p7.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/crl2p7.c
+
+$(OBJ_D)/crl.o: $(SRC_D)/apps/crl.c
+        $(CC) -o $(OBJ_D)/crl.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/crl.c
+
+$(OBJ_D)/rsa.o: $(SRC_D)/apps/rsa.c
+        $(CC) -o $(OBJ_D)/rsa.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/rsa.c
+
+$(OBJ_D)/dsa.o: $(SRC_D)/apps/dsa.c
+        $(CC) -o $(OBJ_D)/dsa.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/dsa.c
+
+$(OBJ_D)/dsaparam.o: $(SRC_D)/apps/dsaparam.c
+        $(CC) -o $(OBJ_D)/dsaparam.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/dsaparam.c
+
+$(OBJ_D)/x509.o: $(SRC_D)/apps/x509.c
+        $(CC) -o $(OBJ_D)/x509.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/x509.c
+
+$(OBJ_D)/genrsa.o: $(SRC_D)/apps/genrsa.c
+        $(CC) -o $(OBJ_D)/genrsa.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/genrsa.c
+
+$(OBJ_D)/s_server.o: $(SRC_D)/apps/s_server.c
+        $(CC) -o $(OBJ_D)/s_server.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/s_server.c
+
+$(OBJ_D)/s_client.o: $(SRC_D)/apps/s_client.c
+        $(CC) -o $(OBJ_D)/s_client.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/s_client.c
+
+$(OBJ_D)/speed.o: $(SRC_D)/apps/speed.c
+        $(CC) -o $(OBJ_D)/speed.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/speed.c
+
+$(OBJ_D)/s_time.o: $(SRC_D)/apps/s_time.c
+        $(CC) -o $(OBJ_D)/s_time.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/s_time.c
+
+$(OBJ_D)/apps.o: $(SRC_D)/apps/apps.c
+        $(CC) -o $(OBJ_D)/apps.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/apps.c
+
+$(OBJ_D)/s_cb.o: $(SRC_D)/apps/s_cb.c
+        $(CC) -o $(OBJ_D)/s_cb.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/s_cb.c
+
+$(OBJ_D)/s_socket.o: $(SRC_D)/apps/s_socket.c
+        $(CC) -o $(OBJ_D)/s_socket.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/s_socket.c
+
+$(OBJ_D)/version.o: $(SRC_D)/apps/version.c
+        $(CC) -o $(OBJ_D)/version.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/version.c
+
+$(OBJ_D)/sess_id.o: $(SRC_D)/apps/sess_id.c
+        $(CC) -o $(OBJ_D)/sess_id.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/sess_id.c
+
+$(OBJ_D)/ciphers.o: $(SRC_D)/apps/ciphers.c
+        $(CC) -o $(OBJ_D)/ciphers.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/ciphers.c
+
+$(OBJ_D)/ssleay.o: $(SRC_D)/apps/ssleay.c
+        $(CC) -o $(OBJ_D)/ssleay.o -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)/apps/ssleay.c
+
+$(OBJ_D)/cryptlib.o: $(SRC_D)/crypto/cryptlib.c
+        $(CC) -o $(OBJ_D)/cryptlib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cryptlib.c
+
+$(OBJ_D)/mem.o: $(SRC_D)/crypto/mem.c
+        $(CC) -o $(OBJ_D)/mem.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/mem.c
+
+$(OBJ_D)/cversion.o: $(SRC_D)/crypto/cversion.c
+        $(CC) -o $(OBJ_D)/cversion.o  $(LIB_CFLAGS) -DCFLAGS="\"$(CC) $(CFLAG)\"" -c $(SRC_D)/crypto/cversion.c
+
+$(OBJ_D)/ex_data.o: $(SRC_D)/crypto/ex_data.c
+        $(CC) -o $(OBJ_D)/ex_data.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/ex_data.c
+
+$(OBJ_D)/cpt_err.o: $(SRC_D)/crypto/cpt_err.c
+        $(CC) -o $(OBJ_D)/cpt_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cpt_err.c
+
+$(OBJ_D)/md2_dgst.o: $(SRC_D)/crypto/md2/md2_dgst.c
+        $(CC) -o $(OBJ_D)/md2_dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/md2/md2_dgst.c
+
+$(OBJ_D)/md2_one.o: $(SRC_D)/crypto/md2/md2_one.c
+        $(CC) -o $(OBJ_D)/md2_one.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/md2/md2_one.c
+
+$(OBJ_D)/md5_dgst.o: $(SRC_D)/crypto/md5/md5_dgst.c
+        $(CC) -o $(OBJ_D)/md5_dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/md5/md5_dgst.c
+
+$(OBJ_D)/md5_one.o: $(SRC_D)/crypto/md5/md5_one.c
+        $(CC) -o $(OBJ_D)/md5_one.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/md5/md5_one.c
+
+$(OBJ_D)/sha_dgst.o: $(SRC_D)/crypto/sha/sha_dgst.c
+        $(CC) -o $(OBJ_D)/sha_dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/sha/sha_dgst.c
+
+$(OBJ_D)/sha1dgst.o: $(SRC_D)/crypto/sha/sha1dgst.c
+        $(CC) -o $(OBJ_D)/sha1dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/sha/sha1dgst.c
+
+$(OBJ_D)/sha_one.o: $(SRC_D)/crypto/sha/sha_one.c
+        $(CC) -o $(OBJ_D)/sha_one.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/sha/sha_one.c
+
+$(OBJ_D)/sha1_one.o: $(SRC_D)/crypto/sha/sha1_one.c
+        $(CC) -o $(OBJ_D)/sha1_one.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/sha/sha1_one.c
+
+$(OBJ_D)/mdc2dgst.o: $(SRC_D)/crypto/mdc2/mdc2dgst.c
+        $(CC) -o $(OBJ_D)/mdc2dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/mdc2/mdc2dgst.c
+
+$(OBJ_D)/mdc2_one.o: $(SRC_D)/crypto/mdc2/mdc2_one.c
+        $(CC) -o $(OBJ_D)/mdc2_one.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/mdc2/mdc2_one.c
+
+$(OBJ_D)/hmac.o: $(SRC_D)/crypto/hmac/hmac.c
+        $(CC) -o $(OBJ_D)/hmac.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/hmac/hmac.c
+
+$(OBJ_D)/rmd_dgst.o: $(SRC_D)/crypto/ripemd/rmd_dgst.c
+        $(CC) -o $(OBJ_D)/rmd_dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/ripemd/rmd_dgst.c
+
+$(OBJ_D)/rmd_one.o: $(SRC_D)/crypto/ripemd/rmd_one.c
+        $(CC) -o $(OBJ_D)/rmd_one.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/ripemd/rmd_one.c
+
+$(OBJ_D)/set_key.o: $(SRC_D)/crypto/des/set_key.c
+        $(CC) -o $(OBJ_D)/set_key.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/set_key.c
+
+$(OBJ_D)/ecb_enc.o: $(SRC_D)/crypto/des/ecb_enc.c
+        $(CC) -o $(OBJ_D)/ecb_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/ecb_enc.c
+
+$(OBJ_D)/cbc_enc.o: $(SRC_D)/crypto/des/cbc_enc.c
+        $(CC) -o $(OBJ_D)/cbc_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/cbc_enc.c
+
+$(OBJ_D)/ecb3_enc.o: $(SRC_D)/crypto/des/ecb3_enc.c
+        $(CC) -o $(OBJ_D)/ecb3_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/ecb3_enc.c
+
+$(OBJ_D)/cfb64enc.o: $(SRC_D)/crypto/des/cfb64enc.c
+        $(CC) -o $(OBJ_D)/cfb64enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/cfb64enc.c
+
+$(OBJ_D)/cfb64ede.o: $(SRC_D)/crypto/des/cfb64ede.c
+        $(CC) -o $(OBJ_D)/cfb64ede.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/cfb64ede.c
+
+$(OBJ_D)/cfb_enc.o: $(SRC_D)/crypto/des/cfb_enc.c
+        $(CC) -o $(OBJ_D)/cfb_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/cfb_enc.c
+
+$(OBJ_D)/ofb64ede.o: $(SRC_D)/crypto/des/ofb64ede.c
+        $(CC) -o $(OBJ_D)/ofb64ede.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/ofb64ede.c
+
+$(OBJ_D)/enc_read.o: $(SRC_D)/crypto/des/enc_read.c
+        $(CC) -o $(OBJ_D)/enc_read.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/enc_read.c
+
+$(OBJ_D)/enc_writ.o: $(SRC_D)/crypto/des/enc_writ.c
+        $(CC) -o $(OBJ_D)/enc_writ.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/enc_writ.c
+
+$(OBJ_D)/ofb64enc.o: $(SRC_D)/crypto/des/ofb64enc.c
+        $(CC) -o $(OBJ_D)/ofb64enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/ofb64enc.c
+
+$(OBJ_D)/ofb_enc.o: $(SRC_D)/crypto/des/ofb_enc.c
+        $(CC) -o $(OBJ_D)/ofb_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/ofb_enc.c
+
+$(OBJ_D)/str2key.o: $(SRC_D)/crypto/des/str2key.c
+        $(CC) -o $(OBJ_D)/str2key.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/str2key.c
+
+$(OBJ_D)/pcbc_enc.o: $(SRC_D)/crypto/des/pcbc_enc.c
+        $(CC) -o $(OBJ_D)/pcbc_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/pcbc_enc.c
+
+$(OBJ_D)/qud_cksm.o: $(SRC_D)/crypto/des/qud_cksm.c
+        $(CC) -o $(OBJ_D)/qud_cksm.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/qud_cksm.c
+
+$(OBJ_D)/rand_key.o: $(SRC_D)/crypto/des/rand_key.c
+        $(CC) -o $(OBJ_D)/rand_key.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/rand_key.c
+
+$(OBJ_D)/des_enc.o: $(SRC_D)/crypto/des/des_enc.c
+        $(CC) -o $(OBJ_D)/des_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/des_enc.c
+
+$(OBJ_D)/fcrypt_b.o: $(SRC_D)/crypto/des/fcrypt_b.c
+        $(CC) -o $(OBJ_D)/fcrypt_b.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/fcrypt_b.c
+
+$(OBJ_D)/read2pwd.o: $(SRC_D)/crypto/des/read2pwd.c
+        $(CC) -o $(OBJ_D)/read2pwd.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/read2pwd.c
+
+$(OBJ_D)/fcrypt.o: $(SRC_D)/crypto/des/fcrypt.c
+        $(CC) -o $(OBJ_D)/fcrypt.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/fcrypt.c
+
+$(OBJ_D)/xcbc_enc.o: $(SRC_D)/crypto/des/xcbc_enc.c
+        $(CC) -o $(OBJ_D)/xcbc_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/xcbc_enc.c
+
+$(OBJ_D)/read_pwd.o: $(SRC_D)/crypto/des/read_pwd.c
+        $(CC) -o $(OBJ_D)/read_pwd.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/read_pwd.c
+
+$(OBJ_D)/rpc_enc.o: $(SRC_D)/crypto/des/rpc_enc.c
+        $(CC) -o $(OBJ_D)/rpc_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/rpc_enc.c
+
+$(OBJ_D)/cbc_cksm.o: $(SRC_D)/crypto/des/cbc_cksm.c
+        $(CC) -o $(OBJ_D)/cbc_cksm.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/cbc_cksm.c
+
+$(OBJ_D)/supp.o: $(SRC_D)/crypto/des/supp.c
+        $(CC) -o $(OBJ_D)/supp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/des/supp.c
+
+$(OBJ_D)/rc2_ecb.o: $(SRC_D)/crypto/rc2/rc2_ecb.c
+        $(CC) -o $(OBJ_D)/rc2_ecb.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc2/rc2_ecb.c
+
+$(OBJ_D)/rc2_skey.o: $(SRC_D)/crypto/rc2/rc2_skey.c
+        $(CC) -o $(OBJ_D)/rc2_skey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc2/rc2_skey.c
+
+$(OBJ_D)/rc2_cbc.o: $(SRC_D)/crypto/rc2/rc2_cbc.c
+        $(CC) -o $(OBJ_D)/rc2_cbc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc2/rc2_cbc.c
+
+$(OBJ_D)/rc2cfb64.o: $(SRC_D)/crypto/rc2/rc2cfb64.c
+        $(CC) -o $(OBJ_D)/rc2cfb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc2/rc2cfb64.c
+
+$(OBJ_D)/rc2ofb64.o: $(SRC_D)/crypto/rc2/rc2ofb64.c
+        $(CC) -o $(OBJ_D)/rc2ofb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc2/rc2ofb64.c
+
+$(OBJ_D)/rc4_skey.o: $(SRC_D)/crypto/rc4/rc4_skey.c
+        $(CC) -o $(OBJ_D)/rc4_skey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc4/rc4_skey.c
+
+$(OBJ_D)/rc4_enc.o: $(SRC_D)/crypto/rc4/rc4_enc.c
+        $(CC) -o $(OBJ_D)/rc4_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc4/rc4_enc.c
+
+$(OBJ_D)/rc5_skey.o: $(SRC_D)/crypto/rc5/rc5_skey.c
+        $(CC) -o $(OBJ_D)/rc5_skey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc5/rc5_skey.c
+
+$(OBJ_D)/rc5_ecb.o: $(SRC_D)/crypto/rc5/rc5_ecb.c
+        $(CC) -o $(OBJ_D)/rc5_ecb.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc5/rc5_ecb.c
+
+$(OBJ_D)/rc5_enc.o: $(SRC_D)/crypto/rc5/rc5_enc.c
+        $(CC) -o $(OBJ_D)/rc5_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc5/rc5_enc.c
+
+$(OBJ_D)/rc5cfb64.o: $(SRC_D)/crypto/rc5/rc5cfb64.c
+        $(CC) -o $(OBJ_D)/rc5cfb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc5/rc5cfb64.c
+
+$(OBJ_D)/rc5ofb64.o: $(SRC_D)/crypto/rc5/rc5ofb64.c
+        $(CC) -o $(OBJ_D)/rc5ofb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rc5/rc5ofb64.c
+
+$(OBJ_D)/i_cbc.o: $(SRC_D)/crypto/idea/i_cbc.c
+        $(CC) -o $(OBJ_D)/i_cbc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/idea/i_cbc.c
+
+$(OBJ_D)/i_cfb64.o: $(SRC_D)/crypto/idea/i_cfb64.c
+        $(CC) -o $(OBJ_D)/i_cfb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/idea/i_cfb64.c
+
+$(OBJ_D)/i_ofb64.o: $(SRC_D)/crypto/idea/i_ofb64.c
+        $(CC) -o $(OBJ_D)/i_ofb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/idea/i_ofb64.c
+
+$(OBJ_D)/i_ecb.o: $(SRC_D)/crypto/idea/i_ecb.c
+        $(CC) -o $(OBJ_D)/i_ecb.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/idea/i_ecb.c
+
+$(OBJ_D)/i_skey.o: $(SRC_D)/crypto/idea/i_skey.c
+        $(CC) -o $(OBJ_D)/i_skey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/idea/i_skey.c
+
+$(OBJ_D)/bf_skey.o: $(SRC_D)/crypto/bf/bf_skey.c
+        $(CC) -o $(OBJ_D)/bf_skey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bf/bf_skey.c
+
+$(OBJ_D)/bf_ecb.o: $(SRC_D)/crypto/bf/bf_ecb.c
+        $(CC) -o $(OBJ_D)/bf_ecb.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bf/bf_ecb.c
+
+$(OBJ_D)/bf_enc.o: $(SRC_D)/crypto/bf/bf_enc.c
+        $(CC) -o $(OBJ_D)/bf_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bf/bf_enc.c
+
+$(OBJ_D)/bf_cfb64.o: $(SRC_D)/crypto/bf/bf_cfb64.c
+        $(CC) -o $(OBJ_D)/bf_cfb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bf/bf_cfb64.c
+
+$(OBJ_D)/bf_ofb64.o: $(SRC_D)/crypto/bf/bf_ofb64.c
+        $(CC) -o $(OBJ_D)/bf_ofb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bf/bf_ofb64.c
+
+$(OBJ_D)/c_skey.o: $(SRC_D)/crypto/cast/c_skey.c
+        $(CC) -o $(OBJ_D)/c_skey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cast/c_skey.c
+
+$(OBJ_D)/c_ecb.o: $(SRC_D)/crypto/cast/c_ecb.c
+        $(CC) -o $(OBJ_D)/c_ecb.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cast/c_ecb.c
+
+$(OBJ_D)/c_enc.o: $(SRC_D)/crypto/cast/c_enc.c
+        $(CC) -o $(OBJ_D)/c_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cast/c_enc.c
+
+$(OBJ_D)/c_cfb64.o: $(SRC_D)/crypto/cast/c_cfb64.c
+        $(CC) -o $(OBJ_D)/c_cfb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cast/c_cfb64.c
+
+$(OBJ_D)/c_ofb64.o: $(SRC_D)/crypto/cast/c_ofb64.c
+        $(CC) -o $(OBJ_D)/c_ofb64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cast/c_ofb64.c
+
+$(OBJ_D)/bn_add.o: $(SRC_D)/crypto/bn/bn_add.c
+        $(CC) -o $(OBJ_D)/bn_add.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_add.c
+
+$(OBJ_D)/bn_div.o: $(SRC_D)/crypto/bn/bn_div.c
+        $(CC) -o $(OBJ_D)/bn_div.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_div.c
+
+$(OBJ_D)/bn_exp.o: $(SRC_D)/crypto/bn/bn_exp.c
+        $(CC) -o $(OBJ_D)/bn_exp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_exp.c
+
+$(OBJ_D)/bn_lib.o: $(SRC_D)/crypto/bn/bn_lib.c
+        $(CC) -o $(OBJ_D)/bn_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_lib.c
+
+$(OBJ_D)/bn_mod.o: $(SRC_D)/crypto/bn/bn_mod.c
+        $(CC) -o $(OBJ_D)/bn_mod.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mod.c
+
+$(OBJ_D)/bn_mul.o: $(SRC_D)/crypto/bn/bn_mul.c
+        $(CC) -o $(OBJ_D)/bn_mul.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mul.c
+
+$(OBJ_D)/bn_print.o: $(SRC_D)/crypto/bn/bn_print.c
+        $(CC) -o $(OBJ_D)/bn_print.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_print.c
+
+$(OBJ_D)/bn_rand.o: $(SRC_D)/crypto/bn/bn_rand.c
+        $(CC) -o $(OBJ_D)/bn_rand.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_rand.c
+
+$(OBJ_D)/bn_shift.o: $(SRC_D)/crypto/bn/bn_shift.c
+        $(CC) -o $(OBJ_D)/bn_shift.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_shift.c
+
+$(OBJ_D)/bn_sub.o: $(SRC_D)/crypto/bn/bn_sub.c
+        $(CC) -o $(OBJ_D)/bn_sub.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_sub.c
+
+$(OBJ_D)/bn_word.o: $(SRC_D)/crypto/bn/bn_word.c
+        $(CC) -o $(OBJ_D)/bn_word.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_word.c
+
+$(OBJ_D)/bn_blind.o: $(SRC_D)/crypto/bn/bn_blind.c
+        $(CC) -o $(OBJ_D)/bn_blind.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_blind.c
+
+$(OBJ_D)/bn_gcd.o: $(SRC_D)/crypto/bn/bn_gcd.c
+        $(CC) -o $(OBJ_D)/bn_gcd.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_gcd.c
+
+$(OBJ_D)/bn_prime.o: $(SRC_D)/crypto/bn/bn_prime.c
+        $(CC) -o $(OBJ_D)/bn_prime.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_prime.c
+
+$(OBJ_D)/bn_err.o: $(SRC_D)/crypto/bn/bn_err.c
+        $(CC) -o $(OBJ_D)/bn_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_err.c
+
+$(OBJ_D)/bn_sqr.o: $(SRC_D)/crypto/bn/bn_sqr.c
+        $(CC) -o $(OBJ_D)/bn_sqr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_sqr.c
+
+$(OBJ_D)/bn_mulw.o: $(SRC_D)/crypto/bn/bn_mulw.c
+        $(CC) -o $(OBJ_D)/bn_mulw.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mulw.c
+
+$(OBJ_D)/bn_recp.o: $(SRC_D)/crypto/bn/bn_recp.c
+        $(CC) -o $(OBJ_D)/bn_recp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_recp.c
+
+$(OBJ_D)/bn_mont.o: $(SRC_D)/crypto/bn/bn_mont.c
+        $(CC) -o $(OBJ_D)/bn_mont.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mont.c
+
+$(OBJ_D)/bn_mpi.o: $(SRC_D)/crypto/bn/bn_mpi.c
+        $(CC) -o $(OBJ_D)/bn_mpi.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mpi.c
+
+$(OBJ_D)/rsa_eay.o: $(SRC_D)/crypto/rsa/rsa_eay.c
+        $(CC) -o $(OBJ_D)/rsa_eay.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_eay.c
+
+$(OBJ_D)/rsa_gen.o: $(SRC_D)/crypto/rsa/rsa_gen.c
+        $(CC) -o $(OBJ_D)/rsa_gen.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_gen.c
+
+$(OBJ_D)/rsa_lib.o: $(SRC_D)/crypto/rsa/rsa_lib.c
+        $(CC) -o $(OBJ_D)/rsa_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_lib.c
+
+$(OBJ_D)/rsa_sign.o: $(SRC_D)/crypto/rsa/rsa_sign.c
+        $(CC) -o $(OBJ_D)/rsa_sign.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_sign.c
+
+$(OBJ_D)/rsa_saos.o: $(SRC_D)/crypto/rsa/rsa_saos.c
+        $(CC) -o $(OBJ_D)/rsa_saos.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_saos.c
+
+$(OBJ_D)/rsa_err.o: $(SRC_D)/crypto/rsa/rsa_err.c
+        $(CC) -o $(OBJ_D)/rsa_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_err.c
+
+$(OBJ_D)/rsa_pk1.o: $(SRC_D)/crypto/rsa/rsa_pk1.c
+        $(CC) -o $(OBJ_D)/rsa_pk1.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_pk1.c
+
+$(OBJ_D)/rsa_ssl.o: $(SRC_D)/crypto/rsa/rsa_ssl.c
+        $(CC) -o $(OBJ_D)/rsa_ssl.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_ssl.c
+
+$(OBJ_D)/rsa_none.o: $(SRC_D)/crypto/rsa/rsa_none.c
+        $(CC) -o $(OBJ_D)/rsa_none.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_none.c
+
+$(OBJ_D)/dsa_gen.o: $(SRC_D)/crypto/dsa/dsa_gen.c
+        $(CC) -o $(OBJ_D)/dsa_gen.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dsa/dsa_gen.c
+
+$(OBJ_D)/dsa_key.o: $(SRC_D)/crypto/dsa/dsa_key.c
+        $(CC) -o $(OBJ_D)/dsa_key.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dsa/dsa_key.c
+
+$(OBJ_D)/dsa_lib.o: $(SRC_D)/crypto/dsa/dsa_lib.c
+        $(CC) -o $(OBJ_D)/dsa_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dsa/dsa_lib.c
+
+$(OBJ_D)/dsa_vrf.o: $(SRC_D)/crypto/dsa/dsa_vrf.c
+        $(CC) -o $(OBJ_D)/dsa_vrf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dsa/dsa_vrf.c
+
+$(OBJ_D)/dsa_sign.o: $(SRC_D)/crypto/dsa/dsa_sign.c
+        $(CC) -o $(OBJ_D)/dsa_sign.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dsa/dsa_sign.c
+
+$(OBJ_D)/dsa_err.o: $(SRC_D)/crypto/dsa/dsa_err.c
+        $(CC) -o $(OBJ_D)/dsa_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dsa/dsa_err.c
+
+$(OBJ_D)/dh_gen.o: $(SRC_D)/crypto/dh/dh_gen.c
+        $(CC) -o $(OBJ_D)/dh_gen.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dh/dh_gen.c
+
+$(OBJ_D)/dh_key.o: $(SRC_D)/crypto/dh/dh_key.c
+        $(CC) -o $(OBJ_D)/dh_key.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dh/dh_key.c
+
+$(OBJ_D)/dh_lib.o: $(SRC_D)/crypto/dh/dh_lib.c
+        $(CC) -o $(OBJ_D)/dh_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dh/dh_lib.c
+
+$(OBJ_D)/dh_check.o: $(SRC_D)/crypto/dh/dh_check.c
+        $(CC) -o $(OBJ_D)/dh_check.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dh/dh_check.c
+
+$(OBJ_D)/dh_err.o: $(SRC_D)/crypto/dh/dh_err.c
+        $(CC) -o $(OBJ_D)/dh_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/dh/dh_err.c
+
+$(OBJ_D)/buffer.o: $(SRC_D)/crypto/buffer/buffer.c
+        $(CC) -o $(OBJ_D)/buffer.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/buffer/buffer.c
+
+$(OBJ_D)/buf_err.o: $(SRC_D)/crypto/buffer/buf_err.c
+        $(CC) -o $(OBJ_D)/buf_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/buffer/buf_err.c
+
+$(OBJ_D)/bio_lib.o: $(SRC_D)/crypto/bio/bio_lib.c
+        $(CC) -o $(OBJ_D)/bio_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bio_lib.c
+
+$(OBJ_D)/bio_cb.o: $(SRC_D)/crypto/bio/bio_cb.c
+        $(CC) -o $(OBJ_D)/bio_cb.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bio_cb.c
+
+$(OBJ_D)/bio_err.o: $(SRC_D)/crypto/bio/bio_err.c
+        $(CC) -o $(OBJ_D)/bio_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bio_err.c
+
+$(OBJ_D)/bss_mem.o: $(SRC_D)/crypto/bio/bss_mem.c
+        $(CC) -o $(OBJ_D)/bss_mem.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_mem.c
+
+$(OBJ_D)/bss_null.o: $(SRC_D)/crypto/bio/bss_null.c
+        $(CC) -o $(OBJ_D)/bss_null.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_null.c
+
+$(OBJ_D)/bss_fd.o: $(SRC_D)/crypto/bio/bss_fd.c
+        $(CC) -o $(OBJ_D)/bss_fd.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_fd.c
+
+$(OBJ_D)/bss_file.o: $(SRC_D)/crypto/bio/bss_file.c
+        $(CC) -o $(OBJ_D)/bss_file.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_file.c
+
+$(OBJ_D)/bss_sock.o: $(SRC_D)/crypto/bio/bss_sock.c
+        $(CC) -o $(OBJ_D)/bss_sock.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_sock.c
+
+$(OBJ_D)/bss_conn.o: $(SRC_D)/crypto/bio/bss_conn.c
+        $(CC) -o $(OBJ_D)/bss_conn.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_conn.c
+
+$(OBJ_D)/bf_null.o: $(SRC_D)/crypto/bio/bf_null.c
+        $(CC) -o $(OBJ_D)/bf_null.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bf_null.c
+
+$(OBJ_D)/bf_buff.o: $(SRC_D)/crypto/bio/bf_buff.c
+        $(CC) -o $(OBJ_D)/bf_buff.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bf_buff.c
+
+$(OBJ_D)/b_print.o: $(SRC_D)/crypto/bio/b_print.c
+        $(CC) -o $(OBJ_D)/b_print.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/b_print.c
+
+$(OBJ_D)/b_dump.o: $(SRC_D)/crypto/bio/b_dump.c
+        $(CC) -o $(OBJ_D)/b_dump.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/b_dump.c
+
+$(OBJ_D)/b_sock.o: $(SRC_D)/crypto/bio/b_sock.c
+        $(CC) -o $(OBJ_D)/b_sock.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/b_sock.c
+
+$(OBJ_D)/bss_acpt.o: $(SRC_D)/crypto/bio/bss_acpt.c
+        $(CC) -o $(OBJ_D)/bss_acpt.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bss_acpt.c
+
+$(OBJ_D)/bf_nbio.o: $(SRC_D)/crypto/bio/bf_nbio.c
+        $(CC) -o $(OBJ_D)/bf_nbio.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bio/bf_nbio.c
+
+$(OBJ_D)/stack.o: $(SRC_D)/crypto/stack/stack.c
+        $(CC) -o $(OBJ_D)/stack.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/stack/stack.c
+
+$(OBJ_D)/lhash.o: $(SRC_D)/crypto/lhash/lhash.c
+        $(CC) -o $(OBJ_D)/lhash.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/lhash/lhash.c
+
+$(OBJ_D)/lh_stats.o: $(SRC_D)/crypto/lhash/lh_stats.c
+        $(CC) -o $(OBJ_D)/lh_stats.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/lhash/lh_stats.c
+
+$(OBJ_D)/md_rand.o: $(SRC_D)/crypto/rand/md_rand.c
+        $(CC) -o $(OBJ_D)/md_rand.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rand/md_rand.c
+
+$(OBJ_D)/randfile.o: $(SRC_D)/crypto/rand/randfile.c
+        $(CC) -o $(OBJ_D)/randfile.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rand/randfile.c
+
+$(OBJ_D)/err.o: $(SRC_D)/crypto/err/err.c
+        $(CC) -o $(OBJ_D)/err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/err/err.c
+
+$(OBJ_D)/err_all.o: $(SRC_D)/crypto/err/err_all.c
+        $(CC) -o $(OBJ_D)/err_all.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/err/err_all.c
+
+$(OBJ_D)/err_prn.o: $(SRC_D)/crypto/err/err_prn.c
+        $(CC) -o $(OBJ_D)/err_prn.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/err/err_prn.c
+
+$(OBJ_D)/obj_dat.o: $(SRC_D)/crypto/objects/obj_dat.c
+        $(CC) -o $(OBJ_D)/obj_dat.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/objects/obj_dat.c
+
+$(OBJ_D)/obj_lib.o: $(SRC_D)/crypto/objects/obj_lib.c
+        $(CC) -o $(OBJ_D)/obj_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/objects/obj_lib.c
+
+$(OBJ_D)/obj_err.o: $(SRC_D)/crypto/objects/obj_err.c
+        $(CC) -o $(OBJ_D)/obj_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/objects/obj_err.c
+
+$(OBJ_D)/encode.o: $(SRC_D)/crypto/evp/encode.c
+        $(CC) -o $(OBJ_D)/encode.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/encode.c
+
+$(OBJ_D)/digest.o: $(SRC_D)/crypto/evp/digest.c
+        $(CC) -o $(OBJ_D)/digest.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/digest.c
+
+$(OBJ_D)/evp_enc.o: $(SRC_D)/crypto/evp/evp_enc.c
+        $(CC) -o $(OBJ_D)/evp_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/evp_enc.c
+
+$(OBJ_D)/evp_key.o: $(SRC_D)/crypto/evp/evp_key.c
+        $(CC) -o $(OBJ_D)/evp_key.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/evp_key.c
+
+$(OBJ_D)/e_ecb_d.o: $(SRC_D)/crypto/evp/e_ecb_d.c
+        $(CC) -o $(OBJ_D)/e_ecb_d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_d.c
+
+$(OBJ_D)/e_cbc_d.o: $(SRC_D)/crypto/evp/e_cbc_d.c
+        $(CC) -o $(OBJ_D)/e_cbc_d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_d.c
+
+$(OBJ_D)/e_cfb_d.o: $(SRC_D)/crypto/evp/e_cfb_d.c
+        $(CC) -o $(OBJ_D)/e_cfb_d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_d.c
+
+$(OBJ_D)/e_ofb_d.o: $(SRC_D)/crypto/evp/e_ofb_d.c
+        $(CC) -o $(OBJ_D)/e_ofb_d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_d.c
+
+$(OBJ_D)/e_ecb_i.o: $(SRC_D)/crypto/evp/e_ecb_i.c
+        $(CC) -o $(OBJ_D)/e_ecb_i.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_i.c
+
+$(OBJ_D)/e_cbc_i.o: $(SRC_D)/crypto/evp/e_cbc_i.c
+        $(CC) -o $(OBJ_D)/e_cbc_i.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_i.c
+
+$(OBJ_D)/e_cfb_i.o: $(SRC_D)/crypto/evp/e_cfb_i.c
+        $(CC) -o $(OBJ_D)/e_cfb_i.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_i.c
+
+$(OBJ_D)/e_ofb_i.o: $(SRC_D)/crypto/evp/e_ofb_i.c
+        $(CC) -o $(OBJ_D)/e_ofb_i.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_i.c
+
+$(OBJ_D)/e_ecb_3d.o: $(SRC_D)/crypto/evp/e_ecb_3d.c
+        $(CC) -o $(OBJ_D)/e_ecb_3d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_3d.c
+
+$(OBJ_D)/e_cbc_3d.o: $(SRC_D)/crypto/evp/e_cbc_3d.c
+        $(CC) -o $(OBJ_D)/e_cbc_3d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_3d.c
+
+$(OBJ_D)/e_rc4.o: $(SRC_D)/crypto/evp/e_rc4.c
+        $(CC) -o $(OBJ_D)/e_rc4.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_rc4.c
+
+$(OBJ_D)/names.o: $(SRC_D)/crypto/evp/names.c
+        $(CC) -o $(OBJ_D)/names.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/names.c
+
+$(OBJ_D)/e_cfb_3d.o: $(SRC_D)/crypto/evp/e_cfb_3d.c
+        $(CC) -o $(OBJ_D)/e_cfb_3d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_3d.c
+
+$(OBJ_D)/e_ofb_3d.o: $(SRC_D)/crypto/evp/e_ofb_3d.c
+        $(CC) -o $(OBJ_D)/e_ofb_3d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_3d.c
+
+$(OBJ_D)/e_xcbc_d.o: $(SRC_D)/crypto/evp/e_xcbc_d.c
+        $(CC) -o $(OBJ_D)/e_xcbc_d.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_xcbc_d.c
+
+$(OBJ_D)/e_ecb_r2.o: $(SRC_D)/crypto/evp/e_ecb_r2.c
+        $(CC) -o $(OBJ_D)/e_ecb_r2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_r2.c
+
+$(OBJ_D)/e_cbc_r2.o: $(SRC_D)/crypto/evp/e_cbc_r2.c
+        $(CC) -o $(OBJ_D)/e_cbc_r2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_r2.c
+
+$(OBJ_D)/e_cfb_r2.o: $(SRC_D)/crypto/evp/e_cfb_r2.c
+        $(CC) -o $(OBJ_D)/e_cfb_r2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_r2.c
+
+$(OBJ_D)/e_ofb_r2.o: $(SRC_D)/crypto/evp/e_ofb_r2.c
+        $(CC) -o $(OBJ_D)/e_ofb_r2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_r2.c
+
+$(OBJ_D)/e_ecb_bf.o: $(SRC_D)/crypto/evp/e_ecb_bf.c
+        $(CC) -o $(OBJ_D)/e_ecb_bf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_bf.c
+
+$(OBJ_D)/e_cbc_bf.o: $(SRC_D)/crypto/evp/e_cbc_bf.c
+        $(CC) -o $(OBJ_D)/e_cbc_bf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_bf.c
+
+$(OBJ_D)/e_cfb_bf.o: $(SRC_D)/crypto/evp/e_cfb_bf.c
+        $(CC) -o $(OBJ_D)/e_cfb_bf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_bf.c
+
+$(OBJ_D)/e_ofb_bf.o: $(SRC_D)/crypto/evp/e_ofb_bf.c
+        $(CC) -o $(OBJ_D)/e_ofb_bf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_bf.c
+
+$(OBJ_D)/e_ecb_c.o: $(SRC_D)/crypto/evp/e_ecb_c.c
+        $(CC) -o $(OBJ_D)/e_ecb_c.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_c.c
+
+$(OBJ_D)/e_cbc_c.o: $(SRC_D)/crypto/evp/e_cbc_c.c
+        $(CC) -o $(OBJ_D)/e_cbc_c.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_c.c
+
+$(OBJ_D)/e_cfb_c.o: $(SRC_D)/crypto/evp/e_cfb_c.c
+        $(CC) -o $(OBJ_D)/e_cfb_c.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_c.c
+
+$(OBJ_D)/e_ofb_c.o: $(SRC_D)/crypto/evp/e_ofb_c.c
+        $(CC) -o $(OBJ_D)/e_ofb_c.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_c.c
+
+$(OBJ_D)/e_ecb_r5.o: $(SRC_D)/crypto/evp/e_ecb_r5.c
+        $(CC) -o $(OBJ_D)/e_ecb_r5.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ecb_r5.c
+
+$(OBJ_D)/e_cbc_r5.o: $(SRC_D)/crypto/evp/e_cbc_r5.c
+        $(CC) -o $(OBJ_D)/e_cbc_r5.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cbc_r5.c
+
+$(OBJ_D)/e_cfb_r5.o: $(SRC_D)/crypto/evp/e_cfb_r5.c
+        $(CC) -o $(OBJ_D)/e_cfb_r5.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_cfb_r5.c
+
+$(OBJ_D)/e_ofb_r5.o: $(SRC_D)/crypto/evp/e_ofb_r5.c
+        $(CC) -o $(OBJ_D)/e_ofb_r5.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_ofb_r5.c
+
+$(OBJ_D)/m_null.o: $(SRC_D)/crypto/evp/m_null.c
+        $(CC) -o $(OBJ_D)/m_null.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_null.c
+
+$(OBJ_D)/m_md2.o: $(SRC_D)/crypto/evp/m_md2.c
+        $(CC) -o $(OBJ_D)/m_md2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_md2.c
+
+$(OBJ_D)/m_md5.o: $(SRC_D)/crypto/evp/m_md5.c
+        $(CC) -o $(OBJ_D)/m_md5.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_md5.c
+
+$(OBJ_D)/m_sha.o: $(SRC_D)/crypto/evp/m_sha.c
+        $(CC) -o $(OBJ_D)/m_sha.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_sha.c
+
+$(OBJ_D)/m_sha1.o: $(SRC_D)/crypto/evp/m_sha1.c
+        $(CC) -o $(OBJ_D)/m_sha1.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_sha1.c
+
+$(OBJ_D)/m_dss.o: $(SRC_D)/crypto/evp/m_dss.c
+        $(CC) -o $(OBJ_D)/m_dss.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_dss.c
+
+$(OBJ_D)/m_dss1.o: $(SRC_D)/crypto/evp/m_dss1.c
+        $(CC) -o $(OBJ_D)/m_dss1.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_dss1.c
+
+$(OBJ_D)/m_mdc2.o: $(SRC_D)/crypto/evp/m_mdc2.c
+        $(CC) -o $(OBJ_D)/m_mdc2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_mdc2.c
+
+$(OBJ_D)/m_ripemd.o: $(SRC_D)/crypto/evp/m_ripemd.c
+        $(CC) -o $(OBJ_D)/m_ripemd.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/m_ripemd.c
+
+$(OBJ_D)/p_open.o: $(SRC_D)/crypto/evp/p_open.c
+        $(CC) -o $(OBJ_D)/p_open.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_open.c
+
+$(OBJ_D)/p_seal.o: $(SRC_D)/crypto/evp/p_seal.c
+        $(CC) -o $(OBJ_D)/p_seal.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_seal.c
+
+$(OBJ_D)/p_sign.o: $(SRC_D)/crypto/evp/p_sign.c
+        $(CC) -o $(OBJ_D)/p_sign.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_sign.c
+
+$(OBJ_D)/p_verify.o: $(SRC_D)/crypto/evp/p_verify.c
+        $(CC) -o $(OBJ_D)/p_verify.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_verify.c
+
+$(OBJ_D)/p_lib.o: $(SRC_D)/crypto/evp/p_lib.c
+        $(CC) -o $(OBJ_D)/p_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_lib.c
+
+$(OBJ_D)/p_enc.o: $(SRC_D)/crypto/evp/p_enc.c
+        $(CC) -o $(OBJ_D)/p_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_enc.c
+
+$(OBJ_D)/p_dec.o: $(SRC_D)/crypto/evp/p_dec.c
+        $(CC) -o $(OBJ_D)/p_dec.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/p_dec.c
+
+$(OBJ_D)/bio_md.o: $(SRC_D)/crypto/evp/bio_md.c
+        $(CC) -o $(OBJ_D)/bio_md.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/bio_md.c
+
+$(OBJ_D)/bio_b64.o: $(SRC_D)/crypto/evp/bio_b64.c
+        $(CC) -o $(OBJ_D)/bio_b64.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/bio_b64.c
+
+$(OBJ_D)/bio_enc.o: $(SRC_D)/crypto/evp/bio_enc.c
+        $(CC) -o $(OBJ_D)/bio_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/bio_enc.c
+
+$(OBJ_D)/evp_err.o: $(SRC_D)/crypto/evp/evp_err.c
+        $(CC) -o $(OBJ_D)/evp_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/evp_err.c
+
+$(OBJ_D)/e_null.o: $(SRC_D)/crypto/evp/e_null.c
+        $(CC) -o $(OBJ_D)/e_null.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/e_null.c
+
+$(OBJ_D)/c_all.o: $(SRC_D)/crypto/evp/c_all.c
+        $(CC) -o $(OBJ_D)/c_all.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/c_all.c
+
+$(OBJ_D)/evp_lib.o: $(SRC_D)/crypto/evp/evp_lib.c
+        $(CC) -o $(OBJ_D)/evp_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/evp/evp_lib.c
+
+$(OBJ_D)/pem_sign.o: $(SRC_D)/crypto/pem/pem_sign.c
+        $(CC) -o $(OBJ_D)/pem_sign.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pem/pem_sign.c
+
+$(OBJ_D)/pem_seal.o: $(SRC_D)/crypto/pem/pem_seal.c
+        $(CC) -o $(OBJ_D)/pem_seal.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pem/pem_seal.c
+
+$(OBJ_D)/pem_info.o: $(SRC_D)/crypto/pem/pem_info.c
+        $(CC) -o $(OBJ_D)/pem_info.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pem/pem_info.c
+
+$(OBJ_D)/pem_lib.o: $(SRC_D)/crypto/pem/pem_lib.c
+        $(CC) -o $(OBJ_D)/pem_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pem/pem_lib.c
+
+$(OBJ_D)/pem_all.o: $(SRC_D)/crypto/pem/pem_all.c
+        $(CC) -o $(OBJ_D)/pem_all.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pem/pem_all.c
+
+$(OBJ_D)/pem_err.o: $(SRC_D)/crypto/pem/pem_err.c
+        $(CC) -o $(OBJ_D)/pem_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pem/pem_err.c
+
+$(OBJ_D)/a_object.o: $(SRC_D)/crypto/asn1/a_object.c
+        $(CC) -o $(OBJ_D)/a_object.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_object.c
+
+$(OBJ_D)/a_bitstr.o: $(SRC_D)/crypto/asn1/a_bitstr.c
+        $(CC) -o $(OBJ_D)/a_bitstr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_bitstr.c
+
+$(OBJ_D)/a_utctm.o: $(SRC_D)/crypto/asn1/a_utctm.c
+        $(CC) -o $(OBJ_D)/a_utctm.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_utctm.c
+
+$(OBJ_D)/a_int.o: $(SRC_D)/crypto/asn1/a_int.c
+        $(CC) -o $(OBJ_D)/a_int.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_int.c
+
+$(OBJ_D)/a_octet.o: $(SRC_D)/crypto/asn1/a_octet.c
+        $(CC) -o $(OBJ_D)/a_octet.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_octet.c
+
+$(OBJ_D)/a_print.o: $(SRC_D)/crypto/asn1/a_print.c
+        $(CC) -o $(OBJ_D)/a_print.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_print.c
+
+$(OBJ_D)/a_type.o: $(SRC_D)/crypto/asn1/a_type.c
+        $(CC) -o $(OBJ_D)/a_type.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_type.c
+
+$(OBJ_D)/a_set.o: $(SRC_D)/crypto/asn1/a_set.c
+        $(CC) -o $(OBJ_D)/a_set.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_set.c
+
+$(OBJ_D)/a_dup.o: $(SRC_D)/crypto/asn1/a_dup.c
+        $(CC) -o $(OBJ_D)/a_dup.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_dup.c
+
+$(OBJ_D)/a_d2i_fp.o: $(SRC_D)/crypto/asn1/a_d2i_fp.c
+        $(CC) -o $(OBJ_D)/a_d2i_fp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_d2i_fp.c
+
+$(OBJ_D)/a_i2d_fp.o: $(SRC_D)/crypto/asn1/a_i2d_fp.c
+        $(CC) -o $(OBJ_D)/a_i2d_fp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_i2d_fp.c
+
+$(OBJ_D)/a_sign.o: $(SRC_D)/crypto/asn1/a_sign.c
+        $(CC) -o $(OBJ_D)/a_sign.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_sign.c
+
+$(OBJ_D)/a_digest.o: $(SRC_D)/crypto/asn1/a_digest.c
+        $(CC) -o $(OBJ_D)/a_digest.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_digest.c
+
+$(OBJ_D)/a_verify.o: $(SRC_D)/crypto/asn1/a_verify.c
+        $(CC) -o $(OBJ_D)/a_verify.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_verify.c
+
+$(OBJ_D)/x_algor.o: $(SRC_D)/crypto/asn1/x_algor.c
+        $(CC) -o $(OBJ_D)/x_algor.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_algor.c
+
+$(OBJ_D)/x_val.o: $(SRC_D)/crypto/asn1/x_val.c
+        $(CC) -o $(OBJ_D)/x_val.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_val.c
+
+$(OBJ_D)/x_pubkey.o: $(SRC_D)/crypto/asn1/x_pubkey.c
+        $(CC) -o $(OBJ_D)/x_pubkey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_pubkey.c
+
+$(OBJ_D)/x_sig.o: $(SRC_D)/crypto/asn1/x_sig.c
+        $(CC) -o $(OBJ_D)/x_sig.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_sig.c
+
+$(OBJ_D)/x_req.o: $(SRC_D)/crypto/asn1/x_req.c
+        $(CC) -o $(OBJ_D)/x_req.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_req.c
+
+$(OBJ_D)/x_attrib.o: $(SRC_D)/crypto/asn1/x_attrib.c
+        $(CC) -o $(OBJ_D)/x_attrib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_attrib.c
+
+$(OBJ_D)/x_name.o: $(SRC_D)/crypto/asn1/x_name.c
+        $(CC) -o $(OBJ_D)/x_name.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_name.c
+
+$(OBJ_D)/x_cinf.o: $(SRC_D)/crypto/asn1/x_cinf.c
+        $(CC) -o $(OBJ_D)/x_cinf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_cinf.c
+
+$(OBJ_D)/x_x509.o: $(SRC_D)/crypto/asn1/x_x509.c
+        $(CC) -o $(OBJ_D)/x_x509.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_x509.c
+
+$(OBJ_D)/x_crl.o: $(SRC_D)/crypto/asn1/x_crl.c
+        $(CC) -o $(OBJ_D)/x_crl.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_crl.c
+
+$(OBJ_D)/x_info.o: $(SRC_D)/crypto/asn1/x_info.c
+        $(CC) -o $(OBJ_D)/x_info.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_info.c
+
+$(OBJ_D)/x_spki.o: $(SRC_D)/crypto/asn1/x_spki.c
+        $(CC) -o $(OBJ_D)/x_spki.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_spki.c
+
+$(OBJ_D)/d2i_r_pr.o: $(SRC_D)/crypto/asn1/d2i_r_pr.c
+        $(CC) -o $(OBJ_D)/d2i_r_pr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_r_pr.c
+
+$(OBJ_D)/i2d_r_pr.o: $(SRC_D)/crypto/asn1/i2d_r_pr.c
+        $(CC) -o $(OBJ_D)/i2d_r_pr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_r_pr.c
+
+$(OBJ_D)/d2i_r_pu.o: $(SRC_D)/crypto/asn1/d2i_r_pu.c
+        $(CC) -o $(OBJ_D)/d2i_r_pu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_r_pu.c
+
+$(OBJ_D)/i2d_r_pu.o: $(SRC_D)/crypto/asn1/i2d_r_pu.c
+        $(CC) -o $(OBJ_D)/i2d_r_pu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_r_pu.c
+
+$(OBJ_D)/d2i_s_pr.o: $(SRC_D)/crypto/asn1/d2i_s_pr.c
+        $(CC) -o $(OBJ_D)/d2i_s_pr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_s_pr.c
+
+$(OBJ_D)/i2d_s_pr.o: $(SRC_D)/crypto/asn1/i2d_s_pr.c
+        $(CC) -o $(OBJ_D)/i2d_s_pr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_s_pr.c
+
+$(OBJ_D)/d2i_s_pu.o: $(SRC_D)/crypto/asn1/d2i_s_pu.c
+        $(CC) -o $(OBJ_D)/d2i_s_pu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_s_pu.c
+
+$(OBJ_D)/i2d_s_pu.o: $(SRC_D)/crypto/asn1/i2d_s_pu.c
+        $(CC) -o $(OBJ_D)/i2d_s_pu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_s_pu.c
+
+$(OBJ_D)/d2i_pu.o: $(SRC_D)/crypto/asn1/d2i_pu.c
+        $(CC) -o $(OBJ_D)/d2i_pu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_pu.c
+
+$(OBJ_D)/d2i_pr.o: $(SRC_D)/crypto/asn1/d2i_pr.c
+        $(CC) -o $(OBJ_D)/d2i_pr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_pr.c
+
+$(OBJ_D)/i2d_pu.o: $(SRC_D)/crypto/asn1/i2d_pu.c
+        $(CC) -o $(OBJ_D)/i2d_pu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_pu.c
+
+$(OBJ_D)/i2d_pr.o: $(SRC_D)/crypto/asn1/i2d_pr.c
+        $(CC) -o $(OBJ_D)/i2d_pr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_pr.c
+
+$(OBJ_D)/t_req.o: $(SRC_D)/crypto/asn1/t_req.c
+        $(CC) -o $(OBJ_D)/t_req.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/t_req.c
+
+$(OBJ_D)/t_x509.o: $(SRC_D)/crypto/asn1/t_x509.c
+        $(CC) -o $(OBJ_D)/t_x509.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/t_x509.c
+
+$(OBJ_D)/t_pkey.o: $(SRC_D)/crypto/asn1/t_pkey.c
+        $(CC) -o $(OBJ_D)/t_pkey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/t_pkey.c
+
+$(OBJ_D)/p7_i_s.o: $(SRC_D)/crypto/asn1/p7_i_s.c
+        $(CC) -o $(OBJ_D)/p7_i_s.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_i_s.c
+
+$(OBJ_D)/p7_signi.o: $(SRC_D)/crypto/asn1/p7_signi.c
+        $(CC) -o $(OBJ_D)/p7_signi.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_signi.c
+
+$(OBJ_D)/p7_signd.o: $(SRC_D)/crypto/asn1/p7_signd.c
+        $(CC) -o $(OBJ_D)/p7_signd.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_signd.c
+
+$(OBJ_D)/p7_recip.o: $(SRC_D)/crypto/asn1/p7_recip.c
+        $(CC) -o $(OBJ_D)/p7_recip.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_recip.c
+
+$(OBJ_D)/p7_enc_c.o: $(SRC_D)/crypto/asn1/p7_enc_c.c
+        $(CC) -o $(OBJ_D)/p7_enc_c.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_enc_c.c
+
+$(OBJ_D)/p7_evp.o: $(SRC_D)/crypto/asn1/p7_evp.c
+        $(CC) -o $(OBJ_D)/p7_evp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_evp.c
+
+$(OBJ_D)/p7_dgst.o: $(SRC_D)/crypto/asn1/p7_dgst.c
+        $(CC) -o $(OBJ_D)/p7_dgst.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_dgst.c
+
+$(OBJ_D)/p7_s_e.o: $(SRC_D)/crypto/asn1/p7_s_e.c
+        $(CC) -o $(OBJ_D)/p7_s_e.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_s_e.c
+
+$(OBJ_D)/p7_enc.o: $(SRC_D)/crypto/asn1/p7_enc.c
+        $(CC) -o $(OBJ_D)/p7_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_enc.c
+
+$(OBJ_D)/p7_lib.o: $(SRC_D)/crypto/asn1/p7_lib.c
+        $(CC) -o $(OBJ_D)/p7_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/p7_lib.c
+
+$(OBJ_D)/f_int.o: $(SRC_D)/crypto/asn1/f_int.c
+        $(CC) -o $(OBJ_D)/f_int.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/f_int.c
+
+$(OBJ_D)/f_string.o: $(SRC_D)/crypto/asn1/f_string.c
+        $(CC) -o $(OBJ_D)/f_string.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/f_string.c
+
+$(OBJ_D)/i2d_dhp.o: $(SRC_D)/crypto/asn1/i2d_dhp.c
+        $(CC) -o $(OBJ_D)/i2d_dhp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_dhp.c
+
+$(OBJ_D)/i2d_dsap.o: $(SRC_D)/crypto/asn1/i2d_dsap.c
+        $(CC) -o $(OBJ_D)/i2d_dsap.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/i2d_dsap.c
+
+$(OBJ_D)/d2i_dhp.o: $(SRC_D)/crypto/asn1/d2i_dhp.c
+        $(CC) -o $(OBJ_D)/d2i_dhp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_dhp.c
+
+$(OBJ_D)/d2i_dsap.o: $(SRC_D)/crypto/asn1/d2i_dsap.c
+        $(CC) -o $(OBJ_D)/d2i_dsap.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/d2i_dsap.c
+
+$(OBJ_D)/n_pkey.o: $(SRC_D)/crypto/asn1/n_pkey.c
+        $(CC) -o $(OBJ_D)/n_pkey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/n_pkey.c
+
+$(OBJ_D)/a_hdr.o: $(SRC_D)/crypto/asn1/a_hdr.c
+        $(CC) -o $(OBJ_D)/a_hdr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_hdr.c
+
+$(OBJ_D)/x_pkey.o: $(SRC_D)/crypto/asn1/x_pkey.c
+        $(CC) -o $(OBJ_D)/x_pkey.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_pkey.c
+
+$(OBJ_D)/a_bool.o: $(SRC_D)/crypto/asn1/a_bool.c
+        $(CC) -o $(OBJ_D)/a_bool.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_bool.c
+
+$(OBJ_D)/x_exten.o: $(SRC_D)/crypto/asn1/x_exten.c
+        $(CC) -o $(OBJ_D)/x_exten.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/x_exten.c
+
+$(OBJ_D)/asn1_par.o: $(SRC_D)/crypto/asn1/asn1_par.c
+        $(CC) -o $(OBJ_D)/asn1_par.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/asn1_par.c
+
+$(OBJ_D)/asn1_lib.o: $(SRC_D)/crypto/asn1/asn1_lib.c
+        $(CC) -o $(OBJ_D)/asn1_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/asn1_lib.c
+
+$(OBJ_D)/asn1_err.o: $(SRC_D)/crypto/asn1/asn1_err.c
+        $(CC) -o $(OBJ_D)/asn1_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/asn1_err.c
+
+$(OBJ_D)/a_meth.o: $(SRC_D)/crypto/asn1/a_meth.c
+        $(CC) -o $(OBJ_D)/a_meth.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_meth.c
+
+$(OBJ_D)/a_bytes.o: $(SRC_D)/crypto/asn1/a_bytes.c
+        $(CC) -o $(OBJ_D)/a_bytes.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_bytes.c
+
+$(OBJ_D)/evp_asn1.o: $(SRC_D)/crypto/asn1/evp_asn1.c
+        $(CC) -o $(OBJ_D)/evp_asn1.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/evp_asn1.c
+
+$(OBJ_D)/x509_def.o: $(SRC_D)/crypto/x509/x509_def.c
+        $(CC) -o $(OBJ_D)/x509_def.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_def.c
+
+$(OBJ_D)/x509_d2.o: $(SRC_D)/crypto/x509/x509_d2.c
+        $(CC) -o $(OBJ_D)/x509_d2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_d2.c
+
+$(OBJ_D)/x509_r2x.o: $(SRC_D)/crypto/x509/x509_r2x.c
+        $(CC) -o $(OBJ_D)/x509_r2x.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_r2x.c
+
+$(OBJ_D)/x509_cmp.o: $(SRC_D)/crypto/x509/x509_cmp.c
+        $(CC) -o $(OBJ_D)/x509_cmp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_cmp.c
+
+$(OBJ_D)/x509_obj.o: $(SRC_D)/crypto/x509/x509_obj.c
+        $(CC) -o $(OBJ_D)/x509_obj.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_obj.c
+
+$(OBJ_D)/x509_req.o: $(SRC_D)/crypto/x509/x509_req.c
+        $(CC) -o $(OBJ_D)/x509_req.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_req.c
+
+$(OBJ_D)/x509_vfy.o: $(SRC_D)/crypto/x509/x509_vfy.c
+        $(CC) -o $(OBJ_D)/x509_vfy.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_vfy.c
+
+$(OBJ_D)/x509_set.o: $(SRC_D)/crypto/x509/x509_set.c
+        $(CC) -o $(OBJ_D)/x509_set.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_set.c
+
+$(OBJ_D)/x509rset.o: $(SRC_D)/crypto/x509/x509rset.c
+        $(CC) -o $(OBJ_D)/x509rset.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509rset.c
+
+$(OBJ_D)/x509_err.o: $(SRC_D)/crypto/x509/x509_err.c
+        $(CC) -o $(OBJ_D)/x509_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_err.c
+
+$(OBJ_D)/x509name.o: $(SRC_D)/crypto/x509/x509name.c
+        $(CC) -o $(OBJ_D)/x509name.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509name.c
+
+$(OBJ_D)/x509_v3.o: $(SRC_D)/crypto/x509/x509_v3.c
+        $(CC) -o $(OBJ_D)/x509_v3.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_v3.c
+
+$(OBJ_D)/x509_ext.o: $(SRC_D)/crypto/x509/x509_ext.c
+        $(CC) -o $(OBJ_D)/x509_ext.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_ext.c
+
+$(OBJ_D)/x509pack.o: $(SRC_D)/crypto/x509/x509pack.c
+        $(CC) -o $(OBJ_D)/x509pack.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509pack.c
+
+$(OBJ_D)/x509type.o: $(SRC_D)/crypto/x509/x509type.c
+        $(CC) -o $(OBJ_D)/x509type.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509type.c
+
+$(OBJ_D)/x509_lu.o: $(SRC_D)/crypto/x509/x509_lu.c
+        $(CC) -o $(OBJ_D)/x509_lu.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_lu.c
+
+$(OBJ_D)/x_all.o: $(SRC_D)/crypto/x509/x_all.c
+        $(CC) -o $(OBJ_D)/x_all.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x_all.c
+
+$(OBJ_D)/x509_txt.o: $(SRC_D)/crypto/x509/x509_txt.c
+        $(CC) -o $(OBJ_D)/x509_txt.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/x509_txt.c
+
+$(OBJ_D)/by_file.o: $(SRC_D)/crypto/x509/by_file.c
+        $(CC) -o $(OBJ_D)/by_file.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/by_file.c
+
+$(OBJ_D)/by_dir.o: $(SRC_D)/crypto/x509/by_dir.c
+        $(CC) -o $(OBJ_D)/by_dir.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/by_dir.c
+
+$(OBJ_D)/v3_net.o: $(SRC_D)/crypto/x509/v3_net.c
+        $(CC) -o $(OBJ_D)/v3_net.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/v3_net.c
+
+$(OBJ_D)/v3_x509.o: $(SRC_D)/crypto/x509/v3_x509.c
+        $(CC) -o $(OBJ_D)/v3_x509.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/x509/v3_x509.c
+
+$(OBJ_D)/conf.o: $(SRC_D)/crypto/conf/conf.c
+        $(CC) -o $(OBJ_D)/conf.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/conf/conf.c
+
+$(OBJ_D)/conf_err.o: $(SRC_D)/crypto/conf/conf_err.c
+        $(CC) -o $(OBJ_D)/conf_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/conf/conf_err.c
+
+$(OBJ_D)/txt_db.o: $(SRC_D)/crypto/txt_db/txt_db.c
+        $(CC) -o $(OBJ_D)/txt_db.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/txt_db/txt_db.c
+
+$(OBJ_D)/pk7_lib.o: $(SRC_D)/crypto/pkcs7/pk7_lib.c
+        $(CC) -o $(OBJ_D)/pk7_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pkcs7/pk7_lib.c
+
+$(OBJ_D)/pkcs7err.o: $(SRC_D)/crypto/pkcs7/pkcs7err.c
+        $(CC) -o $(OBJ_D)/pkcs7err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pkcs7/pkcs7err.c
+
+$(OBJ_D)/pk7_doit.o: $(SRC_D)/crypto/pkcs7/pk7_doit.c
+        $(CC) -o $(OBJ_D)/pk7_doit.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pkcs7/pk7_doit.c
+
+$(OBJ_D)/s2_meth.o: $(SRC_D)/ssl/s2_meth.c
+        $(CC) -o $(OBJ_D)/s2_meth.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_meth.c
+
+$(OBJ_D)/s2_srvr.o: $(SRC_D)/ssl/s2_srvr.c
+        $(CC) -o $(OBJ_D)/s2_srvr.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_srvr.c
+
+$(OBJ_D)/s2_clnt.o: $(SRC_D)/ssl/s2_clnt.c
+        $(CC) -o $(OBJ_D)/s2_clnt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_clnt.c
+
+$(OBJ_D)/s2_lib.o: $(SRC_D)/ssl/s2_lib.c
+        $(CC) -o $(OBJ_D)/s2_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_lib.c
+
+$(OBJ_D)/s2_enc.o: $(SRC_D)/ssl/s2_enc.c
+        $(CC) -o $(OBJ_D)/s2_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_enc.c
+
+$(OBJ_D)/s2_pkt.o: $(SRC_D)/ssl/s2_pkt.c
+        $(CC) -o $(OBJ_D)/s2_pkt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_pkt.c
+
+$(OBJ_D)/s3_meth.o: $(SRC_D)/ssl/s3_meth.c
+        $(CC) -o $(OBJ_D)/s3_meth.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_meth.c
+
+$(OBJ_D)/s3_srvr.o: $(SRC_D)/ssl/s3_srvr.c
+        $(CC) -o $(OBJ_D)/s3_srvr.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_srvr.c
+
+$(OBJ_D)/s3_clnt.o: $(SRC_D)/ssl/s3_clnt.c
+        $(CC) -o $(OBJ_D)/s3_clnt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_clnt.c
+
+$(OBJ_D)/s3_lib.o: $(SRC_D)/ssl/s3_lib.c
+        $(CC) -o $(OBJ_D)/s3_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_lib.c
+
+$(OBJ_D)/s3_enc.o: $(SRC_D)/ssl/s3_enc.c
+        $(CC) -o $(OBJ_D)/s3_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_enc.c
+
+$(OBJ_D)/s3_pkt.o: $(SRC_D)/ssl/s3_pkt.c
+        $(CC) -o $(OBJ_D)/s3_pkt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_pkt.c
+
+$(OBJ_D)/s3_both.o: $(SRC_D)/ssl/s3_both.c
+        $(CC) -o $(OBJ_D)/s3_both.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s3_both.c
+
+$(OBJ_D)/s23_meth.o: $(SRC_D)/ssl/s23_meth.c
+        $(CC) -o $(OBJ_D)/s23_meth.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s23_meth.c
+
+$(OBJ_D)/s23_srvr.o: $(SRC_D)/ssl/s23_srvr.c
+        $(CC) -o $(OBJ_D)/s23_srvr.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s23_srvr.c
+
+$(OBJ_D)/s23_clnt.o: $(SRC_D)/ssl/s23_clnt.c
+        $(CC) -o $(OBJ_D)/s23_clnt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s23_clnt.c
+
+$(OBJ_D)/s23_lib.o: $(SRC_D)/ssl/s23_lib.c
+        $(CC) -o $(OBJ_D)/s23_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s23_lib.c
+
+$(OBJ_D)/s23_pkt.o: $(SRC_D)/ssl/s23_pkt.c
+        $(CC) -o $(OBJ_D)/s23_pkt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s23_pkt.c
+
+$(OBJ_D)/t1_meth.o: $(SRC_D)/ssl/t1_meth.c
+        $(CC) -o $(OBJ_D)/t1_meth.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/t1_meth.c
+
+$(OBJ_D)/t1_srvr.o: $(SRC_D)/ssl/t1_srvr.c
+        $(CC) -o $(OBJ_D)/t1_srvr.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/t1_srvr.c
+
+$(OBJ_D)/t1_clnt.o: $(SRC_D)/ssl/t1_clnt.c
+        $(CC) -o $(OBJ_D)/t1_clnt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/t1_clnt.c
+
+$(OBJ_D)/t1_lib.o: $(SRC_D)/ssl/t1_lib.c
+        $(CC) -o $(OBJ_D)/t1_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/t1_lib.c
+
+$(OBJ_D)/t1_enc.o: $(SRC_D)/ssl/t1_enc.c
+        $(CC) -o $(OBJ_D)/t1_enc.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/t1_enc.c
+
+$(OBJ_D)/ssl_lib.o: $(SRC_D)/ssl/ssl_lib.c
+        $(CC) -o $(OBJ_D)/ssl_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_lib.c
+
+$(OBJ_D)/ssl_err2.o: $(SRC_D)/ssl/ssl_err2.c
+        $(CC) -o $(OBJ_D)/ssl_err2.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_err2.c
+
+$(OBJ_D)/ssl_cert.o: $(SRC_D)/ssl/ssl_cert.c
+        $(CC) -o $(OBJ_D)/ssl_cert.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_cert.c
+
+$(OBJ_D)/ssl_sess.o: $(SRC_D)/ssl/ssl_sess.c
+        $(CC) -o $(OBJ_D)/ssl_sess.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_sess.c
+
+$(OBJ_D)/ssl_ciph.o: $(SRC_D)/ssl/ssl_ciph.c
+        $(CC) -o $(OBJ_D)/ssl_ciph.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_ciph.c
+
+$(OBJ_D)/ssl_stat.o: $(SRC_D)/ssl/ssl_stat.c
+        $(CC) -o $(OBJ_D)/ssl_stat.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_stat.c
+
+$(OBJ_D)/ssl_rsa.o: $(SRC_D)/ssl/ssl_rsa.c
+        $(CC) -o $(OBJ_D)/ssl_rsa.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_rsa.c
+
+$(OBJ_D)/ssl_asn1.o: $(SRC_D)/ssl/ssl_asn1.c
+        $(CC) -o $(OBJ_D)/ssl_asn1.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_asn1.c
+
+$(OBJ_D)/ssl_txt.o: $(SRC_D)/ssl/ssl_txt.c
+        $(CC) -o $(OBJ_D)/ssl_txt.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_txt.c
+
+$(OBJ_D)/ssl_algs.o: $(SRC_D)/ssl/ssl_algs.c
+        $(CC) -o $(OBJ_D)/ssl_algs.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_algs.c
+
+$(OBJ_D)/bio_ssl.o: $(SRC_D)/ssl/bio_ssl.c
+        $(CC) -o $(OBJ_D)/bio_ssl.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/bio_ssl.c
+
+$(OBJ_D)/ssl_err.o: $(SRC_D)/ssl/ssl_err.c
+        $(CC) -o $(OBJ_D)/ssl_err.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/ssl_err.c
+
+$(OBJ_D)/rsaref.o: $(SRC_D)/rsaref/rsaref.c
+        $(CC) -o $(OBJ_D)/rsaref.o  $(LIB_CFLAGS) -c $(SRC_D)/rsaref/rsaref.c
+
+$(OBJ_D)/rsar_err.o: $(SRC_D)/rsaref/rsar_err.c
+        $(CC) -o $(OBJ_D)/rsar_err.o  $(LIB_CFLAGS) -c $(SRC_D)/rsaref/rsar_err.c
+
+$(TEST_D)/md2test: $(OBJ_D)/md2test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/md2test $(LFLAGS) $(OBJ_D)/md2test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/md5test: $(OBJ_D)/md5test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/md5test $(LFLAGS) $(OBJ_D)/md5test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/shatest: $(OBJ_D)/shatest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/shatest $(LFLAGS) $(OBJ_D)/shatest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/sha1test: $(OBJ_D)/sha1test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/sha1test $(LFLAGS) $(OBJ_D)/sha1test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/mdc2test: $(OBJ_D)/mdc2test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/mdc2test $(LFLAGS) $(OBJ_D)/mdc2test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/hmactest: $(OBJ_D)/hmactest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/hmactest $(LFLAGS) $(OBJ_D)/hmactest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/rmdtest: $(OBJ_D)/rmdtest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/rmdtest $(LFLAGS) $(OBJ_D)/rmdtest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/destest: $(OBJ_D)/destest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/destest $(LFLAGS) $(OBJ_D)/destest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/rc2test: $(OBJ_D)/rc2test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/rc2test $(LFLAGS) $(OBJ_D)/rc2test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/rc4test: $(OBJ_D)/rc4test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/rc4test $(LFLAGS) $(OBJ_D)/rc4test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/rc5test: $(OBJ_D)/rc5test.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/rc5test $(LFLAGS) $(OBJ_D)/rc5test.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/ideatest: $(OBJ_D)/ideatest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/ideatest $(LFLAGS) $(OBJ_D)/ideatest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/bftest: $(OBJ_D)/bftest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/bftest $(LFLAGS) $(OBJ_D)/bftest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/casttest: $(OBJ_D)/casttest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/casttest $(LFLAGS) $(OBJ_D)/casttest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/bntest: $(OBJ_D)/bntest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/bntest $(LFLAGS) $(OBJ_D)/bntest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/exptest: $(OBJ_D)/exptest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/exptest $(LFLAGS) $(OBJ_D)/exptest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/dsatest: $(OBJ_D)/dsatest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/dsatest $(LFLAGS) $(OBJ_D)/dsatest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/dhtest: $(OBJ_D)/dhtest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/dhtest $(LFLAGS) $(OBJ_D)/dhtest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/randtest: $(OBJ_D)/randtest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/randtest $(LFLAGS) $(OBJ_D)/randtest.o $(L_LIBS) $(EX_LIBS)
+
+$(TEST_D)/ssltest: $(OBJ_D)/ssltest.o $(LIBS_DEP)
+        $(LINK) -o $(TEST_D)/ssltest $(LFLAGS) $(OBJ_D)/ssltest.o $(L_LIBS) $(EX_LIBS)
+
+$(LIB_D)/$(O_SSL): $(SSLOBJ)
+        $(RM) $(LIB_D)/$(O_SSL)
+        $(MKLIB) $(LIB_D)/$(O_SSL) $(SSLOBJ)
+        $(RANLIB) $(LIB_D)/$(O_SSL)
+
+$(LIB_D)/$(O_RSAGLUE): $(RSAGLUEOBJ)
+        $(RM) $(LIB_D)/$(O_RSAGLUE)
+        $(MKLIB) $(LIB_D)/$(O_RSAGLUE) $(RSAGLUEOBJ)
+        $(RANLIB) $(LIB_D)/$(O_RSAGLUE)
+
+$(LIB_D)/$(O_CRYPTO): $(CRYPTOOBJ)
+        $(RM) $(LIB_D)/$(O_CRYPTO)
+        $(MKLIB) $(LIB_D)/$(O_CRYPTO) $(CRYPTOOBJ)
+        $(RANLIB) $(LIB_D)/$(O_CRYPTO)
+
+$(BIN_D)/$(E_EXE): $(E_OBJ) $(LIBS_DEP)
+        $(LINK) -o $(BIN_D)/$(E_EXE) $(LFLAGS) $(E_OBJ) $(L_LIBS) $(EX_LIBS)
+
diff --git a/src/lib/libssl/src/ms/cipher.out b/src/lib/libssl/src/ms/cipher.out
new file mode 100644
index 0000000000..2c73bb7d1c
--- /dev/null
+++ b/src/lib/libssl/src/ms/cipher.out
@@ -0,0 +1,93 @@
+echo=off
+
+echo start testenc
+path=..\ms;%path%
+set ssleay=%1%
+set input=..\ms\testenc.bat
+set tmp1=..\ms\cipher.out
+set out1=..\ms\clear.out
+set cmp=perl ..\ms\cmp.pl
+
+call tenc.bat enc
+if errorlevel 1 goto err
+
+call tenc.bat rc4
+if errorlevel 1 goto err
+
+call tenc.bat des-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ecb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3
+if errorlevel 1 goto err
+
+call tenc.bat des-cbc
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-cbc
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-cbc
+if errorlevel 1 goto err
+
+call tenc.bat idea-ecb
+if errorlevel 1 goto err
+
+call tenc.bat idea-cfb
+if errorlevel 1 goto err
+
+call tenc.bat idea-ofb
+if errorlevel 1 goto err
+
+call tenc.bat idea-cbc
+if errorlevel 1 goto err
+
+call tenc.bat rc2-ecb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-cfb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-ofb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-cbc
+if errorlevel 1 goto err
+
+call tenc.bat bf-ecb
+if errorlevel 1 goto err
+
+call tenc.bat bf-cfb
+if errorlevel 1 goto err
+
+call tenc.bat bf-ofb
+if errorlevel 1 goto err
+
+call tenc.bat bf-cbc
+if errorlevel 1 goto err
+
+echo OK
+del %out1%
+del %tmp1%
+:err
+
diff --git a/src/lib/libssl/src/ms/clear.out b/src/lib/libssl/src/ms/clear.out
new file mode 100644
index 0000000000..2c73bb7d1c
--- /dev/null
+++ b/src/lib/libssl/src/ms/clear.out
@@ -0,0 +1,93 @@
+echo=off
+
+echo start testenc
+path=..\ms;%path%
+set ssleay=%1%
+set input=..\ms\testenc.bat
+set tmp1=..\ms\cipher.out
+set out1=..\ms\clear.out
+set cmp=perl ..\ms\cmp.pl
+
+call tenc.bat enc
+if errorlevel 1 goto err
+
+call tenc.bat rc4
+if errorlevel 1 goto err
+
+call tenc.bat des-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ecb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3
+if errorlevel 1 goto err
+
+call tenc.bat des-cbc
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-cbc
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-cbc
+if errorlevel 1 goto err
+
+call tenc.bat idea-ecb
+if errorlevel 1 goto err
+
+call tenc.bat idea-cfb
+if errorlevel 1 goto err
+
+call tenc.bat idea-ofb
+if errorlevel 1 goto err
+
+call tenc.bat idea-cbc
+if errorlevel 1 goto err
+
+call tenc.bat rc2-ecb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-cfb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-ofb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-cbc
+if errorlevel 1 goto err
+
+call tenc.bat bf-ecb
+if errorlevel 1 goto err
+
+call tenc.bat bf-cfb
+if errorlevel 1 goto err
+
+call tenc.bat bf-ofb
+if errorlevel 1 goto err
+
+call tenc.bat bf-cbc
+if errorlevel 1 goto err
+
+echo OK
+del %out1%
+del %tmp1%
+:err
+
diff --git a/src/lib/libssl/src/ms/libeay16.def b/src/lib/libssl/src/ms/libeay16.def
new file mode 100644
index 0000000000..65bbad629e
--- /dev/null
+++ b/src/lib/libssl/src/ms/libeay16.def
@@ -0,0 +1,987 @@
+;
+; Definition file for the DDL version of the LIBEAY16 library from SSLeay
+;
+
+LIBRARY         LIBEAY16
+
+DESCRIPTION     'SSLeay LIBEAY16 - eay@cryptsoft.com'
+
+CODE            PRELOAD MOVEABLE
+DATA            PRELOAD MOVEABLE SINGLE
+
+EXETYPE         WINDOWS
+
+HEAPSIZE        4096
+STACKSIZE       8192
+
+EXPORTS
+    _SSLeay                             @1
+    _SSLeay_add_all_algorithms          @508
+    _SSLeay_add_all_ciphers             @509
+    _SSLeay_add_all_digests             @510
+    _SSLeay_version                     @2
+    _ASN1_BIT_STRING_asn1_meth          @3
+    _ASN1_BIT_STRING_get_bit            @1060
+    _ASN1_BIT_STRING_set_bit            @1061
+    _ASN1_HEADER_free                   @4
+    _ASN1_HEADER_new                    @5
+    _ASN1_IA5STRING_asn1_meth           @6
+    _ASN1_INTEGER_get                   @7
+    _ASN1_INTEGER_set                   @8
+    _ASN1_INTEGER_to_BN                 @9
+    _ASN1_OBJECT_create                 @10
+    _ASN1_OBJECT_free                   @11
+    _ASN1_OBJECT_new                    @12
+    _ASN1_PRINTABLE_type                @13
+    _ASN1_STRING_cmp                    @14
+    _ASN1_STRING_dup                    @15
+    _ASN1_STRING_free                   @16
+    _ASN1_STRING_new                    @17
+    _ASN1_STRING_print                  @18
+    _ASN1_STRING_set                    @19
+    _ASN1_STRING_type_new               @20
+    _ASN1_TYPE_free                     @21
+    _ASN1_TYPE_get                      @916
+    _ASN1_TYPE_get_int_octetstring      @1076
+    _ASN1_TYPE_get_octetstring          @1077
+    _ASN1_TYPE_new                      @22
+    _ASN1_TYPE_set                      @917
+    _ASN1_TYPE_set_int_octetstring      @1078
+    _ASN1_TYPE_set_octetstring          @1079
+    _ASN1_UNIVERSALSTRING_to_string     @23
+    _ASN1_UTCTIME_check                 @24
+    _ASN1_UTCTIME_print                 @25
+    _ASN1_UTCTIME_set                   @26
+    _ASN1_UTCTIME_set_string            @1080
+    _ASN1_check_infinite_end            @27
+    _ASN1_d2i_bio                       @28
+    _ASN1_digest                        @30
+    _ASN1_dup                           @31
+    _ASN1_get_object                    @32
+    _ASN1_i2d_bio                       @33
+    _ASN1_object_size                   @35
+    _ASN1_parse                         @36
+    _ASN1_put_object                    @37
+    _ASN1_sign                          @38
+    _ASN1_verify                        @39
+    _BF_cbc_encrypt                     @40
+    _BF_cfb64_encrypt                   @41
+    _BF_decrypt                         @987
+    _BF_ecb_encrypt                     @42
+    _BF_encrypt                         @43
+    _BF_ofb64_encrypt                   @44
+    _BF_options                         @45
+    _BF_set_key                         @46
+    _BIO_accept                         @51
+    _BIO_copy_next_retry                @955
+    _BIO_ctrl                           @52
+    _BIO_debug_callback                 @54
+    _BIO_dump                           @55
+    _BIO_dup_chain                      @56
+    _BIO_f_base64                       @57
+    _BIO_f_buffer                       @58
+    _BIO_f_cipher                       @59
+    _BIO_f_md                           @60
+    _BIO_f_nbio_test                    @915
+    _BIO_f_null                         @61
+    _BIO_fd_non_fatal_error             @63
+    _BIO_fd_should_retry                @64
+    _BIO_find_type                      @65
+    _BIO_free                           @66
+    _BIO_free_all                       @67
+    _BIO_get_accept_socket              @69
+    _BIO_get_host_ip                    @71
+    _BIO_get_port                       @72
+    _BIO_get_retry_BIO                  @73
+    _BIO_get_retry_reason               @74
+    _BIO_gethostbyname                  @75
+    _BIO_gets                           @76
+    _BIO_ghbn_ctrl                      @1003
+    _BIO_int_ctrl                       @53
+    _BIO_new                            @78
+    _BIO_new_accept                     @79
+    _BIO_new_connect                    @80
+    _BIO_new_fd                         @81
+    _BIO_new_socket                     @84
+    _BIO_pop                            @85
+    _BIO_printf                         @86
+    _BIO_ptr_ctrl                       @969
+    _BIO_push                           @87
+    _BIO_puts                           @88
+    _BIO_read                           @89
+    _BIO_s_accept                       @90
+    _BIO_s_connect                      @91
+    _BIO_s_fd                           @92
+    _BIO_s_mem                          @95
+    _BIO_s_null                         @96
+    _BIO_s_socket                       @98
+    _BIO_set                            @100
+    _BIO_set_cipher                     @101
+    _BIO_set_tcp_ndelay                 @102
+    _BIO_sock_cleanup                   @103
+    _BIO_sock_error                     @104
+    _BIO_sock_init                      @105
+    _BIO_sock_non_fatal_error           @106
+    _BIO_sock_should_retry              @107
+    _BIO_socket_ioctl                   @108
+    _BIO_write                          @109
+    _BN_BLINDING_convert                @973
+    _BN_BLINDING_free                   @981
+    _BN_BLINDING_invert                 @974
+    _BN_BLINDING_new                    @980
+    _BN_BLINDING_update                 @975
+    _BN_CTX_free                        @110
+    _BN_CTX_new                         @111
+    _BN_MONT_CTX_free                   @112
+    _BN_MONT_CTX_new                    @113
+    _BN_MONT_CTX_set                    @114
+    _BN_add                             @115
+    _BN_add_word                        @116
+    _BN_bin2bn                          @118
+    _BN_bn2bin                          @120
+    _BN_bn2dec                          @1002
+    _BN_bn2hex                          @119
+    _BN_bn2mpi                          @1058
+    _BN_clear                           @121
+    _BN_clear_bit                       @122
+    _BN_clear_free                      @123
+    _BN_cmp                             @124
+    _BN_copy                            @125
+    _BN_dec2bn                          @1001
+    _BN_div                             @126
+    _BN_div_word                        @127
+    _BN_dup                             @128
+    _BN_exp                             @998
+    _BN_free                            @129
+    _BN_from_montgomery                 @130
+    _BN_gcd                             @131
+    _BN_generate_prime                  @132
+    _BN_get_word                        @133
+    _BN_hex2bn                          @117
+    _BN_is_bit_set                      @134
+    _BN_is_prime                        @135
+    _BN_lshift                          @136
+    _BN_lshift1                         @137
+    _BN_mask_bits                       @138
+    _BN_mod                             @139
+    _BN_mod_exp                         @140
+    _BN_mod_exp_mont                    @141
+    _BN_mod_exp_recp                    @142
+    _BN_mod_exp_simple                  @143
+    _BN_mod_inverse                     @144
+    _BN_mod_mul                         @145
+    _BN_mod_mul_montgomery              @146
+    _BN_mod_mul_reciprocal              @147
+    _BN_mod_word                        @148
+    _BN_mpi2bn                          @1059
+    _BN_mul                             @149
+    _BN_mul_word                        @999
+    _BN_new                             @150
+    _BN_num_bits                        @151
+    _BN_num_bits_word                   @152
+    _BN_options                         @153
+    _BN_print                           @154
+    _BN_rand                            @156
+    _BN_reciprocal                      @157
+    _BN_rshift                          @158
+    _BN_rshift1                         @159
+    _BN_set_bit                         @160
+    _BN_set_word                        @161
+    _BN_sqr                             @162
+    _BN_sub                             @163
+    _BN_sub_word                        @1000
+    _BN_to_ASN1_INTEGER                 @164
+    _BN_ucmp                            @165
+    _BN_value_one                       @166
+    _BUF_MEM_free                       @167
+    _BUF_MEM_grow                       @168
+    _BUF_MEM_new                        @169
+    _BUF_strdup                         @170
+    _CAST_cbc_encrypt                   @992
+    _CAST_cfb64_encrypt                 @993
+    _CAST_decrypt                       @990
+    _CAST_ecb_encrypt                   @991
+    _CAST_encrypt                       @989
+    _CAST_ofb64_encrypt                 @994
+    _CAST_set_key                       @988
+    _CONF_free                          @171
+    _CONF_get_number                    @172
+    _CONF_get_section                   @173
+    _CONF_get_string                    @174
+    _CONF_load                          @175
+    _CRYPTO_add_lock                    @176
+    _CRYPTO_dbg_free                    @177
+    _CRYPTO_dbg_malloc                  @178
+    _CRYPTO_dbg_realloc                 @179
+    _CRYPTO_dbg_remalloc                @180
+    _CRYPTO_dup_ex_data                 @1025
+    _CRYPTO_free                        @181
+    _CRYPTO_free_ex_data                @1004
+    _CRYPTO_get_add_lock_callback       @182
+    _CRYPTO_get_ex_data                 @1005
+    _CRYPTO_get_ex_new_index            @1041
+    _CRYPTO_get_id_callback             @183
+    _CRYPTO_get_lock_name               @184
+    _CRYPTO_get_locking_callback        @185
+    _CRYPTO_get_mem_functions           @186
+    _CRYPTO_get_new_lockid              @1026
+    _CRYPTO_lock                        @187
+    _CRYPTO_malloc                      @188
+    _CRYPTO_mem_ctrl                    @189
+    _CRYPTO_mem_leaks                   @190
+    _CRYPTO_mem_leaks_cb                @191
+    _CRYPTO_new_ex_data                 @1027
+    _CRYPTO_realloc                     @193
+    _CRYPTO_remalloc                    @194
+    _CRYPTO_set_add_lock_callback       @195
+    _CRYPTO_set_ex_data                 @1007
+    _CRYPTO_set_id_callback             @196
+    _CRYPTO_set_locking_callback        @197
+    _CRYPTO_set_mem_functions           @198
+    _CRYPTO_thread_id                   @199
+    _DH_check                           @200
+    _DH_compute_key                     @201
+    _DH_free                            @202
+    _DH_generate_key                    @203
+    _DH_generate_parameters             @204
+    _DH_new                             @205
+    _DH_size                            @206
+    _DHparams_print                     @207
+    _DSA_free                           @209
+    _DSA_generate_key                   @210
+    _DSA_generate_parameters            @211
+    _DSA_is_prime                       @212
+    _DSA_new                            @213
+    _DSA_print                          @214
+    _DSA_sign                           @216
+    _DSA_sign_setup                     @217
+    _DSA_size                           @218
+    _DSA_verify                         @219
+    _DSAparams_print                    @220
+    _ERR_add_error_data                 @1081
+    _ERR_clear_error                    @222
+    _ERR_error_string                   @223
+    _ERR_free_strings                   @224
+    _ERR_func_error_string              @225
+    _ERR_get_err_state_table            @226
+    _ERR_get_error                      @227
+    _ERR_get_error_line                 @228
+    _ERR_get_next_error_library         @966
+    _ERR_get_state                      @229
+    _ERR_get_string_table               @230
+    _ERR_lib_error_string               @231
+    _ERR_load_ASN1_strings              @232
+    _ERR_load_BIO_strings               @233
+    _ERR_load_BN_strings                @234
+    _ERR_load_BUF_strings               @235
+    _ERR_load_CONF_strings              @236
+    _ERR_load_CRYPTOlib_strings         @1009
+    _ERR_load_DH_strings                @237
+    _ERR_load_DSA_strings               @238
+    _ERR_load_ERR_strings               @239
+    _ERR_load_EVP_strings               @240
+    _ERR_load_OBJ_strings               @241
+    _ERR_load_PEM_strings               @242
+    _ERR_load_PKCS7_strings             @919
+    _ERR_load_RSA_strings               @244
+    _ERR_load_X509_strings              @245
+    _ERR_load_crypto_strings            @246
+    _ERR_load_strings                   @247
+    _ERR_peek_error                     @248
+    _ERR_peek_error_line                @249
+    _ERR_print_errors                   @250
+    _ERR_put_error                      @252
+    _ERR_reason_error_string            @253
+    _ERR_remove_state                   @254
+    _ERR_set_error_data                 @1082
+    _EVP_BytesToKey                     @255
+    _EVP_CIPHER_CTX_cleanup             @256
+    _EVP_CIPHER_CTX_init                @961
+    _EVP_CIPHER_asn1_to_param           @1083
+    _EVP_CIPHER_get_asn1_iv             @1085
+    _EVP_CIPHER_param_to_asn1           @1084
+    _EVP_CIPHER_set_asn1_iv             @1086
+    _EVP_CipherFinal                    @257
+    _EVP_CipherInit                     @258
+    _EVP_CipherUpdate                   @259
+    _EVP_DecodeBlock                    @260
+    _EVP_DecodeFinal                    @261
+    _EVP_DecodeInit                     @262
+    _EVP_DecodeUpdate                   @263
+    _EVP_DecryptFinal                   @264
+    _EVP_DecryptInit                    @265
+    _EVP_DecryptUpdate                  @266
+    _EVP_DigestFinal                    @267
+    _EVP_DigestInit                     @268
+    _EVP_DigestUpdate                   @269
+    _EVP_EncodeBlock                    @270
+    _EVP_EncodeFinal                    @271
+    _EVP_EncodeInit                     @272
+    _EVP_EncodeUpdate                   @273
+    _EVP_EncryptFinal                   @274
+    _EVP_EncryptInit                    @275
+    _EVP_EncryptUpdate                  @276
+    _EVP_OpenFinal                      @277
+    _EVP_OpenInit                       @278
+    _EVP_PKEY_assign                    @279
+    _EVP_PKEY_bits                      @1010
+    _EVP_PKEY_cmp_parameters            @967
+    _EVP_PKEY_copy_parameters           @280
+    _EVP_PKEY_decrypt                   @1070
+    _EVP_PKEY_encrypt                   @1071
+    _EVP_PKEY_free                      @281
+    _EVP_PKEY_missing_parameters        @282
+    _EVP_PKEY_new                       @283
+    _EVP_PKEY_save_parameters           @284
+    _EVP_PKEY_size                      @285
+    _EVP_PKEY_type                      @286
+    _EVP_SealFinal                      @287
+    _EVP_SealInit                       @288
+    _EVP_SignFinal                      @289
+    _EVP_VerifyFinal                    @290
+    _EVP_add_alias                      @291
+    _EVP_add_cipher                     @292
+    _EVP_add_digest                     @293
+    _EVP_bf_cbc                         @294
+    _EVP_bf_cfb                         @295
+    _EVP_bf_ecb                         @296
+    _EVP_bf_ofb                         @297
+    _EVP_cast5_cbc                      @983
+    _EVP_cast5_cfb                      @984
+    _EVP_cast5_ecb                      @985
+    _EVP_cast5_ofb                      @986
+    _EVP_cleanup                        @298
+    _EVP_delete_alias                   @941
+    _EVP_des_cbc                        @299
+    _EVP_des_cfb                        @300
+    _EVP_des_ecb                        @301
+    _EVP_des_ede                        @302
+    _EVP_des_ede3                       @303
+    _EVP_des_ede3_cbc                   @304
+    _EVP_des_ede3_cfb                   @305
+    _EVP_des_ede3_ofb                   @306
+    _EVP_des_ede_cbc                    @307
+    _EVP_des_ede_cfb                    @308
+    _EVP_des_ede_ofb                    @309
+    _EVP_des_ofb                        @310
+    _EVP_desx_cbc                       @311
+    _EVP_dss                            @312
+    _EVP_dss1                           @313
+    _EVP_enc_null                       @314
+    _EVP_get_cipherbyname               @315
+    _EVP_get_digestbyname               @316
+    _EVP_get_pw_prompt                  @317
+    _EVP_idea_cbc                       @318
+    _EVP_idea_cfb                       @319
+    _EVP_idea_ecb                       @320
+    _EVP_idea_ofb                       @321
+    _EVP_md2                            @322
+    _EVP_md5                            @323
+    _EVP_md_null                        @324
+    _EVP_mdc2                           @942
+    _EVP_rc2_40_cbc                     @959
+    _EVP_rc2_cbc                        @325
+    _EVP_rc2_cfb                        @326
+    _EVP_rc2_ecb                        @327
+    _EVP_rc2_ofb                        @328
+    _EVP_rc4                            @329
+    _EVP_rc4_40                         @960
+    _EVP_rc5_32_12_16_cbc               @1087
+    _EVP_rc5_32_12_16_cfb               @1088
+    _EVP_rc5_32_12_16_ecb               @1089
+    _EVP_rc5_32_12_16_ofb               @1090
+    _EVP_read_pw_string                 @330
+    _EVP_set_pw_prompt                  @331
+    _EVP_sha                            @332
+    _EVP_sha1                           @333
+    _HMAC                               @962
+    _HMAC_Final                         @965
+    _HMAC_Init                          @963
+    _HMAC_Update                        @964
+    _HMAC_cleanup                       @968
+    _MD2                                @334
+    _MD2_Final                          @335
+    _MD2_Init                           @336
+    _MD2_Update                         @337
+    _MD2_options                        @338
+    _MD5                                @339
+    _MD5_Final                          @340
+    _MD5_Init                           @341
+    _MD5_Transform                      @1011
+    _MD5_Update                         @342
+    _MDC2                               @343
+    _MDC2_Final                         @344
+    _MDC2_Init                          @345
+    _MDC2_Update                        @346
+    _NETSCAPE_SPKAC_free                @347
+    _NETSCAPE_SPKAC_new                 @348
+    _NETSCAPE_SPKI_free                 @349
+    _NETSCAPE_SPKI_new                  @350
+    _NETSCAPE_SPKI_sign                 @351
+    _NETSCAPE_SPKI_verify               @352
+    _OBJ_add_object                     @353
+    _OBJ_bsearch                        @354
+    _OBJ_cleanup                        @355
+    _OBJ_cmp                            @356
+    _OBJ_create                         @357
+    _OBJ_create_objects                 @997
+    _OBJ_dup                            @358
+    _OBJ_ln2nid                         @359
+    _OBJ_new_nid                        @360
+    _OBJ_nid2ln                         @361
+    _OBJ_nid2obj                        @362
+    _OBJ_nid2sn                         @363
+    _OBJ_obj2nid                        @364
+    _OBJ_sn2nid                         @365
+    _OBJ_txt2nid                        @366
+    _PEM_ASN1_read_bio                  @368
+    _PEM_ASN1_write_bio                 @370
+    _PEM_SealFinal                      @371
+    _PEM_SealInit                       @372
+    _PEM_SealUpdate                     @373
+    _PEM_SignFinal                      @374
+    _PEM_X509_INFO_read_bio             @378
+    _PEM_X509_INFO_write_bio            @379
+    _PEM_dek_info                       @380
+    _PEM_do_header                      @381
+    _PEM_get_EVP_CIPHER_INFO            @382
+    _PEM_proc_type                      @383
+    _PEM_read_bio                       @394
+    _PEM_read_bio_DHparams              @395
+    _PEM_read_bio_DSAPrivateKey         @396
+    _PEM_read_bio_DSAparams             @397
+    _PEM_read_bio_PKCS7                 @398
+    _PEM_read_bio_PrivateKey            @399
+    _PEM_read_bio_RSAPrivateKey         @400
+    _PEM_read_bio_RSAPublicKey          @943
+    _PEM_read_bio_X509                  @401
+    _PEM_read_bio_X509_CRL              @402
+    _PEM_read_bio_X509_REQ              @403
+    _PEM_write_bio                      @414
+    _PEM_write_bio_DHparams             @415
+    _PEM_write_bio_DSAPrivateKey        @416
+    _PEM_write_bio_DSAparams            @417
+    _PEM_write_bio_PKCS7                @418
+    _PEM_write_bio_PrivateKey           @419
+    _PEM_write_bio_RSAPrivateKey        @420
+    _PEM_write_bio_RSAPublicKey         @944
+    _PEM_write_bio_X509                 @421
+    _PEM_write_bio_X509_CRL             @422
+    _PEM_write_bio_X509_REQ             @423
+    _PKCS7_DIGEST_free                  @424
+    _PKCS7_DIGEST_new                   @425
+    _PKCS7_ENCRYPT_free                 @426
+    _PKCS7_ENCRYPT_new                  @427
+    _PKCS7_ENC_CONTENT_free             @428
+    _PKCS7_ENC_CONTENT_new              @429
+    _PKCS7_ENVELOPE_free                @430
+    _PKCS7_ENVELOPE_new                 @431
+    _PKCS7_ISSUER_AND_SERIAL_digest     @432
+    _PKCS7_ISSUER_AND_SERIAL_free       @433
+    _PKCS7_ISSUER_AND_SERIAL_new        @434
+    _PKCS7_RECIP_INFO_free              @435
+    _PKCS7_RECIP_INFO_new               @436
+    _PKCS7_RECIP_INFO_set               @1072
+    _PKCS7_SIGNED_free                  @437
+    _PKCS7_SIGNED_new                   @438
+    _PKCS7_SIGNER_INFO_free             @439
+    _PKCS7_SIGNER_INFO_new              @440
+    _PKCS7_SIGNER_INFO_set              @930
+    _PKCS7_SIGN_ENVELOPE_free           @441
+    _PKCS7_SIGN_ENVELOPE_new            @442
+    _PKCS7_add_certificate              @932
+    _PKCS7_add_crl                      @933
+    _PKCS7_add_recipient                @1073
+    _PKCS7_add_recipient_info           @1074
+    _PKCS7_add_signature                @938
+    _PKCS7_add_signer                   @931
+    _PKCS7_cert_from_signer_info        @939
+    _PKCS7_content_free                 @918
+    _PKCS7_content_new                  @934
+    _PKCS7_ctrl                         @927
+    _PKCS7_dataInit                     @937
+    _PKCS7_dataSign                     @935
+    _PKCS7_dataVerify                   @936
+    _PKCS7_dup                          @443
+    _PKCS7_free                         @444
+    _PKCS7_get_signer_info              @940
+    _PKCS7_new                          @445
+    _PKCS7_set_cipher                   @1075
+    _PKCS7_set_content                  @929
+    _PKCS7_set_type                     @928
+    _RAND_bytes                         @464
+    _RAND_cleanup                       @465
+    _RAND_file_name                     @466
+    _RAND_load_file                     @467
+    _RAND_screen                        @468
+    _RAND_seed                          @469
+    _RAND_write_file                    @470
+    _RC2_cbc_encrypt                    @471
+    _RC2_cfb64_encrypt                  @472
+    _RC2_decrypt                        @995
+    _RC2_ecb_encrypt                    @473
+    _RC2_encrypt                        @474
+    _RC2_ofb64_encrypt                  @475
+    _RC2_set_key                        @476
+    _RC4                                @477
+    _RC4_options                        @478
+    _RC4_set_key                        @479
+    _RC5_32_cbc_encrypt                 @1051
+    _RC5_32_cfb64_encrypt               @1052
+    _RC5_32_decrypt                     @1050
+    _RC5_32_ecb_encrypt                 @1048
+    _RC5_32_encrypt                     @1049
+    _RC5_32_ofb64_encrypt               @1053
+    _RC5_32_set_key                     @1047
+    _RIPEMD160                          @1045
+    _RIPEMD160_Final                    @1044
+    _RIPEMD160_Init                     @1042
+    _RIPEMD160_Transform                @1046
+    _RIPEMD160_Update                   @1043
+    _RSAPrivateKey_asn1_meth            @480
+    _RSAPrivateKey_dup                  @481
+    _RSAPublicKey_dup                   @482
+    _RSA_PKCS1_SSLeay                   @483
+    _RSA_blinding_off                   @978
+    _RSA_blinding_on                    @977
+    _RSA_flags                          @956
+    _RSA_free                           @484
+    _RSA_generate_key                   @485
+    _RSA_get_ex_data                    @1029
+    _RSA_get_ex_new_index               @1030
+    _RSA_new                            @486
+    _RSA_new_method                     @487
+    _RSA_padding_add_PKCS1_type_1       @1031
+    _RSA_padding_add_PKCS1_type_2       @1032
+    _RSA_padding_add_SSLv23             @1033
+    _RSA_padding_add_none               @1034
+    _RSA_padding_check_PKCS1_type_1     @1035
+    _RSA_padding_check_PKCS1_type_2     @1036
+    _RSA_padding_check_SSLv23           @1037
+    _RSA_padding_check_none             @1038
+    _RSA_print                          @488
+    _RSA_private_decrypt                @490
+    _RSA_private_encrypt                @491
+    _RSA_public_decrypt                 @492
+    _RSA_public_encrypt                 @493
+    _RSA_set_default_method             @494
+    _RSA_set_ex_data                    @1028
+    _RSA_sign                           @495
+    _RSA_sign_ASN1_OCTET_STRING         @496
+    _RSA_size                           @497
+    _RSA_verify                         @498
+    _RSA_verify_ASN1_OCTET_STRING       @499
+    _SHA                                @500
+    _SHA1                               @501
+    _SHA1_Final                         @502
+    _SHA1_Init                          @503
+    _SHA1_Transform                     @1012
+    _SHA1_Update                        @504
+    _SHA_Final                          @505
+    _SHA_Init                           @506
+    _SHA_Transform                      @1013
+    _SHA_Update                         @507
+    _TXT_DB_create_index                @511
+    _TXT_DB_free                        @512
+    _TXT_DB_get_by_index                @513
+    _TXT_DB_insert                      @514
+    _TXT_DB_read                        @515
+    _TXT_DB_write                       @516
+    _X509_ALGOR_free                    @517
+    _X509_ALGOR_new                     @518
+    _X509_ATTRIBUTE_free                @519
+    _X509_ATTRIBUTE_new                 @520
+    _X509_CINF_free                     @521
+    _X509_CINF_new                      @522
+    _X509_CRL_INFO_free                 @523
+    _X509_CRL_INFO_new                  @524
+    _X509_CRL_add_ext                   @525
+    _X509_CRL_cmp                       @526
+    _X509_CRL_delete_ext                @527
+    _X509_CRL_dup                       @528
+    _X509_CRL_free                      @529
+    _X509_CRL_get_ext                   @530
+    _X509_CRL_get_ext_by_NID            @531
+    _X509_CRL_get_ext_by_OBJ            @532
+    _X509_CRL_get_ext_by_critical       @533
+    _X509_CRL_get_ext_count             @534
+    _X509_CRL_new                       @535
+    _X509_CRL_sign                      @536
+    _X509_CRL_verify                    @537
+    _X509_EXTENSION_create_by_NID       @538
+    _X509_EXTENSION_create_by_OBJ       @539
+    _X509_EXTENSION_dup                 @540
+    _X509_EXTENSION_free                @541
+    _X509_EXTENSION_get_critical        @542
+    _X509_EXTENSION_get_data            @543
+    _X509_EXTENSION_get_object          @544
+    _X509_EXTENSION_new                 @545
+    _X509_EXTENSION_set_critical        @546
+    _X509_EXTENSION_set_data            @547
+    _X509_EXTENSION_set_object          @548
+    _X509_INFO_free                     @549
+    _X509_INFO_new                      @550
+    _X509_LOOKUP_by_alias               @551
+    _X509_LOOKUP_by_fingerprint         @552
+    _X509_LOOKUP_by_issuer_serial       @553
+    _X509_LOOKUP_by_subject             @554
+    _X509_LOOKUP_ctrl                   @555
+    _X509_LOOKUP_file                   @556
+    _X509_LOOKUP_free                   @557
+    _X509_LOOKUP_hash_dir               @558
+    _X509_LOOKUP_init                   @559
+    _X509_LOOKUP_new                    @560
+    _X509_LOOKUP_shutdown               @561
+    _X509_NAME_ENTRY_create_by_NID      @562
+    _X509_NAME_ENTRY_create_by_OBJ      @563
+    _X509_NAME_ENTRY_dup                @564
+    _X509_NAME_ENTRY_free               @565
+    _X509_NAME_ENTRY_get_data           @566
+    _X509_NAME_ENTRY_get_object         @567
+    _X509_NAME_ENTRY_new                @568
+    _X509_NAME_ENTRY_set_data           @569
+    _X509_NAME_ENTRY_set_object         @570
+    _X509_NAME_add_entry                @571
+    _X509_NAME_cmp                      @572
+    _X509_NAME_delete_entry             @573
+    _X509_NAME_digest                   @574
+    _X509_NAME_dup                      @575
+    _X509_NAME_entry_count              @576
+    _X509_NAME_free                     @577
+    _X509_NAME_get_entry                @578
+    _X509_NAME_get_index_by_NID         @579
+    _X509_NAME_get_index_by_OBJ         @580
+    _X509_NAME_get_text_by_NID          @581
+    _X509_NAME_get_text_by_OBJ          @582
+    _X509_NAME_hash                     @583
+    _X509_NAME_new                      @584
+    _X509_NAME_oneline                  @585
+    _X509_NAME_print                    @586
+    _X509_NAME_set                      @587
+    _X509_OBJECT_free_contents          @588
+    _X509_OBJECT_retrive_by_subject     @589
+    _X509_OBJECT_up_ref_count           @590
+    _X509_PKEY_free                     @591
+    _X509_PKEY_new                      @592
+    _X509_PUBKEY_free                   @593
+    _X509_PUBKEY_get                    @594
+    _X509_PUBKEY_new                    @595
+    _X509_PUBKEY_set                    @596
+    _X509_REQ_INFO_free                 @597
+    _X509_REQ_INFO_new                  @598
+    _X509_REQ_dup                       @599
+    _X509_REQ_free                      @600
+    _X509_REQ_get_pubkey                @601
+    _X509_REQ_new                       @602
+    _X509_REQ_print                     @603
+    _X509_REQ_set_pubkey                @605
+    _X509_REQ_set_subject_name          @606
+    _X509_REQ_set_version               @607
+    _X509_REQ_sign                      @608
+    _X509_REQ_to_X509                   @609
+    _X509_REQ_verify                    @610
+    _X509_REVOKED_add_ext               @611
+    _X509_REVOKED_delete_ext            @612
+    _X509_REVOKED_free                  @613
+    _X509_REVOKED_get_ext               @614
+    _X509_REVOKED_get_ext_by_NID        @615
+    _X509_REVOKED_get_ext_by_OBJ        @616
+    _X509_REVOKED_get_ext_by_critical   @617
+    _X509_REVOKED_get_ext_count         @618
+    _X509_REVOKED_new                   @619
+    _X509_SIG_free                      @620
+    _X509_SIG_new                       @621
+    _X509_STORE_CTX_cleanup             @622
+    _X509_STORE_CTX_get_chain           @1014
+    _X509_STORE_CTX_get_current_cert    @1015
+    _X509_STORE_CTX_get_error           @1016
+    _X509_STORE_CTX_get_error_depth     @1017
+    _X509_STORE_CTX_get_ex_data         @1018
+    _X509_STORE_CTX_init                @623
+    _X509_STORE_CTX_set_cert            @1020
+    _X509_STORE_CTX_set_chain           @1021
+    _X509_STORE_CTX_set_error           @1022
+    _X509_STORE_CTX_set_ex_data         @1023
+    _X509_STORE_add_cert                @624
+    _X509_STORE_add_crl                 @957
+    _X509_STORE_add_lookup              @625
+    _X509_STORE_free                    @626
+    _X509_STORE_get_by_subject          @627
+    _X509_STORE_load_locations          @628
+    _X509_STORE_new                     @629
+    _X509_STORE_set_default_paths       @630
+    _X509_VAL_free                      @631
+    _X509_VAL_new                       @632
+    _X509_add_ext                       @633
+    _X509_asn1_meth                     @634
+    _X509_certificate_type              @635
+    _X509_check_private_key             @636
+    _X509_cmp_current_time              @637
+    _X509_delete_ext                    @638
+    _X509_digest                        @639
+    _X509_dup                           @640
+    _X509_find_by_issuer_and_serial     @920
+    _X509_find_by_subject               @921
+    _X509_free                          @641
+    _X509_get_default_cert_area         @642
+    _X509_get_default_cert_dir          @643
+    _X509_get_default_cert_dir_env      @644
+    _X509_get_default_cert_file         @645
+    _X509_get_default_cert_file_env     @646
+    _X509_get_default_private_dir       @647
+    _X509_get_ext                       @648
+    _X509_get_ext_by_NID                @649
+    _X509_get_ext_by_OBJ                @650
+    _X509_get_ext_by_critical           @651
+    _X509_get_ext_count                 @652
+    _X509_get_issuer_name               @653
+    _X509_get_pubkey                    @654
+    _X509_get_pubkey_parameters         @655
+    _X509_get_serialNumber              @656
+    _X509_get_subject_name              @657
+    _X509_gmtime_adj                    @658
+    _X509_issuer_and_serial_cmp         @659
+    _X509_issuer_and_serial_hash        @660
+    _X509_issuer_name_cmp               @661
+    _X509_issuer_name_hash              @662
+    _X509_load_cert_file                @663
+    _X509_load_crl_file                 @958
+    _X509_new                           @664
+    _X509_print                         @665
+    _X509_set_issuer_name               @667
+    _X509_set_notAfter                  @668
+    _X509_set_notBefore                 @669
+    _X509_set_pubkey                    @670
+    _X509_set_serialNumber              @671
+    _X509_set_subject_name              @672
+    _X509_set_version                   @673
+    _X509_sign                          @674
+    _X509_subject_name_cmp              @675
+    _X509_subject_name_hash             @676
+    _X509_to_X509_REQ                   @677
+    _X509_verify                        @678
+    _X509_verify_cert                   @679
+    _X509_verify_cert_error_string      @680
+    _X509v3_add_ext                     @681
+    _X509v3_add_extension               @682
+    _X509v3_add_netscape_extensions     @683
+    _X509v3_add_standard_extensions     @684
+    _X509v3_cleanup_extensions          @685
+    _X509v3_data_type_by_NID            @686
+    _X509v3_data_type_by_OBJ            @687
+    _X509v3_delete_ext                  @688
+    _X509v3_get_ext                     @689
+    _X509v3_get_ext_by_NID              @690
+    _X509v3_get_ext_by_OBJ              @691
+    _X509v3_get_ext_by_critical         @692
+    _X509v3_get_ext_count               @693
+    _X509v3_pack_string                 @694
+    _X509v3_pack_type_by_NID            @695
+    _X509v3_pack_type_by_OBJ            @696
+    _X509v3_unpack_string               @697
+    _a2d_ASN1_OBJECT                    @699
+    _a2i_ASN1_INTEGER                   @700
+    _a2i_ASN1_STRING                    @701
+    _asn1_Finish                        @702
+    _asn1_GetSequence                   @703
+    _asn1_add_error                     @1091
+    _bn_add_words                       @1039
+    _bn_div64                           @704
+    _bn_expand2                         @705
+    _bn_mul_add_words                   @706
+    _bn_mul_words                       @707
+    _bn_qadd                            @708
+    _bn_qsub                            @709
+    _bn_sqr_words                       @710
+    _crypt                              @711
+    _d2i_ASN1_BIT_STRING                @712
+    _d2i_ASN1_BOOLEAN                   @713
+    _d2i_ASN1_HEADER                    @714
+    _d2i_ASN1_IA5STRING                 @715
+    _d2i_ASN1_INTEGER                   @716
+    _d2i_ASN1_OBJECT                    @717
+    _d2i_ASN1_OCTET_STRING              @718
+    _d2i_ASN1_PRINTABLE                 @719
+    _d2i_ASN1_PRINTABLESTRING           @720
+    _d2i_ASN1_SET                       @721
+    _d2i_ASN1_T61STRING                 @722
+    _d2i_ASN1_TYPE                      @723
+    _d2i_ASN1_UTCTIME                   @724
+    _d2i_ASN1_bytes                     @725
+    _d2i_ASN1_type_bytes                @726
+    _d2i_DHparams                       @727
+    _d2i_DSAPrivateKey                  @728
+    _d2i_DSAPrivateKey_bio              @729
+    _d2i_DSAPublicKey                   @731
+    _d2i_DSAparams                      @732
+    _d2i_NETSCAPE_SPKAC                 @733
+    _d2i_NETSCAPE_SPKI                  @734
+    _d2i_Netscape_RSA                   @735
+    _d2i_Netscape_RSA_2                 @1040
+    _d2i_PKCS7                          @736
+    _d2i_PKCS7_DIGEST                   @737
+    _d2i_PKCS7_ENCRYPT                  @738
+    _d2i_PKCS7_ENC_CONTENT              @739
+    _d2i_PKCS7_ENVELOPE                 @740
+    _d2i_PKCS7_ISSUER_AND_SERIAL        @741
+    _d2i_PKCS7_RECIP_INFO               @742
+    _d2i_PKCS7_SIGNED                   @743
+    _d2i_PKCS7_SIGNER_INFO              @744
+    _d2i_PKCS7_SIGN_ENVELOPE            @745
+    _d2i_PKCS7_bio                      @746
+    _d2i_PrivateKey                     @748
+    _d2i_PublicKey                      @749
+    _d2i_RSAPrivateKey                  @750
+    _d2i_RSAPrivateKey_bio              @751
+    _d2i_RSAPublicKey                   @753
+    _d2i_RSAPublicKey_bio               @945
+    _d2i_X509                           @754
+    _d2i_X509_ALGOR                     @755
+    _d2i_X509_ATTRIBUTE                 @756
+    _d2i_X509_CINF                      @757
+    _d2i_X509_CRL                       @758
+    _d2i_X509_CRL_INFO                  @759
+    _d2i_X509_CRL_bio                   @760
+    _d2i_X509_EXTENSION                 @762
+    _d2i_X509_NAME                      @763
+    _d2i_X509_NAME_ENTRY                @764
+    _d2i_X509_PKEY                      @765
+    _d2i_X509_PUBKEY                    @766
+    _d2i_X509_REQ                       @767
+    _d2i_X509_REQ_INFO                  @768
+    _d2i_X509_REQ_bio                   @769
+    _d2i_X509_REVOKED                   @771
+    _d2i_X509_SIG                       @772
+    _d2i_X509_VAL                       @773
+    _d2i_X509_bio                       @774
+    _des_cbc_cksum                      @777
+    _des_cbc_encrypt                    @778
+    _des_cblock_print_file              @779
+    _des_cfb64_encrypt                  @780
+    _des_cfb_encrypt                    @781
+    _des_decrypt3                       @782
+    _des_ecb3_encrypt                   @783
+    _des_ecb_encrypt                    @784
+    _des_ede3_cbc_encrypt               @785
+    _des_ede3_cfb64_encrypt             @786
+    _des_ede3_ofb64_encrypt             @787
+    _des_enc_read                       @788
+    _des_enc_write                      @789
+    _des_encrypt                        @790
+    _des_encrypt2                       @791
+    _des_encrypt3                       @792
+    _des_fcrypt                         @793
+    _des_is_weak_key                    @794
+    _des_key_sched                      @795
+    _des_ncbc_encrypt                   @796
+    _des_ofb64_encrypt                  @797
+    _des_ofb_encrypt                    @798
+    _des_options                        @799
+    _des_pcbc_encrypt                   @800
+    _des_quad_cksum                     @801
+    _des_random_key                     @802
+    _des_random_seed                    @803
+    _des_read_2passwords                @804
+    _des_read_password                  @805
+    _des_read_pw                        @806
+    _des_read_pw_string                 @807
+    _des_set_key                        @808
+    _des_set_odd_parity                 @809
+    _des_string_to_2keys                @810
+    _des_string_to_key                  @811
+    _des_xcbc_encrypt                   @812
+    _des_xwhite_in2out                  @813
+    _i2a_ASN1_INTEGER                   @815
+    _i2a_ASN1_OBJECT                    @816
+    _i2a_ASN1_STRING                    @817
+    _i2d_ASN1_BIT_STRING                @818
+    _i2d_ASN1_BOOLEAN                   @819
+    _i2d_ASN1_HEADER                    @820
+    _i2d_ASN1_IA5STRING                 @821
+    _i2d_ASN1_INTEGER                   @822
+    _i2d_ASN1_OBJECT                    @823
+    _i2d_ASN1_OCTET_STRING              @824
+    _i2d_ASN1_PRINTABLE                 @825
+    _i2d_ASN1_SET                       @826
+    _i2d_ASN1_TYPE                      @827
+    _i2d_ASN1_UTCTIME                   @828
+    _i2d_ASN1_bytes                     @829
+    _i2d_DHparams                       @830
+    _i2d_DSAPrivateKey                  @831
+    _i2d_DSAPrivateKey_bio              @832
+    _i2d_DSAPublicKey                   @834
+    _i2d_DSAparams                      @835
+    _i2d_NETSCAPE_SPKAC                 @836
+    _i2d_NETSCAPE_SPKI                  @837
+    _i2d_Netscape_RSA                   @838
+    _i2d_PKCS7                          @839
+    _i2d_PKCS7_DIGEST                   @840
+    _i2d_PKCS7_ENCRYPT                  @841
+    _i2d_PKCS7_ENC_CONTENT              @842
+    _i2d_PKCS7_ENVELOPE                 @843
+    _i2d_PKCS7_ISSUER_AND_SERIAL        @844
+    _i2d_PKCS7_RECIP_INFO               @845
+    _i2d_PKCS7_SIGNED                   @846
+    _i2d_PKCS7_SIGNER_INFO              @847
+    _i2d_PKCS7_SIGN_ENVELOPE            @848
+    _i2d_PKCS7_bio                      @849
+    _i2d_PrivateKey                     @851
+    _i2d_PublicKey                      @852
+    _i2d_RSAPrivateKey                  @853
+    _i2d_RSAPrivateKey_bio              @854
+    _i2d_RSAPublicKey                   @856
+    _i2d_RSAPublicKey_bio               @946
+    _i2d_X509                           @857
+    _i2d_X509_ALGOR                     @858
+    _i2d_X509_ATTRIBUTE                 @859
+    _i2d_X509_CINF                      @860
+    _i2d_X509_CRL                       @861
+    _i2d_X509_CRL_INFO                  @862
+    _i2d_X509_CRL_bio                   @863
+    _i2d_X509_EXTENSION                 @865
+    _i2d_X509_NAME                      @866
+    _i2d_X509_NAME_ENTRY                @867
+    _i2d_X509_PKEY                      @868
+    _i2d_X509_PUBKEY                    @869
+    _i2d_X509_REQ                       @870
+    _i2d_X509_REQ_INFO                  @871
+    _i2d_X509_REQ_bio                   @872
+    _i2d_X509_REVOKED                   @874
+    _i2d_X509_SIG                       @875
+    _i2d_X509_VAL                       @876
+    _i2d_X509_bio                       @877
+    _i2t_ASN1_OBJECT                    @979
+    _idea_cbc_encrypt                   @879
+    _idea_cfb64_encrypt                 @880
+    _idea_ecb_encrypt                   @881
+    _idea_encrypt                       @882
+    _idea_ofb64_encrypt                 @883
+    _idea_options                       @884
+    _idea_set_decrypt_key               @885
+    _idea_set_encrypt_key               @886
+    _lh_delete                          @887
+    _lh_doall                           @888
+    _lh_doall_arg                       @889
+    _lh_free                            @890
+    _lh_insert                          @891
+    _lh_new                             @892
+    _lh_node_stats_bio                  @894
+    _lh_node_usage_stats_bio            @896
+    _lh_retrieve                        @897
+    _lh_stats_bio                       @899
+    _lh_strhash                         @900
+    _sk_delete                          @901
+    _sk_delete_ptr                      @902
+    _sk_dup                             @903
+    _sk_find                            @904
+    _sk_free                            @905
+    _sk_insert                          @906
+    _sk_new                             @907
+    _sk_pop                             @908
+    _sk_pop_free                        @909
+    _sk_push                            @910
+    _sk_set_cmp_func                    @911
+    _sk_shift                           @912
+    _sk_unshift                         @913
+    _sk_zero                            @914
+
diff --git a/src/lib/libssl/src/ms/libeay32.def b/src/lib/libssl/src/ms/libeay32.def
new file mode 100644
index 0000000000..196c52216e
--- /dev/null
+++ b/src/lib/libssl/src/ms/libeay32.def
@@ -0,0 +1,1035 @@
+;
+; Definition file for the DDL version of the LIBEAY32 library from SSLeay
+;
+
+LIBRARY         LIBEAY32
+
+DESCRIPTION     'SSLeay LIBEAY32 - eay@cryptsoft.com'
+
+EXPORTS
+    SSLeay                             @1
+    SSLeay_add_all_algorithms          @508
+    SSLeay_add_all_ciphers             @509
+    SSLeay_add_all_digests             @510
+    SSLeay_version                     @2
+    ASN1_BIT_STRING_asn1_meth          @3
+    ASN1_BIT_STRING_get_bit            @1060
+    ASN1_BIT_STRING_set_bit            @1061
+    ASN1_HEADER_free                   @4
+    ASN1_HEADER_new                    @5
+    ASN1_IA5STRING_asn1_meth           @6
+    ASN1_INTEGER_get                   @7
+    ASN1_INTEGER_set                   @8
+    ASN1_INTEGER_to_BN                 @9
+    ASN1_OBJECT_create                 @10
+    ASN1_OBJECT_free                   @11
+    ASN1_OBJECT_new                    @12
+    ASN1_PRINTABLE_type                @13
+    ASN1_STRING_cmp                    @14
+    ASN1_STRING_dup                    @15
+    ASN1_STRING_free                   @16
+    ASN1_STRING_new                    @17
+    ASN1_STRING_print                  @18
+    ASN1_STRING_set                    @19
+    ASN1_STRING_type_new               @20
+    ASN1_TYPE_free                     @21
+    ASN1_TYPE_get                      @916
+    ASN1_TYPE_get_int_octetstring      @1076
+    ASN1_TYPE_get_octetstring          @1077
+    ASN1_TYPE_new                      @22
+    ASN1_TYPE_set                      @917
+    ASN1_TYPE_set_int_octetstring      @1078
+    ASN1_TYPE_set_octetstring          @1079
+    ASN1_UNIVERSALSTRING_to_string     @23
+    ASN1_UTCTIME_check                 @24
+    ASN1_UTCTIME_print                 @25
+    ASN1_UTCTIME_set                   @26
+    ASN1_UTCTIME_set_string            @1080
+    ASN1_check_infinite_end            @27
+    ASN1_d2i_bio                       @28
+    ASN1_d2i_fp                        @29
+    ASN1_digest                        @30
+    ASN1_dup                           @31
+    ASN1_get_object                    @32
+    ASN1_i2d_bio                       @33
+    ASN1_i2d_fp                        @34
+    ASN1_object_size                   @35
+    ASN1_parse                         @36
+    ASN1_put_object                    @37
+    ASN1_sign                          @38
+    ASN1_verify                        @39
+    BF_cbc_encrypt                     @40
+    BF_cfb64_encrypt                   @41
+    BF_decrypt                         @987
+    BF_ecb_encrypt                     @42
+    BF_encrypt                         @43
+    BF_ofb64_encrypt                   @44
+    BF_options                         @45
+    BF_set_key                         @46
+    BIO_accept                         @51
+    BIO_copy_next_retry                @955
+    BIO_ctrl                           @52
+    BIO_debug_callback                 @54
+    BIO_dump                           @55
+    BIO_dup_chain                      @56
+    BIO_f_base64                       @57
+    BIO_f_buffer                       @58
+    BIO_f_cipher                       @59
+    BIO_f_md                           @60
+    BIO_f_nbio_test                    @915
+    BIO_f_null                         @61
+    BIO_fd_non_fatal_error             @63
+    BIO_fd_should_retry                @64
+    BIO_find_type                      @65
+    BIO_free                           @66
+    BIO_free_all                       @67
+    BIO_get_accept_socket              @69
+    BIO_get_host_ip                    @71
+    BIO_get_port                       @72
+    BIO_get_retry_BIO                  @73
+    BIO_get_retry_reason               @74
+    BIO_gethostbyname                  @75
+    BIO_gets                           @76
+    BIO_ghbn_ctrl                      @1003
+    BIO_int_ctrl                       @53
+    BIO_new                            @78
+    BIO_new_accept                     @79
+    BIO_new_connect                    @80
+    BIO_new_fd                         @81
+    BIO_new_file                       @82
+    BIO_new_fp                         @83
+    BIO_new_socket                     @84
+    BIO_pop                            @85
+    BIO_printf                         @86
+    BIO_ptr_ctrl                       @969
+    BIO_push                           @87
+    BIO_puts                           @88
+    BIO_read                           @89
+    BIO_s_accept                       @90
+    BIO_s_connect                      @91
+    BIO_s_fd                           @92
+    BIO_s_file                         @93
+    BIO_s_mem                          @95
+    BIO_s_null                         @96
+    BIO_s_socket                       @98
+    BIO_set                            @100
+    BIO_set_cipher                     @101
+    BIO_set_tcp_ndelay                 @102
+    BIO_sock_cleanup                   @103
+    BIO_sock_error                     @104
+    BIO_sock_init                      @105
+    BIO_sock_non_fatal_error           @106
+    BIO_sock_should_retry              @107
+    BIO_socket_ioctl                   @108
+    BIO_write                          @109
+    BN_BLINDING_convert                @973
+    BN_BLINDING_free                   @981
+    BN_BLINDING_invert                 @974
+    BN_BLINDING_new                    @980
+    BN_BLINDING_update                 @975
+    BN_CTX_free                        @110
+    BN_CTX_new                         @111
+    BN_MONT_CTX_free                   @112
+    BN_MONT_CTX_new                    @113
+    BN_MONT_CTX_set                    @114
+    BN_add                             @115
+    BN_add_word                        @116
+    BN_bin2bn                          @118
+    BN_bn2bin                          @120
+    BN_bn2dec                          @1002
+    BN_bn2hex                          @119
+    BN_bn2mpi                          @1058
+    BN_clear                           @121
+    BN_clear_bit                       @122
+    BN_clear_free                      @123
+    BN_cmp                             @124
+    BN_copy                            @125
+    BN_dec2bn                          @1001
+    BN_div                             @126
+    BN_div_word                        @127
+    BN_dup                             @128
+    BN_exp                             @998
+    BN_free                            @129
+    BN_from_montgomery                 @130
+    BN_gcd                             @131
+    BN_generate_prime                  @132
+    BN_get_word                        @133
+    BN_hex2bn                          @117
+    BN_is_bit_set                      @134
+    BN_is_prime                        @135
+    BN_lshift                          @136
+    BN_lshift1                         @137
+    BN_mask_bits                       @138
+    BN_mod                             @139
+    BN_mod_exp                         @140
+    BN_mod_exp_mont                    @141
+    BN_mod_exp_recp                    @142
+    BN_mod_exp_simple                  @143
+    BN_mod_inverse                     @144
+    BN_mod_mul                         @145
+    BN_mod_mul_montgomery              @146
+    BN_mod_mul_reciprocal              @147
+    BN_mod_word                        @148
+    BN_mpi2bn                          @1059
+    BN_mul                             @149
+    BN_mul_word                        @999
+    BN_new                             @150
+    BN_num_bits                        @151
+    BN_num_bits_word                   @152
+    BN_options                         @153
+    BN_print                           @154
+    BN_print_fp                        @155
+    BN_rand                            @156
+    BN_reciprocal                      @157
+    BN_rshift                          @158
+    BN_rshift1                         @159
+    BN_set_bit                         @160
+    BN_set_word                        @161
+    BN_sqr                             @162
+    BN_sub                             @163
+    BN_sub_word                        @1000
+    BN_to_ASN1_INTEGER                 @164
+    BN_ucmp                            @165
+    BN_value_one                       @166
+    BUF_MEM_free                       @167
+    BUF_MEM_grow                       @168
+    BUF_MEM_new                        @169
+    BUF_strdup                         @170
+    CAST_cbc_encrypt                   @992
+    CAST_cfb64_encrypt                 @993
+    CAST_decrypt                       @990
+    CAST_ecb_encrypt                   @991
+    CAST_encrypt                       @989
+    CAST_ofb64_encrypt                 @994
+    CAST_set_key                       @988
+    CONF_free                          @171
+    CONF_get_number                    @172
+    CONF_get_section                   @173
+    CONF_get_string                    @174
+    CONF_load                          @175
+    CRYPTO_add_lock                    @176
+    CRYPTO_dbg_free                    @177
+    CRYPTO_dbg_malloc                  @178
+    CRYPTO_dbg_realloc                 @179
+    CRYPTO_dbg_remalloc                @180
+    CRYPTO_dup_ex_data                 @1025
+    CRYPTO_free                        @181
+    CRYPTO_free_ex_data                @1004
+    CRYPTO_get_add_lock_callback       @182
+    CRYPTO_get_ex_data                 @1005
+    CRYPTO_get_ex_new_index            @1041
+    CRYPTO_get_id_callback             @183
+    CRYPTO_get_lock_name               @184
+    CRYPTO_get_locking_callback        @185
+    CRYPTO_get_mem_functions           @186
+    CRYPTO_get_new_lockid              @1026
+    CRYPTO_lock                        @187
+    CRYPTO_malloc                      @188
+    CRYPTO_mem_ctrl                    @189
+    CRYPTO_mem_leaks                   @190
+    CRYPTO_mem_leaks_cb                @191
+    CRYPTO_mem_leaks_fp                @192
+    CRYPTO_new_ex_data                 @1027
+    CRYPTO_realloc                     @193
+    CRYPTO_remalloc                    @194
+    CRYPTO_set_add_lock_callback       @195
+    CRYPTO_set_ex_data                 @1007
+    CRYPTO_set_id_callback             @196
+    CRYPTO_set_locking_callback        @197
+    CRYPTO_set_mem_functions           @198
+    CRYPTO_thread_id                   @199
+    DH_check                           @200
+    DH_compute_key                     @201
+    DH_free                            @202
+    DH_generate_key                    @203
+    DH_generate_parameters             @204
+    DH_new                             @205
+    DH_size                            @206
+    DHparams_print                     @207
+    DHparams_print_fp                  @208
+    DSA_free                           @209
+    DSA_generate_key                   @210
+    DSA_generate_parameters            @211
+    DSA_is_prime                       @212
+    DSA_new                            @213
+    DSA_print                          @214
+    DSA_print_fp                       @215
+    DSA_sign                           @216
+    DSA_sign_setup                     @217
+    DSA_size                           @218
+    DSA_verify                         @219
+    DSAparams_print                    @220
+    DSAparams_print_fp                 @221
+    ERR_add_error_data                 @1081
+    ERR_clear_error                    @222
+    ERR_error_string                   @223
+    ERR_free_strings                   @224
+    ERR_func_error_string              @225
+    ERR_get_err_state_table            @226
+    ERR_get_error                      @227
+    ERR_get_error_line                 @228
+    ERR_get_next_error_library         @966
+    ERR_get_state                      @229
+    ERR_get_string_table               @230
+    ERR_lib_error_string               @231
+    ERR_load_ASN1_strings              @232
+    ERR_load_BIO_strings               @233
+    ERR_load_BN_strings                @234
+    ERR_load_BUF_strings               @235
+    ERR_load_CONF_strings              @236
+    ERR_load_CRYPTO_strings            @1009
+    ERR_load_DH_strings                @237
+    ERR_load_DSA_strings               @238
+    ERR_load_ERR_strings               @239
+    ERR_load_EVP_strings               @240
+    ERR_load_OBJ_strings               @241
+    ERR_load_PEM_strings               @242
+    ERR_load_PKCS7_strings             @919
+    ERR_load_RSA_strings               @244
+    ERR_load_X509_strings              @245
+    ERR_load_crypto_strings            @246
+    ERR_load_strings                   @247
+    ERR_peek_error                     @248
+    ERR_peek_error_line                @249
+    ERR_print_errors                   @250
+    ERR_print_errors_fp                @251
+    ERR_put_error                      @252
+    ERR_reason_error_string            @253
+    ERR_remove_state                   @254
+    ERR_set_error_data                 @1082
+    EVP_BytesToKey                     @255
+    EVP_CIPHER_CTX_cleanup             @256
+    EVP_CIPHER_CTX_init                @961
+    EVP_CIPHER_asn1_to_param           @1083
+    EVP_CIPHER_get_asn1_iv             @1085
+    EVP_CIPHER_param_to_asn1           @1084
+    EVP_CIPHER_set_asn1_iv             @1086
+    EVP_CipherFinal                    @257
+    EVP_CipherInit                     @258
+    EVP_CipherUpdate                   @259
+    EVP_DecodeBlock                    @260
+    EVP_DecodeFinal                    @261
+    EVP_DecodeInit                     @262
+    EVP_DecodeUpdate                   @263
+    EVP_DecryptFinal                   @264
+    EVP_DecryptInit                    @265
+    EVP_DecryptUpdate                  @266
+    EVP_DigestFinal                    @267
+    EVP_DigestInit                     @268
+    EVP_DigestUpdate                   @269
+    EVP_EncodeBlock                    @270
+    EVP_EncodeFinal                    @271
+    EVP_EncodeInit                     @272
+    EVP_EncodeUpdate                   @273
+    EVP_EncryptFinal                   @274
+    EVP_EncryptInit                    @275
+    EVP_EncryptUpdate                  @276
+    EVP_OpenFinal                      @277
+    EVP_OpenInit                       @278
+    EVP_PKEY_assign                    @279
+    EVP_PKEY_bits                      @1010
+    EVP_PKEY_cmp_parameters            @967
+    EVP_PKEY_copy_parameters           @280
+    EVP_PKEY_decrypt                   @1070
+    EVP_PKEY_encrypt                   @1071
+    EVP_PKEY_free                      @281
+    EVP_PKEY_missing_parameters        @282
+    EVP_PKEY_new                       @283
+    EVP_PKEY_save_parameters           @284
+    EVP_PKEY_size                      @285
+    EVP_PKEY_type                      @286
+    EVP_SealFinal                      @287
+    EVP_SealInit                       @288
+    EVP_SignFinal                      @289
+    EVP_VerifyFinal                    @290
+    EVP_add_alias                      @291
+    EVP_add_cipher                     @292
+    EVP_add_digest                     @293
+    EVP_bf_cbc                         @294
+    EVP_bf_cfb                         @295
+    EVP_bf_ecb                         @296
+    EVP_bf_ofb                         @297
+    EVP_cast5_cbc                      @983
+    EVP_cast5_cfb                      @984
+    EVP_cast5_ecb                      @985
+    EVP_cast5_ofb                      @986
+    EVP_cleanup                        @298
+    EVP_delete_alias                   @941
+    EVP_des_cbc                        @299
+    EVP_des_cfb                        @300
+    EVP_des_ecb                        @301
+    EVP_des_ede                        @302
+    EVP_des_ede3                       @303
+    EVP_des_ede3_cbc                   @304
+    EVP_des_ede3_cfb                   @305
+    EVP_des_ede3_ofb                   @306
+    EVP_des_ede_cbc                    @307
+    EVP_des_ede_cfb                    @308
+    EVP_des_ede_ofb                    @309
+    EVP_des_ofb                        @310
+    EVP_desx_cbc                       @311
+    EVP_dss                            @312
+    EVP_dss1                           @313
+    EVP_enc_null                       @314
+    EVP_get_cipherbyname               @315
+    EVP_get_digestbyname               @316
+    EVP_get_pw_prompt                  @317
+    EVP_idea_cbc                       @318
+    EVP_idea_cfb                       @319
+    EVP_idea_ecb                       @320
+    EVP_idea_ofb                       @321
+    EVP_md2                            @322
+    EVP_md5                            @323
+    EVP_md_null                        @324
+    EVP_mdc2                           @942
+    EVP_rc2_40_cbc                     @959
+    EVP_rc2_cbc                        @325
+    EVP_rc2_cfb                        @326
+    EVP_rc2_ecb                        @327
+    EVP_rc2_ofb                        @328
+    EVP_rc4                            @329
+    EVP_rc4_40                         @960
+    EVP_rc5_32_12_16_cbc               @1087
+    EVP_rc5_32_12_16_cfb               @1088
+    EVP_rc5_32_12_16_ecb               @1089
+    EVP_rc5_32_12_16_ofb               @1090
+    EVP_read_pw_string                 @330
+    EVP_set_pw_prompt                  @331
+    EVP_sha                            @332
+    EVP_sha1                           @333
+    HMAC                               @962
+    HMAC_Final                         @965
+    HMAC_Init                          @963
+    HMAC_Update                        @964
+    HMAC_cleanup                       @968
+    MD2                                @334
+    MD2_Final                          @335
+    MD2_Init                           @336
+    MD2_Update                         @337
+    MD2_options                        @338
+    MD5                                @339
+    MD5_Final                          @340
+    MD5_Init                           @341
+    MD5_Transform                      @1011
+    MD5_Update                         @342
+    MDC2                               @343
+    MDC2_Final                         @344
+    MDC2_Init                          @345
+    MDC2_Update                        @346
+    NETSCAPE_SPKAC_free                @347
+    NETSCAPE_SPKAC_new                 @348
+    NETSCAPE_SPKI_free                 @349
+    NETSCAPE_SPKI_new                  @350
+    NETSCAPE_SPKI_sign                 @351
+    NETSCAPE_SPKI_verify               @352
+    OBJ_add_object                     @353
+    OBJ_bsearch                        @354
+    OBJ_cleanup                        @355
+    OBJ_cmp                            @356
+    OBJ_create                         @357
+    OBJ_create_objects                 @997
+    OBJ_dup                            @358
+    OBJ_ln2nid                         @359
+    OBJ_new_nid                        @360
+    OBJ_nid2ln                         @361
+    OBJ_nid2obj                        @362
+    OBJ_nid2sn                         @363
+    OBJ_obj2nid                        @364
+    OBJ_sn2nid                         @365
+    OBJ_txt2nid                        @366
+    PEM_ASN1_read                      @367
+    PEM_ASN1_read_bio                  @368
+    PEM_ASN1_write                     @369
+    PEM_ASN1_write_bio                 @370
+    PEM_SealFinal                      @371
+    PEM_SealInit                       @372
+    PEM_SealUpdate                     @373
+    PEM_SignFinal                      @374
+    PEM_X509_INFO_read                 @377
+    PEM_X509_INFO_read_bio             @378
+    PEM_X509_INFO_write_bio            @379
+    PEM_dek_info                       @380
+    PEM_do_header                      @381
+    PEM_get_EVP_CIPHER_INFO            @382
+    PEM_proc_type                      @383
+    PEM_read                           @384
+    PEM_read_DHparams                  @385
+    PEM_read_DSAPrivateKey             @386
+    PEM_read_DSAparams                 @387
+    PEM_read_PKCS7                     @388
+    PEM_read_PrivateKey                @389
+    PEM_read_RSAPrivateKey             @390
+    PEM_read_RSAPublicKey              @947
+    PEM_read_X509                      @391
+    PEM_read_X509_CRL                  @392
+    PEM_read_X509_REQ                  @393
+    PEM_read_bio                       @394
+    PEM_read_bio_DHparams              @395
+    PEM_read_bio_DSAPrivateKey         @396
+    PEM_read_bio_DSAparams             @397
+    PEM_read_bio_PKCS7                 @398
+    PEM_read_bio_PrivateKey            @399
+    PEM_read_bio_RSAPrivateKey         @400
+    PEM_read_bio_RSAPublicKey          @943
+    PEM_read_bio_X509                  @401
+    PEM_read_bio_X509_CRL              @402
+    PEM_read_bio_X509_REQ              @403
+    PEM_write                          @404
+    PEM_write_DHparams                 @405
+    PEM_write_DSAPrivateKey            @406
+    PEM_write_DSAparams                @407
+    PEM_write_PKCS7                    @408
+    PEM_write_PrivateKey               @409
+    PEM_write_RSAPrivateKey            @410
+    PEM_write_RSAPublicKey             @949
+    PEM_write_X509                     @411
+    PEM_write_X509_CRL                 @412
+    PEM_write_X509_REQ                 @413
+    PEM_write_bio                      @414
+    PEM_write_bio_DHparams             @415
+    PEM_write_bio_DSAPrivateKey        @416
+    PEM_write_bio_DSAparams            @417
+    PEM_write_bio_PKCS7                @418
+    PEM_write_bio_PrivateKey           @419
+    PEM_write_bio_RSAPrivateKey        @420
+    PEM_write_bio_RSAPublicKey         @944
+    PEM_write_bio_X509                 @421
+    PEM_write_bio_X509_CRL             @422
+    PEM_write_bio_X509_REQ             @423
+    PKCS7_DIGEST_free                  @424
+    PKCS7_DIGEST_new                   @425
+    PKCS7_ENCRYPT_free                 @426
+    PKCS7_ENCRYPT_new                  @427
+    PKCS7_ENC_CONTENT_free             @428
+    PKCS7_ENC_CONTENT_new              @429
+    PKCS7_ENVELOPE_free                @430
+    PKCS7_ENVELOPE_new                 @431
+    PKCS7_ISSUER_AND_SERIAL_digest     @432
+    PKCS7_ISSUER_AND_SERIAL_free       @433
+    PKCS7_ISSUER_AND_SERIAL_new        @434
+    PKCS7_RECIP_INFO_free              @435
+    PKCS7_RECIP_INFO_new               @436
+    PKCS7_RECIP_INFO_set               @1072
+    PKCS7_SIGNED_free                  @437
+    PKCS7_SIGNED_new                   @438
+    PKCS7_SIGNER_INFO_free             @439
+    PKCS7_SIGNER_INFO_new              @440
+    PKCS7_SIGNER_INFO_set              @930
+    PKCS7_SIGN_ENVELOPE_free           @441
+    PKCS7_SIGN_ENVELOPE_new            @442
+    PKCS7_add_certificate              @932
+    PKCS7_add_crl                      @933
+    PKCS7_add_recipient                @1073
+    PKCS7_add_recipient_info           @1074
+    PKCS7_add_signature                @938
+    PKCS7_add_signer                   @931
+    PKCS7_cert_from_signer_info        @939
+    PKCS7_content_free                 @918
+    PKCS7_content_new                  @934
+    PKCS7_ctrl                         @927
+    PKCS7_dataInit                     @937
+    PKCS7_dataSign                     @935
+    PKCS7_dataVerify                   @936
+    PKCS7_dup                          @443
+    PKCS7_free                         @444
+    PKCS7_get_signer_info              @940
+    PKCS7_new                          @445
+    PKCS7_set_cipher                   @1075
+    PKCS7_set_content                  @929
+    PKCS7_set_type                     @928
+    RAND_bytes                         @464
+    RAND_cleanup                       @465
+    RAND_file_name                     @466
+    RAND_load_file                     @467
+    RAND_screen                        @468
+    RAND_seed                          @469
+    RAND_write_file                    @470
+    RC2_cbc_encrypt                    @471
+    RC2_cfb64_encrypt                  @472
+    RC2_decrypt                        @995
+    RC2_ecb_encrypt                    @473
+    RC2_encrypt                        @474
+    RC2_ofb64_encrypt                  @475
+    RC2_set_key                        @476
+    RC4                                @477
+    RC4_options                        @478
+    RC4_set_key                        @479
+    RC5_32_cbc_encrypt                 @1051
+    RC5_32_cfb64_encrypt               @1052
+    RC5_32_decrypt                     @1050
+    RC5_32_ecb_encrypt                 @1048
+    RC5_32_encrypt                     @1049
+    RC5_32_ofb64_encrypt               @1053
+    RC5_32_set_key                     @1047
+    RIPEMD160                          @1045
+    RIPEMD160_Final                    @1044
+    RIPEMD160_Init                     @1042
+    RIPEMD160_Transform                @1046
+    RIPEMD160_Update                   @1043
+    RSAPrivateKey_asn1_meth            @480
+    RSAPrivateKey_dup                  @481
+    RSAPublicKey_dup                   @482
+    RSA_PKCS1_SSLeay                   @483
+    RSA_blinding_off                   @978
+    RSA_blinding_on                    @977
+    RSA_flags                          @956
+    RSA_free                           @484
+    RSA_generate_key                   @485
+    RSA_get_ex_data                    @1029
+    RSA_get_ex_new_index               @1030
+    RSA_new                            @486
+    RSA_new_method                     @487
+    RSA_padding_add_PKCS1_type_1       @1031
+    RSA_padding_add_PKCS1_type_2       @1032
+    RSA_padding_add_SSLv23             @1033
+    RSA_padding_add_none               @1034
+    RSA_padding_check_PKCS1_type_1     @1035
+    RSA_padding_check_PKCS1_type_2     @1036
+    RSA_padding_check_SSLv23           @1037
+    RSA_padding_check_none             @1038
+    RSA_print                          @488
+    RSA_print_fp                       @489
+    RSA_private_decrypt                @490
+    RSA_private_encrypt                @491
+    RSA_public_decrypt                 @492
+    RSA_public_encrypt                 @493
+    RSA_set_default_method             @494
+    RSA_set_ex_data                    @1028
+    RSA_sign                           @495
+    RSA_sign_ASN1_OCTET_STRING         @496
+    RSA_size                           @497
+    RSA_verify                         @498
+    RSA_verify_ASN1_OCTET_STRING       @499
+    SHA                                @500
+    SHA1                               @501
+    SHA1_Final                         @502
+    SHA1_Init                          @503
+    SHA1_Transform                     @1012
+    SHA1_Update                        @504
+    SHA_Final                          @505
+    SHA_Init                           @506
+    SHA_Transform                      @1013
+    SHA_Update                         @507
+    TXT_DB_create_index                @511
+    TXT_DB_free                        @512
+    TXT_DB_get_by_index                @513
+    TXT_DB_insert                      @514
+    TXT_DB_read                        @515
+    TXT_DB_write                       @516
+    X509_ALGOR_free                    @517
+    X509_ALGOR_new                     @518
+    X509_ATTRIBUTE_free                @519
+    X509_ATTRIBUTE_new                 @520
+    X509_CINF_free                     @521
+    X509_CINF_new                      @522
+    X509_CRL_INFO_free                 @523
+    X509_CRL_INFO_new                  @524
+    X509_CRL_add_ext                   @525
+    X509_CRL_cmp                       @526
+    X509_CRL_delete_ext                @527
+    X509_CRL_dup                       @528
+    X509_CRL_free                      @529
+    X509_CRL_get_ext                   @530
+    X509_CRL_get_ext_by_NID            @531
+    X509_CRL_get_ext_by_OBJ            @532
+    X509_CRL_get_ext_by_critical       @533
+    X509_CRL_get_ext_count             @534
+    X509_CRL_new                       @535
+    X509_CRL_sign                      @536
+    X509_CRL_verify                    @537
+    X509_EXTENSION_create_by_NID       @538
+    X509_EXTENSION_create_by_OBJ       @539
+    X509_EXTENSION_dup                 @540
+    X509_EXTENSION_free                @541
+    X509_EXTENSION_get_critical        @542
+    X509_EXTENSION_get_data            @543
+    X509_EXTENSION_get_object          @544
+    X509_EXTENSION_new                 @545
+    X509_EXTENSION_set_critical        @546
+    X509_EXTENSION_set_data            @547
+    X509_EXTENSION_set_object          @548
+    X509_INFO_free                     @549
+    X509_INFO_new                      @550
+    X509_LOOKUP_by_alias               @551
+    X509_LOOKUP_by_fingerprint         @552
+    X509_LOOKUP_by_issuer_serial       @553
+    X509_LOOKUP_by_subject             @554
+    X509_LOOKUP_ctrl                   @555
+    X509_LOOKUP_file                   @556
+    X509_LOOKUP_free                   @557
+    X509_LOOKUP_hash_dir               @558
+    X509_LOOKUP_init                   @559
+    X509_LOOKUP_new                    @560
+    X509_LOOKUP_shutdown               @561
+    X509_NAME_ENTRY_create_by_NID      @562
+    X509_NAME_ENTRY_create_by_OBJ      @563
+    X509_NAME_ENTRY_dup                @564
+    X509_NAME_ENTRY_free               @565
+    X509_NAME_ENTRY_get_data           @566
+    X509_NAME_ENTRY_get_object         @567
+    X509_NAME_ENTRY_new                @568
+    X509_NAME_ENTRY_set_data           @569
+    X509_NAME_ENTRY_set_object         @570
+    X509_NAME_add_entry                @571
+    X509_NAME_cmp                      @572
+    X509_NAME_delete_entry             @573
+    X509_NAME_digest                   @574
+    X509_NAME_dup                      @575
+    X509_NAME_entry_count              @576
+    X509_NAME_free                     @577
+    X509_NAME_get_entry                @578
+    X509_NAME_get_index_by_NID         @579
+    X509_NAME_get_index_by_OBJ         @580
+    X509_NAME_get_text_by_NID          @581
+    X509_NAME_get_text_by_OBJ          @582
+    X509_NAME_hash                     @583
+    X509_NAME_new                      @584
+    X509_NAME_oneline                  @585
+    X509_NAME_print                    @586
+    X509_NAME_set                      @587
+    X509_OBJECT_free_contents          @588
+    X509_OBJECT_retrive_by_subject     @589
+    X509_OBJECT_up_ref_count           @590
+    X509_PKEY_free                     @591
+    X509_PKEY_new                      @592
+    X509_PUBKEY_free                   @593
+    X509_PUBKEY_get                    @594
+    X509_PUBKEY_new                    @595
+    X509_PUBKEY_set                    @596
+    X509_REQ_INFO_free                 @597
+    X509_REQ_INFO_new                  @598
+    X509_REQ_dup                       @599
+    X509_REQ_free                      @600
+    X509_REQ_get_pubkey                @601
+    X509_REQ_new                       @602
+    X509_REQ_print                     @603
+    X509_REQ_print_fp                  @604
+    X509_REQ_set_pubkey                @605
+    X509_REQ_set_subject_name          @606
+    X509_REQ_set_version               @607
+    X509_REQ_sign                      @608
+    X509_REQ_to_X509                   @609
+    X509_REQ_verify                    @610
+    X509_REVOKED_add_ext               @611
+    X509_REVOKED_delete_ext            @612
+    X509_REVOKED_free                  @613
+    X509_REVOKED_get_ext               @614
+    X509_REVOKED_get_ext_by_NID        @615
+    X509_REVOKED_get_ext_by_OBJ        @616
+    X509_REVOKED_get_ext_by_critical   @617
+    X509_REVOKED_get_ext_count         @618
+    X509_REVOKED_new                   @619
+    X509_SIG_free                      @620
+    X509_SIG_new                       @621
+    X509_STORE_CTX_cleanup             @622
+    X509_STORE_CTX_get_chain           @1014
+    X509_STORE_CTX_get_current_cert    @1015
+    X509_STORE_CTX_get_error           @1016
+    X509_STORE_CTX_get_error_depth     @1017
+    X509_STORE_CTX_get_ex_data         @1018
+    X509_STORE_CTX_init                @623
+    X509_STORE_CTX_set_cert            @1020
+    X509_STORE_CTX_set_chain           @1021
+    X509_STORE_CTX_set_error           @1022
+    X509_STORE_CTX_set_ex_data         @1023
+    X509_STORE_add_cert                @624
+    X509_STORE_add_crl                 @957
+    X509_STORE_add_lookup              @625
+    X509_STORE_free                    @626
+    X509_STORE_get_by_subject          @627
+    X509_STORE_load_locations          @628
+    X509_STORE_new                     @629
+    X509_STORE_set_default_paths       @630
+    X509_VAL_free                      @631
+    X509_VAL_new                       @632
+    X509_add_ext                       @633
+    X509_asn1_meth                     @634
+    X509_certificate_type              @635
+    X509_check_private_key             @636
+    X509_cmp_current_time              @637
+    X509_delete_ext                    @638
+    X509_digest                        @639
+    X509_dup                           @640
+    X509_find_by_issuer_and_serial     @920
+    X509_find_by_subject               @921
+    X509_free                          @641
+    X509_get_default_cert_area         @642
+    X509_get_default_cert_dir          @643
+    X509_get_default_cert_dir_env      @644
+    X509_get_default_cert_file         @645
+    X509_get_default_cert_file_env     @646
+    X509_get_default_private_dir       @647
+    X509_get_ext                       @648
+    X509_get_ext_by_NID                @649
+    X509_get_ext_by_OBJ                @650
+    X509_get_ext_by_critical           @651
+    X509_get_ext_count                 @652
+    X509_get_issuer_name               @653
+    X509_get_pubkey                    @654
+    X509_get_pubkey_parameters         @655
+    X509_get_serialNumber              @656
+    X509_get_subject_name              @657
+    X509_gmtime_adj                    @658
+    X509_issuer_and_serial_cmp         @659
+    X509_issuer_and_serial_hash        @660
+    X509_issuer_name_cmp               @661
+    X509_issuer_name_hash              @662
+    X509_load_cert_file                @663
+    X509_load_crl_file                 @958
+    X509_new                           @664
+    X509_print                         @665
+    X509_print_fp                      @666
+    X509_set_issuer_name               @667
+    X509_set_notAfter                  @668
+    X509_set_notBefore                 @669
+    X509_set_pubkey                    @670
+    X509_set_serialNumber              @671
+    X509_set_subject_name              @672
+    X509_set_version                   @673
+    X509_sign                          @674
+    X509_subject_name_cmp              @675
+    X509_subject_name_hash             @676
+    X509_to_X509_REQ                   @677
+    X509_verify                        @678
+    X509_verify_cert                   @679
+    X509_verify_cert_error_string      @680
+    X509v3_add_ext                     @681
+    X509v3_add_extension               @682
+    X509v3_add_netscape_extensions     @683
+    X509v3_add_standard_extensions     @684
+    X509v3_cleanup_extensions          @685
+    X509v3_data_type_by_NID            @686
+    X509v3_data_type_by_OBJ            @687
+    X509v3_delete_ext                  @688
+    X509v3_get_ext                     @689
+    X509v3_get_ext_by_NID              @690
+    X509v3_get_ext_by_OBJ              @691
+    X509v3_get_ext_by_critical         @692
+    X509v3_get_ext_count               @693
+    X509v3_pack_string                 @694
+    X509v3_pack_type_by_NID            @695
+    X509v3_pack_type_by_OBJ            @696
+    X509v3_unpack_string               @697
+    a2d_ASN1_OBJECT                    @699
+    a2i_ASN1_INTEGER                   @700
+    a2i_ASN1_STRING                    @701
+    asn1_Finish                        @702
+    asn1_GetSequence                   @703
+    asn1_add_error                     @1091
+    bn_add_words                       @1039
+    bn_div64                           @704
+    bn_expand2                         @705
+    bn_mul_add_words                   @706
+    bn_mul_words                       @707
+    bn_qadd                            @708
+    bn_qsub                            @709
+    bn_sqr_words                       @710
+    crypt                              @711
+    d2i_ASN1_BIT_STRING                @712
+    d2i_ASN1_BOOLEAN                   @713
+    d2i_ASN1_HEADER                    @714
+    d2i_ASN1_IA5STRING                 @715
+    d2i_ASN1_INTEGER                   @716
+    d2i_ASN1_OBJECT                    @717
+    d2i_ASN1_OCTET_STRING              @718
+    d2i_ASN1_PRINTABLE                 @719
+    d2i_ASN1_PRINTABLESTRING           @720
+    d2i_ASN1_SET                       @721
+    d2i_ASN1_T61STRING                 @722
+    d2i_ASN1_TYPE                      @723
+    d2i_ASN1_UTCTIME                   @724
+    d2i_ASN1_bytes                     @725
+    d2i_ASN1_type_bytes                @726
+    d2i_DHparams                       @727
+    d2i_DSAPrivateKey                  @728
+    d2i_DSAPrivateKey_bio              @729
+    d2i_DSAPrivateKey_fp               @730
+    d2i_DSAPublicKey                   @731
+    d2i_DSAparams                      @732
+    d2i_NETSCAPE_SPKAC                 @733
+    d2i_NETSCAPE_SPKI                  @734
+    d2i_Netscape_RSA                   @735
+    d2i_Netscape_RSA_2                 @1040
+    d2i_PKCS7                          @736
+    d2i_PKCS7_DIGEST                   @737
+    d2i_PKCS7_ENCRYPT                  @738
+    d2i_PKCS7_ENC_CONTENT              @739
+    d2i_PKCS7_ENVELOPE                 @740
+    d2i_PKCS7_ISSUER_AND_SERIAL        @741
+    d2i_PKCS7_RECIP_INFO               @742
+    d2i_PKCS7_SIGNED                   @743
+    d2i_PKCS7_SIGNER_INFO              @744
+    d2i_PKCS7_SIGN_ENVELOPE            @745
+    d2i_PKCS7_bio                      @746
+    d2i_PKCS7_fp                       @747
+    d2i_PrivateKey                     @748
+    d2i_PublicKey                      @749
+    d2i_RSAPrivateKey                  @750
+    d2i_RSAPrivateKey_bio              @751
+    d2i_RSAPrivateKey_fp               @752
+    d2i_RSAPublicKey                   @753
+    d2i_RSAPublicKey_bio               @945
+    d2i_RSAPublicKey_fp                @952
+    d2i_X509                           @754
+    d2i_X509_ALGOR                     @755
+    d2i_X509_ATTRIBUTE                 @756
+    d2i_X509_CINF                      @757
+    d2i_X509_CRL                       @758
+    d2i_X509_CRL_INFO                  @759
+    d2i_X509_CRL_bio                   @760
+    d2i_X509_CRL_fp                    @761
+    d2i_X509_EXTENSION                 @762
+    d2i_X509_NAME                      @763
+    d2i_X509_NAME_ENTRY                @764
+    d2i_X509_PKEY                      @765
+    d2i_X509_PUBKEY                    @766
+    d2i_X509_REQ                       @767
+    d2i_X509_REQ_INFO                  @768
+    d2i_X509_REQ_bio                   @769
+    d2i_X509_REQ_fp                    @770
+    d2i_X509_REVOKED                   @771
+    d2i_X509_SIG                       @772
+    d2i_X509_VAL                       @773
+    d2i_X509_bio                       @774
+    d2i_X509_fp                        @775
+    des_cbc_cksum                      @777
+    des_cbc_encrypt                    @778
+    des_cblock_print_file              @779
+    des_cfb64_encrypt                  @780
+    des_cfb_encrypt                    @781
+    des_decrypt3                       @782
+    des_ecb3_encrypt                   @783
+    des_ecb_encrypt                    @784
+    des_ede3_cbc_encrypt               @785
+    des_ede3_cfb64_encrypt             @786
+    des_ede3_ofb64_encrypt             @787
+    des_enc_read                       @788
+    des_enc_write                      @789
+    des_encrypt                        @790
+    des_encrypt2                       @791
+    des_encrypt3                       @792
+    des_fcrypt                         @793
+    des_is_weak_key                    @794
+    des_key_sched                      @795
+    des_ncbc_encrypt                   @796
+    des_ofb64_encrypt                  @797
+    des_ofb_encrypt                    @798
+    des_options                        @799
+    des_pcbc_encrypt                   @800
+    des_quad_cksum                     @801
+    des_random_key                     @802
+    des_random_seed                    @803
+    des_read_2passwords                @804
+    des_read_password                  @805
+    des_read_pw                        @806
+    des_read_pw_string                 @807
+    des_set_key                        @808
+    des_set_odd_parity                 @809
+    des_string_to_2keys                @810
+    des_string_to_key                  @811
+    des_xcbc_encrypt                   @812
+    des_xwhite_in2out                  @813
+    i2a_ASN1_INTEGER                   @815
+    i2a_ASN1_OBJECT                    @816
+    i2a_ASN1_STRING                    @817
+    i2d_ASN1_BIT_STRING                @818
+    i2d_ASN1_BOOLEAN                   @819
+    i2d_ASN1_HEADER                    @820
+    i2d_ASN1_IA5STRING                 @821
+    i2d_ASN1_INTEGER                   @822
+    i2d_ASN1_OBJECT                    @823
+    i2d_ASN1_OCTET_STRING              @824
+    i2d_ASN1_PRINTABLE                 @825
+    i2d_ASN1_SET                       @826
+    i2d_ASN1_TYPE                      @827
+    i2d_ASN1_UTCTIME                   @828
+    i2d_ASN1_bytes                     @829
+    i2d_DHparams                       @830
+    i2d_DSAPrivateKey                  @831
+    i2d_DSAPrivateKey_bio              @832
+    i2d_DSAPrivateKey_fp               @833
+    i2d_DSAPublicKey                   @834
+    i2d_DSAparams                      @835
+    i2d_NETSCAPE_SPKAC                 @836
+    i2d_NETSCAPE_SPKI                  @837
+    i2d_Netscape_RSA                   @838
+    i2d_PKCS7                          @839
+    i2d_PKCS7_DIGEST                   @840
+    i2d_PKCS7_ENCRYPT                  @841
+    i2d_PKCS7_ENC_CONTENT              @842
+    i2d_PKCS7_ENVELOPE                 @843
+    i2d_PKCS7_ISSUER_AND_SERIAL        @844
+    i2d_PKCS7_RECIP_INFO               @845
+    i2d_PKCS7_SIGNED                   @846
+    i2d_PKCS7_SIGNER_INFO              @847
+    i2d_PKCS7_SIGN_ENVELOPE            @848
+    i2d_PKCS7_bio                      @849
+    i2d_PKCS7_fp                       @850
+    i2d_PrivateKey                     @851
+    i2d_PublicKey                      @852
+    i2d_RSAPrivateKey                  @853
+    i2d_RSAPrivateKey_bio              @854
+    i2d_RSAPrivateKey_fp               @855
+    i2d_RSAPublicKey                   @856
+    i2d_RSAPublicKey_bio               @946
+    i2d_RSAPublicKey_fp                @954
+    i2d_X509                           @857
+    i2d_X509_ALGOR                     @858
+    i2d_X509_ATTRIBUTE                 @859
+    i2d_X509_CINF                      @860
+    i2d_X509_CRL                       @861
+    i2d_X509_CRL_INFO                  @862
+    i2d_X509_CRL_bio                   @863
+    i2d_X509_CRL_fp                    @864
+    i2d_X509_EXTENSION                 @865
+    i2d_X509_NAME                      @866
+    i2d_X509_NAME_ENTRY                @867
+    i2d_X509_PKEY                      @868
+    i2d_X509_PUBKEY                    @869
+    i2d_X509_REQ                       @870
+    i2d_X509_REQ_INFO                  @871
+    i2d_X509_REQ_bio                   @872
+    i2d_X509_REQ_fp                    @873
+    i2d_X509_REVOKED                   @874
+    i2d_X509_SIG                       @875
+    i2d_X509_VAL                       @876
+    i2d_X509_bio                       @877
+    i2d_X509_fp                        @878
+    i2t_ASN1_OBJECT                    @979
+    idea_cbc_encrypt                   @879
+    idea_cfb64_encrypt                 @880
+    idea_ecb_encrypt                   @881
+    idea_encrypt                       @882
+    idea_ofb64_encrypt                 @883
+    idea_options                       @884
+    idea_set_decrypt_key               @885
+    idea_set_encrypt_key               @886
+    lh_delete                          @887
+    lh_doall                           @888
+    lh_doall_arg                       @889
+    lh_free                            @890
+    lh_insert                          @891
+    lh_new                             @892
+    lh_node_stats                      @893
+    lh_node_stats_bio                  @894
+    lh_node_usage_stats                @895
+    lh_node_usage_stats_bio            @896
+    lh_retrieve                        @897
+    lh_stats                           @898
+    lh_stats_bio                       @899
+    lh_strhash                         @900
+    sk_delete                          @901
+    sk_delete_ptr                      @902
+    sk_dup                             @903
+    sk_find                            @904
+    sk_free                            @905
+    sk_insert                          @906
+    sk_new                             @907
+    sk_pop                             @908
+    sk_pop_free                        @909
+    sk_push                            @910
+    sk_set_cmp_func                    @911
+    sk_shift                           @912
+    sk_unshift                         @913
+    sk_zero                            @914
+
diff --git a/src/lib/libssl/src/ms/ntdll.mak b/src/lib/libssl/src/ms/ntdll.mak
new file mode 100644
index 0000000000..044cd909bc
--- /dev/null
+++ b/src/lib/libssl/src/ms/ntdll.mak
@@ -0,0 +1,1853 @@
+# This makefile has been automatically generated from the SSLeay distribution.
+# This single makefile will build the complete SSLeay distribution and
+# by default leave the 'intertesting' output files in .\out and the stuff
+# that needs deleting in .\tmp.
+# The file was generated by running 'make makefile.one', which
+# does a 'make files', which writes all the environment variables from all
+# the makefiles to the file call MINFO.  This file is used by
+# util\mk1mf.pl to generate makefile.one.
+# The 'makefile per directory' system suites me when developing this
+# library and also so I can 'distribute' indervidual library sections.
+# The one monster makefile better suits building in non-unix
+# environments.
+
+INSTALLTOP=\usr\local\ssl
+
+# Set your compiler options
+CC=cl
+CFLAG= /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
+APP_CFLAG=
+LIB_CFLAG= /GD -D_WINDLL -D_DLL
+SHLIB_CFLAG=
+APP_EX_OBJ=setargv.obj
+SHLIB_EX_OBJ=
+# add extra libraries to this define, for solaris -lsocket -lnsl would
+# be added
+EX_LIBS=wsock32.lib user32.lib gdi32.lib
+
+# The SSLeay directory
+SRC_D=.
+
+LINK=link
+LFLAGS=/nologo /subsystem:console /machine:I386 /opt:ref
+
+BN_MULW_OBJ=crypto\bn\asm\bn-win32.obj
+BN_MULW_SRC=crypto\bn\asm\bn-win32.asm
+DES_ENC_OBJ=crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj
+DES_ENC_SRC=crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm
+DES_CRYPT_OBJ=
+DES_CRYPT_SRC=
+BF_ENC_OBJ=crypto\bf\asm\b-win32.obj
+BF_ENC_SRC=crypto\bf\asm\b-win32.asm
+CAST_ENC_OBJ=crypto\cast\asm\c-win32.obj
+CAST_ENC_SRC=crypto\cast\asm\c-win32.asm
+RC4_ENC_OBJ=crypto\rc4\asm\r4-win32.obj
+RC4_ENC_SRC=crypto\rc4\asm\r4-win32.asm
+RC5_ENC_OBJ=crypto\rc5\asm\r5-win32.obj
+RC5_ENC_SRC=crypto\rc5\asm\r5-win32.asm
+MD5_ASM_OBJ=crypto\md5\asm\m5-win32.obj
+MD5_ASM_SRC=crypto\md5\asm\m5-win32.asm
+SHA1_ASM_OBJ=crypto\sha\asm\s1-win32.obj
+SHA1_ASM_SRC=crypto\sha\asm\s1-win32.asm
+RMD160_ASM_OBJ=crypto\ripemd\asm\rm-win32.obj
+RMD160_ASM_SRC=crypto\ripemd\asm\rm-win32.asm
+
+# The output directory for everything intersting
+OUT_D=out32dll
+# The output directory for all the temporary muck
+TMP_D=tmp32dll
+# The output directory for the header files
+INC_D=inc32
+
+CP=copy
+RM=del
+RANLIB=
+MKDIR=mkdir
+MKLIB=lib
+MLFLAGS= /nologo /subsystem:console /machine:I386 /opt:ref /dll
+ASM=ml /Cp /coff /c /Cx
+
+######################################################
+# You should not need to touch anything below this point
+######################################################
+
+E_EXE=ssleay
+SSL=ssleay32
+CRYPTO=libeay32
+RSAGLUE=RSAglue
+
+# BIN_D  - Binary output directory
+# TEST_D - Binary test file output directory
+# LIB_D  - library output directory
+BIN_D=$(OUT_D)
+TEST_D=$(OUT_D)
+LIB_D=$(OUT_D)
+
+# INCL_D - local library directory
+# OBJ_D  - temp object file directory
+OBJ_D=$(TMP_D)
+INCL_D=$(TMP_D)
+
+O_SSL=     $(LIB_D)\$(SSL).dll
+O_CRYPTO=  $(LIB_D)\$(CRYPTO).dll
+O_RSAGLUE= $(LIB_D)\$(RSAGLUE).lib
+SO_SSL=    $(SSL)
+SO_CRYPTO= $(CRYPTO)
+L_SSL=     $(LIB_D)\$(SSL).lib
+L_CRYPTO=  $(LIB_D)\$(CRYPTO).lib
+
+L_LIBS= $(L_SSL) $(L_CRYPTO)
+#L_LIBS= $(O_SSL) $(O_RSAGLUE) -lrsaref $(O_CRYPTO)
+
+######################################################
+# Don't touch anything below this point
+######################################################
+
+INC=-I$(INC_D) -I$(INCL_D)
+APP_CFLAGS=$(INC) $(CFLAG) $(APP_CFLAG)
+LIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG)
+SHLIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG) $(SHLIB_CFLAG)
+LIBS_DEP=$(O_CRYPTO) $(O_RSAGLUE) $(O_SSL)
+
+#############################################
+HEADER=$(INCL_D)\cryptlib.h \
+        $(INCL_D)\date.h $(INCL_D)\md5_locl.h $(INCL_D)\sha_locl.h \
+        $(INCL_D)\rmd_locl.h $(INCL_D)\rmdconst.h $(INCL_D)\des_locl.h \
+        $(INCL_D)\rpc_des.h $(INCL_D)\podd.h $(INCL_D)\sk.h \
+        $(INCL_D)\spr.h $(INCL_D)\des_ver.h $(INCL_D)\rc2_locl.h \
+        $(INCL_D)\rc4_locl.h $(INCL_D)\rc5_locl.h $(INCL_D)\idea_lcl.h \
+        $(INCL_D)\bf_pi.h $(INCL_D)\bf_locl.h $(INCL_D)\cast_s.h \
+        $(INCL_D)\cast_lcl.h $(INCL_D)\bn_lcl.h $(INCL_D)\bn_prime.h \
+        $(INCL_D)\obj_dat.h $(INCL_D)\conf_lcl.h $(INCL_D)\ssl_locl.h \
+        $(INCL_D)\rsaref.h $(INCL_D)\apps.h $(INCL_D)\progs.h \
+        $(INCL_D)\s_apps.h $(INCL_D)\testdsa.h $(INCL_D)\testrsa.h
+
+EXHEADER=$(INC_D)\e_os.h \
+        $(INC_D)\crypto.h $(INC_D)\cryptall.h $(INC_D)\md2.h \
+        $(INC_D)\md5.h $(INC_D)\sha.h $(INC_D)\mdc2.h \
+        $(INC_D)\hmac.h $(INC_D)\ripemd.h $(INC_D)\des.h \
+        $(INC_D)\rc2.h $(INC_D)\rc4.h $(INC_D)\rc5.h \
+        $(INC_D)\idea.h $(INC_D)\blowfish.h $(INC_D)\cast.h \
+        $(INC_D)\bn.h $(INC_D)\rsa.h $(INC_D)\dsa.h \
+        $(INC_D)\dh.h $(INC_D)\buffer.h $(INC_D)\bio.h \
+        $(INC_D)\bss_file.c $(INC_D)\stack.h $(INC_D)\lhash.h \
+        $(INC_D)\rand.h $(INC_D)\err.h $(INC_D)\objects.h \
+        $(INC_D)\evp.h $(INC_D)\pem.h $(INC_D)\asn1.h \
+        $(INC_D)\asn1_mac.h $(INC_D)\x509.h $(INC_D)\x509_vfy.h \
+        $(INC_D)\conf.h $(INC_D)\txt_db.h $(INC_D)\pkcs7.h \
+        $(INC_D)\ssl.h $(INC_D)\ssl2.h $(INC_D)\ssl3.h \
+        $(INC_D)\ssl23.h $(INC_D)\tls1.h
+
+T_OBJ=$(OBJ_D)\md2test.obj \
+        $(OBJ_D)\md5test.obj $(OBJ_D)\shatest.obj $(OBJ_D)\sha1test.obj \
+        $(OBJ_D)\mdc2test.obj $(OBJ_D)\hmactest.obj $(OBJ_D)\rmdtest.obj \
+        $(OBJ_D)\destest.obj $(OBJ_D)\rc2test.obj $(OBJ_D)\rc4test.obj \
+        $(OBJ_D)\rc5test.obj $(OBJ_D)\ideatest.obj $(OBJ_D)\bftest.obj \
+        $(OBJ_D)\casttest.obj $(OBJ_D)\bntest.obj $(OBJ_D)\exptest.obj \
+        $(OBJ_D)\dsatest.obj $(OBJ_D)\dhtest.obj $(OBJ_D)\randtest.obj \
+        $(OBJ_D)\ssltest.obj
+
+E_OBJ=$(OBJ_D)\verify.obj \
+        $(OBJ_D)\asn1pars.obj $(OBJ_D)\req.obj $(OBJ_D)\dgst.obj \
+        $(OBJ_D)\dh.obj $(OBJ_D)\enc.obj $(OBJ_D)\gendh.obj \
+        $(OBJ_D)\errstr.obj $(OBJ_D)\ca.obj $(OBJ_D)\pkcs7.obj \
+        $(OBJ_D)\crl2p7.obj $(OBJ_D)\crl.obj $(OBJ_D)\rsa.obj \
+        $(OBJ_D)\dsa.obj $(OBJ_D)\dsaparam.obj $(OBJ_D)\x509.obj \
+        $(OBJ_D)\genrsa.obj $(OBJ_D)\s_server.obj $(OBJ_D)\s_client.obj \
+        $(OBJ_D)\speed.obj $(OBJ_D)\s_time.obj $(OBJ_D)\apps.obj \
+        $(OBJ_D)\s_cb.obj $(OBJ_D)\s_socket.obj $(OBJ_D)\version.obj \
+        $(OBJ_D)\sess_id.obj $(OBJ_D)\ciphers.obj $(OBJ_D)\ssleay.obj
+
+CRYPTOOBJ=$(OBJ_D)\cryptlib.obj \
+        $(OBJ_D)\mem.obj $(OBJ_D)\cversion.obj $(OBJ_D)\ex_data.obj \
+        $(OBJ_D)\cpt_err.obj $(OBJ_D)\md2_dgst.obj $(OBJ_D)\md2_one.obj \
+        $(OBJ_D)\md5_dgst.obj $(MD5_ASM_OBJ) $(OBJ_D)\md5_one.obj \
+        $(OBJ_D)\sha_dgst.obj $(OBJ_D)\sha1dgst.obj $(SHA1_ASM_OBJ) \
+        $(OBJ_D)\sha_one.obj $(OBJ_D)\sha1_one.obj $(OBJ_D)\mdc2dgst.obj \
+        $(OBJ_D)\mdc2_one.obj $(OBJ_D)\hmac.obj $(OBJ_D)\rmd_dgst.obj \
+        $(RMD160_ASM_OBJ) $(OBJ_D)\rmd_one.obj $(OBJ_D)\set_key.obj \
+        $(OBJ_D)\ecb_enc.obj $(OBJ_D)\cbc_enc.obj $(OBJ_D)\ecb3_enc.obj \
+        $(OBJ_D)\cfb64enc.obj $(OBJ_D)\cfb64ede.obj $(OBJ_D)\cfb_enc.obj \
+        $(OBJ_D)\ofb64ede.obj $(OBJ_D)\enc_read.obj $(OBJ_D)\enc_writ.obj \
+        $(OBJ_D)\ofb64enc.obj $(OBJ_D)\ofb_enc.obj $(OBJ_D)\str2key.obj \
+        $(OBJ_D)\pcbc_enc.obj $(OBJ_D)\qud_cksm.obj $(OBJ_D)\rand_key.obj \
+        $(DES_ENC_OBJ) $(OBJ_D)\read2pwd.obj $(OBJ_D)\fcrypt.obj \
+        $(OBJ_D)\xcbc_enc.obj $(OBJ_D)\read_pwd.obj $(OBJ_D)\rpc_enc.obj \
+        $(OBJ_D)\cbc_cksm.obj $(OBJ_D)\supp.obj $(OBJ_D)\rc2_ecb.obj \
+        $(OBJ_D)\rc2_skey.obj $(OBJ_D)\rc2_cbc.obj $(OBJ_D)\rc2cfb64.obj \
+        $(OBJ_D)\rc2ofb64.obj $(OBJ_D)\rc4_skey.obj $(RC4_ENC_OBJ) \
+        $(OBJ_D)\rc5_skey.obj $(OBJ_D)\rc5_ecb.obj $(RC5_ENC_OBJ) \
+        $(OBJ_D)\rc5cfb64.obj $(OBJ_D)\rc5ofb64.obj $(OBJ_D)\i_cbc.obj \
+        $(OBJ_D)\i_cfb64.obj $(OBJ_D)\i_ofb64.obj $(OBJ_D)\i_ecb.obj \
+        $(OBJ_D)\i_skey.obj $(OBJ_D)\bf_skey.obj $(OBJ_D)\bf_ecb.obj \
+        $(BF_ENC_OBJ) $(OBJ_D)\bf_cfb64.obj $(OBJ_D)\bf_ofb64.obj \
+        $(OBJ_D)\c_skey.obj $(OBJ_D)\c_ecb.obj $(CAST_ENC_OBJ) \
+        $(OBJ_D)\c_cfb64.obj $(OBJ_D)\c_ofb64.obj $(OBJ_D)\bn_add.obj \
+        $(OBJ_D)\bn_div.obj $(OBJ_D)\bn_exp.obj $(OBJ_D)\bn_lib.obj \
+        $(OBJ_D)\bn_mod.obj $(OBJ_D)\bn_mul.obj $(OBJ_D)\bn_print.obj \
+        $(OBJ_D)\bn_rand.obj $(OBJ_D)\bn_shift.obj $(OBJ_D)\bn_sub.obj \
+        $(OBJ_D)\bn_word.obj $(OBJ_D)\bn_blind.obj $(OBJ_D)\bn_gcd.obj \
+        $(OBJ_D)\bn_prime.obj $(OBJ_D)\bn_err.obj $(OBJ_D)\bn_sqr.obj \
+        $(BN_MULW_OBJ) $(OBJ_D)\bn_recp.obj $(OBJ_D)\bn_mont.obj \
+        $(OBJ_D)\bn_mpi.obj $(OBJ_D)\rsa_eay.obj $(OBJ_D)\rsa_gen.obj \
+        $(OBJ_D)\rsa_lib.obj $(OBJ_D)\rsa_sign.obj $(OBJ_D)\rsa_saos.obj \
+        $(OBJ_D)\rsa_err.obj $(OBJ_D)\rsa_pk1.obj $(OBJ_D)\rsa_ssl.obj \
+        $(OBJ_D)\rsa_none.obj $(OBJ_D)\dsa_gen.obj $(OBJ_D)\dsa_key.obj \
+        $(OBJ_D)\dsa_lib.obj $(OBJ_D)\dsa_vrf.obj $(OBJ_D)\dsa_sign.obj \
+        $(OBJ_D)\dsa_err.obj $(OBJ_D)\dh_gen.obj $(OBJ_D)\dh_key.obj \
+        $(OBJ_D)\dh_lib.obj $(OBJ_D)\dh_check.obj $(OBJ_D)\dh_err.obj \
+        $(OBJ_D)\buffer.obj $(OBJ_D)\buf_err.obj $(OBJ_D)\bio_lib.obj \
+        $(OBJ_D)\bio_cb.obj $(OBJ_D)\bio_err.obj $(OBJ_D)\bss_mem.obj \
+        $(OBJ_D)\bss_null.obj $(OBJ_D)\bss_fd.obj $(OBJ_D)\bss_file.obj \
+        $(OBJ_D)\bss_sock.obj $(OBJ_D)\bss_conn.obj $(OBJ_D)\bf_null.obj \
+        $(OBJ_D)\bf_buff.obj $(OBJ_D)\b_print.obj $(OBJ_D)\b_dump.obj \
+        $(OBJ_D)\b_sock.obj $(OBJ_D)\bss_acpt.obj $(OBJ_D)\bf_nbio.obj \
+        $(OBJ_D)\stack.obj $(OBJ_D)\lhash.obj $(OBJ_D)\lh_stats.obj \
+        $(OBJ_D)\md_rand.obj $(OBJ_D)\randfile.obj $(OBJ_D)\err.obj \
+        $(OBJ_D)\err_all.obj $(OBJ_D)\err_prn.obj $(OBJ_D)\obj_dat.obj \
+        $(OBJ_D)\obj_lib.obj $(OBJ_D)\obj_err.obj $(OBJ_D)\encode.obj \
+        $(OBJ_D)\digest.obj $(OBJ_D)\evp_enc.obj $(OBJ_D)\evp_key.obj \
+        $(OBJ_D)\e_ecb_d.obj $(OBJ_D)\e_cbc_d.obj $(OBJ_D)\e_cfb_d.obj \
+        $(OBJ_D)\e_ofb_d.obj $(OBJ_D)\e_ecb_i.obj $(OBJ_D)\e_cbc_i.obj \
+        $(OBJ_D)\e_cfb_i.obj $(OBJ_D)\e_ofb_i.obj $(OBJ_D)\e_ecb_3d.obj \
+        $(OBJ_D)\e_cbc_3d.obj $(OBJ_D)\e_rc4.obj $(OBJ_D)\names.obj \
+        $(OBJ_D)\e_cfb_3d.obj $(OBJ_D)\e_ofb_3d.obj $(OBJ_D)\e_xcbc_d.obj \
+        $(OBJ_D)\e_ecb_r2.obj $(OBJ_D)\e_cbc_r2.obj $(OBJ_D)\e_cfb_r2.obj \
+        $(OBJ_D)\e_ofb_r2.obj $(OBJ_D)\e_ecb_bf.obj $(OBJ_D)\e_cbc_bf.obj \
+        $(OBJ_D)\e_cfb_bf.obj $(OBJ_D)\e_ofb_bf.obj $(OBJ_D)\e_ecb_c.obj \
+        $(OBJ_D)\e_cbc_c.obj $(OBJ_D)\e_cfb_c.obj $(OBJ_D)\e_ofb_c.obj \
+        $(OBJ_D)\e_ecb_r5.obj $(OBJ_D)\e_cbc_r5.obj $(OBJ_D)\e_cfb_r5.obj \
+        $(OBJ_D)\e_ofb_r5.obj $(OBJ_D)\m_null.obj $(OBJ_D)\m_md2.obj \
+        $(OBJ_D)\m_md5.obj $(OBJ_D)\m_sha.obj $(OBJ_D)\m_sha1.obj \
+        $(OBJ_D)\m_dss.obj $(OBJ_D)\m_dss1.obj $(OBJ_D)\m_mdc2.obj \
+        $(OBJ_D)\m_ripemd.obj $(OBJ_D)\p_open.obj $(OBJ_D)\p_seal.obj \
+        $(OBJ_D)\p_sign.obj $(OBJ_D)\p_verify.obj $(OBJ_D)\p_lib.obj \
+        $(OBJ_D)\p_enc.obj $(OBJ_D)\p_dec.obj $(OBJ_D)\bio_md.obj \
+        $(OBJ_D)\bio_b64.obj $(OBJ_D)\bio_enc.obj $(OBJ_D)\evp_err.obj \
+        $(OBJ_D)\e_null.obj $(OBJ_D)\c_all.obj $(OBJ_D)\evp_lib.obj \
+        $(OBJ_D)\pem_sign.obj $(OBJ_D)\pem_seal.obj $(OBJ_D)\pem_info.obj \
+        $(OBJ_D)\pem_lib.obj $(OBJ_D)\pem_all.obj $(OBJ_D)\pem_err.obj \
+        $(OBJ_D)\a_object.obj $(OBJ_D)\a_bitstr.obj $(OBJ_D)\a_utctm.obj \
+        $(OBJ_D)\a_int.obj $(OBJ_D)\a_octet.obj $(OBJ_D)\a_print.obj \
+        $(OBJ_D)\a_type.obj $(OBJ_D)\a_set.obj $(OBJ_D)\a_dup.obj \
+        $(OBJ_D)\a_d2i_fp.obj $(OBJ_D)\a_i2d_fp.obj $(OBJ_D)\a_sign.obj \
+        $(OBJ_D)\a_digest.obj $(OBJ_D)\a_verify.obj $(OBJ_D)\x_algor.obj \
+        $(OBJ_D)\x_val.obj $(OBJ_D)\x_pubkey.obj $(OBJ_D)\x_sig.obj \
+        $(OBJ_D)\x_req.obj $(OBJ_D)\x_attrib.obj $(OBJ_D)\x_name.obj \
+        $(OBJ_D)\x_cinf.obj $(OBJ_D)\x_x509.obj $(OBJ_D)\x_crl.obj \
+        $(OBJ_D)\x_info.obj $(OBJ_D)\x_spki.obj $(OBJ_D)\d2i_r_pr.obj \
+        $(OBJ_D)\i2d_r_pr.obj $(OBJ_D)\d2i_r_pu.obj $(OBJ_D)\i2d_r_pu.obj \
+        $(OBJ_D)\d2i_s_pr.obj $(OBJ_D)\i2d_s_pr.obj $(OBJ_D)\d2i_s_pu.obj \
+        $(OBJ_D)\i2d_s_pu.obj $(OBJ_D)\d2i_pu.obj $(OBJ_D)\d2i_pr.obj \
+        $(OBJ_D)\i2d_pu.obj $(OBJ_D)\i2d_pr.obj $(OBJ_D)\t_req.obj \
+        $(OBJ_D)\t_x509.obj $(OBJ_D)\t_pkey.obj $(OBJ_D)\p7_i_s.obj \
+        $(OBJ_D)\p7_signi.obj $(OBJ_D)\p7_signd.obj $(OBJ_D)\p7_recip.obj \
+        $(OBJ_D)\p7_enc_c.obj $(OBJ_D)\p7_evp.obj $(OBJ_D)\p7_dgst.obj \
+        $(OBJ_D)\p7_s_e.obj $(OBJ_D)\p7_enc.obj $(OBJ_D)\p7_lib.obj \
+        $(OBJ_D)\f_int.obj $(OBJ_D)\f_string.obj $(OBJ_D)\i2d_dhp.obj \
+        $(OBJ_D)\i2d_dsap.obj $(OBJ_D)\d2i_dhp.obj $(OBJ_D)\d2i_dsap.obj \
+        $(OBJ_D)\n_pkey.obj $(OBJ_D)\a_hdr.obj $(OBJ_D)\x_pkey.obj \
+        $(OBJ_D)\a_bool.obj $(OBJ_D)\x_exten.obj $(OBJ_D)\asn1_par.obj \
+        $(OBJ_D)\asn1_lib.obj $(OBJ_D)\asn1_err.obj $(OBJ_D)\a_meth.obj \
+        $(OBJ_D)\a_bytes.obj $(OBJ_D)\evp_asn1.obj $(OBJ_D)\x509_def.obj \
+        $(OBJ_D)\x509_d2.obj $(OBJ_D)\x509_r2x.obj $(OBJ_D)\x509_cmp.obj \
+        $(OBJ_D)\x509_obj.obj $(OBJ_D)\x509_req.obj $(OBJ_D)\x509_vfy.obj \
+        $(OBJ_D)\x509_set.obj $(OBJ_D)\x509rset.obj $(OBJ_D)\x509_err.obj \
+        $(OBJ_D)\x509name.obj $(OBJ_D)\x509_v3.obj $(OBJ_D)\x509_ext.obj \
+        $(OBJ_D)\x509pack.obj $(OBJ_D)\x509type.obj $(OBJ_D)\x509_lu.obj \
+        $(OBJ_D)\x_all.obj $(OBJ_D)\x509_txt.obj $(OBJ_D)\by_file.obj \
+        $(OBJ_D)\by_dir.obj $(OBJ_D)\v3_net.obj $(OBJ_D)\v3_x509.obj \
+        $(OBJ_D)\conf.obj $(OBJ_D)\conf_err.obj $(OBJ_D)\txt_db.obj \
+        $(OBJ_D)\pk7_lib.obj $(OBJ_D)\pkcs7err.obj $(OBJ_D)\pk7_doit.obj
+
+SSLOBJ=$(OBJ_D)\s2_meth.obj \
+        $(OBJ_D)\s2_srvr.obj $(OBJ_D)\s2_clnt.obj $(OBJ_D)\s2_lib.obj \
+        $(OBJ_D)\s2_enc.obj $(OBJ_D)\s2_pkt.obj $(OBJ_D)\s3_meth.obj \
+        $(OBJ_D)\s3_srvr.obj $(OBJ_D)\s3_clnt.obj $(OBJ_D)\s3_lib.obj \
+        $(OBJ_D)\s3_enc.obj $(OBJ_D)\s3_pkt.obj $(OBJ_D)\s3_both.obj \
+        $(OBJ_D)\s23_meth.obj $(OBJ_D)\s23_srvr.obj $(OBJ_D)\s23_clnt.obj \
+        $(OBJ_D)\s23_lib.obj $(OBJ_D)\s23_pkt.obj $(OBJ_D)\t1_meth.obj \
+        $(OBJ_D)\t1_srvr.obj $(OBJ_D)\t1_clnt.obj $(OBJ_D)\t1_lib.obj \
+        $(OBJ_D)\t1_enc.obj $(OBJ_D)\ssl_lib.obj $(OBJ_D)\ssl_err2.obj \
+        $(OBJ_D)\ssl_cert.obj $(OBJ_D)\ssl_sess.obj $(OBJ_D)\ssl_ciph.obj \
+        $(OBJ_D)\ssl_stat.obj $(OBJ_D)\ssl_rsa.obj $(OBJ_D)\ssl_asn1.obj \
+        $(OBJ_D)\ssl_txt.obj $(OBJ_D)\ssl_algs.obj $(OBJ_D)\bio_ssl.obj \
+        $(OBJ_D)\ssl_err.obj
+
+RSAGLUEOBJ=$(OBJ_D)\rsaref.obj \
+        $(OBJ_D)\rsar_err.obj
+
+T_EXE=$(TEST_D)\md2test.exe \
+        $(TEST_D)\md5test.exe $(TEST_D)\shatest.exe $(TEST_D)\sha1test.exe \
+        $(TEST_D)\mdc2test.exe $(TEST_D)\hmactest.exe $(TEST_D)\rmdtest.exe \
+        $(TEST_D)\destest.exe $(TEST_D)\rc2test.exe $(TEST_D)\rc4test.exe \
+        $(TEST_D)\rc5test.exe $(TEST_D)\ideatest.exe $(TEST_D)\bftest.exe \
+        $(TEST_D)\casttest.exe $(TEST_D)\bntest.exe $(TEST_D)\exptest.exe \
+        $(TEST_D)\dsatest.exe $(TEST_D)\dhtest.exe $(TEST_D)\randtest.exe \
+        $(TEST_D)\ssltest.exe
+
+###################################################################
+all: banner $(TMP_D) $(BIN_D) $(TEST_D) $(LIB_D) $(INC_D) headers lib exe
+
+banner:
+
+
+$(TMP_D):
+        $(MKDIR) $(TMP_D)
+
+$(BIN_D):
+        $(MKDIR) $(BIN_D)
+
+$(TEST_D):
+        $(MKDIR) $(TEST_D)
+
+$(LIB_D):
+        $(MKDIR) $(LIB_D)
+
+$(INC_D):
+        $(MKDIR) $(INC_D)
+
+headers: $(HEADER) $(EXHEADER)
+
+lib: $(LIBS_DEP)
+
+exe: $(T_EXE) $(BIN_D)\$(E_EXE).exe
+
+install:
+        $(MKDIR) $(INSTALLTOP)
+        $(MKDIR) $(INSTALLTOP)\bin
+        $(MKDIR) $(INSTALLTOP)\include
+        $(MKDIR) $(INSTALLTOP)\lib
+        $(CP) $(INC_D)\*.[ch] $(INSTALLTOP)\include
+        $(CP) $(BIN_D)\$(E_EXE).exe $(INSTALLTOP)\bin
+        $(CP) $(O_SSL) $(INSTALLTOP)\lib
+        $(CP) $(O_CRYPTO) $(INSTALLTOP)\lib
+
+clean:
+        $(RM) $(TMP_D)\*.*
+
+vclean:
+        $(RM) $(TMP_D)\*.*
+        $(RM) $(OUT_D)\*.*
+
+$(INCL_D)\cryptlib.h: $(SRC_D)\crypto\cryptlib.h
+        $(CP) $(SRC_D)\crypto\cryptlib.h $(INCL_D)\cryptlib.h
+
+$(INCL_D)\date.h: $(SRC_D)\crypto\date.h
+        $(CP) $(SRC_D)\crypto\date.h $(INCL_D)\date.h
+
+$(INCL_D)\md5_locl.h: $(SRC_D)\crypto\md5\md5_locl.h
+        $(CP) $(SRC_D)\crypto\md5\md5_locl.h $(INCL_D)\md5_locl.h
+
+$(INCL_D)\sha_locl.h: $(SRC_D)\crypto\sha\sha_locl.h
+        $(CP) $(SRC_D)\crypto\sha\sha_locl.h $(INCL_D)\sha_locl.h
+
+$(INCL_D)\rmd_locl.h: $(SRC_D)\crypto\ripemd\rmd_locl.h
+        $(CP) $(SRC_D)\crypto\ripemd\rmd_locl.h $(INCL_D)\rmd_locl.h
+
+$(INCL_D)\rmdconst.h: $(SRC_D)\crypto\ripemd\rmdconst.h
+        $(CP) $(SRC_D)\crypto\ripemd\rmdconst.h $(INCL_D)\rmdconst.h
+
+$(INCL_D)\des_locl.h: $(SRC_D)\crypto\des\des_locl.h
+        $(CP) $(SRC_D)\crypto\des\des_locl.h $(INCL_D)\des_locl.h
+
+$(INCL_D)\rpc_des.h: $(SRC_D)\crypto\des\rpc_des.h
+        $(CP) $(SRC_D)\crypto\des\rpc_des.h $(INCL_D)\rpc_des.h
+
+$(INCL_D)\podd.h: $(SRC_D)\crypto\des\podd.h
+        $(CP) $(SRC_D)\crypto\des\podd.h $(INCL_D)\podd.h
+
+$(INCL_D)\sk.h: $(SRC_D)\crypto\des\sk.h
+        $(CP) $(SRC_D)\crypto\des\sk.h $(INCL_D)\sk.h
+
+$(INCL_D)\spr.h: $(SRC_D)\crypto\des\spr.h
+        $(CP) $(SRC_D)\crypto\des\spr.h $(INCL_D)\spr.h
+
+$(INCL_D)\des_ver.h: $(SRC_D)\crypto\des\des_ver.h
+        $(CP) $(SRC_D)\crypto\des\des_ver.h $(INCL_D)\des_ver.h
+
+$(INCL_D)\rc2_locl.h: $(SRC_D)\crypto\rc2\rc2_locl.h
+        $(CP) $(SRC_D)\crypto\rc2\rc2_locl.h $(INCL_D)\rc2_locl.h
+
+$(INCL_D)\rc4_locl.h: $(SRC_D)\crypto\rc4\rc4_locl.h
+        $(CP) $(SRC_D)\crypto\rc4\rc4_locl.h $(INCL_D)\rc4_locl.h
+
+$(INCL_D)\rc5_locl.h: $(SRC_D)\crypto\rc5\rc5_locl.h
+        $(CP) $(SRC_D)\crypto\rc5\rc5_locl.h $(INCL_D)\rc5_locl.h
+
+$(INCL_D)\idea_lcl.h: $(SRC_D)\crypto\idea\idea_lcl.h
+        $(CP) $(SRC_D)\crypto\idea\idea_lcl.h $(INCL_D)\idea_lcl.h
+
+$(INCL_D)\bf_pi.h: $(SRC_D)\crypto\bf\bf_pi.h
+        $(CP) $(SRC_D)\crypto\bf\bf_pi.h $(INCL_D)\bf_pi.h
+
+$(INCL_D)\bf_locl.h: $(SRC_D)\crypto\bf\bf_locl.h
+        $(CP) $(SRC_D)\crypto\bf\bf_locl.h $(INCL_D)\bf_locl.h
+
+$(INCL_D)\cast_s.h: $(SRC_D)\crypto\cast\cast_s.h
+        $(CP) $(SRC_D)\crypto\cast\cast_s.h $(INCL_D)\cast_s.h
+
+$(INCL_D)\cast_lcl.h: $(SRC_D)\crypto\cast\cast_lcl.h
+        $(CP) $(SRC_D)\crypto\cast\cast_lcl.h $(INCL_D)\cast_lcl.h
+
+$(INCL_D)\bn_lcl.h: $(SRC_D)\crypto\bn\bn_lcl.h
+        $(CP) $(SRC_D)\crypto\bn\bn_lcl.h $(INCL_D)\bn_lcl.h
+
+$(INCL_D)\bn_prime.h: $(SRC_D)\crypto\bn\bn_prime.h
+        $(CP) $(SRC_D)\crypto\bn\bn_prime.h $(INCL_D)\bn_prime.h
+
+$(INCL_D)\obj_dat.h: $(SRC_D)\crypto\objects\obj_dat.h
+        $(CP) $(SRC_D)\crypto\objects\obj_dat.h $(INCL_D)\obj_dat.h
+
+$(INCL_D)\conf_lcl.h: $(SRC_D)\crypto\conf\conf_lcl.h
+        $(CP) $(SRC_D)\crypto\conf\conf_lcl.h $(INCL_D)\conf_lcl.h
+
+$(INCL_D)\ssl_locl.h: $(SRC_D)\ssl\ssl_locl.h
+        $(CP) $(SRC_D)\ssl\ssl_locl.h $(INCL_D)\ssl_locl.h
+
+$(INCL_D)\rsaref.h: $(SRC_D)\rsaref\rsaref.h
+        $(CP) $(SRC_D)\rsaref\rsaref.h $(INCL_D)\rsaref.h
+
+$(INCL_D)\apps.h: $(SRC_D)\apps\apps.h
+        $(CP) $(SRC_D)\apps\apps.h $(INCL_D)\apps.h
+
+$(INCL_D)\progs.h: $(SRC_D)\apps\progs.h
+        $(CP) $(SRC_D)\apps\progs.h $(INCL_D)\progs.h
+
+$(INCL_D)\s_apps.h: $(SRC_D)\apps\s_apps.h
+        $(CP) $(SRC_D)\apps\s_apps.h $(INCL_D)\s_apps.h
+
+$(INCL_D)\testdsa.h: $(SRC_D)\apps\testdsa.h
+        $(CP) $(SRC_D)\apps\testdsa.h $(INCL_D)\testdsa.h
+
+$(INCL_D)\testrsa.h: $(SRC_D)\apps\testrsa.h
+        $(CP) $(SRC_D)\apps\testrsa.h $(INCL_D)\testrsa.h
+
+$(INC_D)\e_os.h: $(SRC_D)\.\e_os.h
+        $(CP) $(SRC_D)\.\e_os.h $(INC_D)\e_os.h
+
+$(INC_D)\crypto.h: $(SRC_D)\crypto\crypto.h
+        $(CP) $(SRC_D)\crypto\crypto.h $(INC_D)\crypto.h
+
+$(INC_D)\cryptall.h: $(SRC_D)\crypto\cryptall.h
+        $(CP) $(SRC_D)\crypto\cryptall.h $(INC_D)\cryptall.h
+
+$(INC_D)\md2.h: $(SRC_D)\crypto\md2\md2.h
+        $(CP) $(SRC_D)\crypto\md2\md2.h $(INC_D)\md2.h
+
+$(INC_D)\md5.h: $(SRC_D)\crypto\md5\md5.h
+        $(CP) $(SRC_D)\crypto\md5\md5.h $(INC_D)\md5.h
+
+$(INC_D)\sha.h: $(SRC_D)\crypto\sha\sha.h
+        $(CP) $(SRC_D)\crypto\sha\sha.h $(INC_D)\sha.h
+
+$(INC_D)\mdc2.h: $(SRC_D)\crypto\mdc2\mdc2.h
+        $(CP) $(SRC_D)\crypto\mdc2\mdc2.h $(INC_D)\mdc2.h
+
+$(INC_D)\hmac.h: $(SRC_D)\crypto\hmac\hmac.h
+        $(CP) $(SRC_D)\crypto\hmac\hmac.h $(INC_D)\hmac.h
+
+$(INC_D)\ripemd.h: $(SRC_D)\crypto\ripemd\ripemd.h
+        $(CP) $(SRC_D)\crypto\ripemd\ripemd.h $(INC_D)\ripemd.h
+
+$(INC_D)\des.h: $(SRC_D)\crypto\des\des.h
+        $(CP) $(SRC_D)\crypto\des\des.h $(INC_D)\des.h
+
+$(INC_D)\rc2.h: $(SRC_D)\crypto\rc2\rc2.h
+        $(CP) $(SRC_D)\crypto\rc2\rc2.h $(INC_D)\rc2.h
+
+$(INC_D)\rc4.h: $(SRC_D)\crypto\rc4\rc4.h
+        $(CP) $(SRC_D)\crypto\rc4\rc4.h $(INC_D)\rc4.h
+
+$(INC_D)\rc5.h: $(SRC_D)\crypto\rc5\rc5.h
+        $(CP) $(SRC_D)\crypto\rc5\rc5.h $(INC_D)\rc5.h
+
+$(INC_D)\idea.h: $(SRC_D)\crypto\idea\idea.h
+        $(CP) $(SRC_D)\crypto\idea\idea.h $(INC_D)\idea.h
+
+$(INC_D)\blowfish.h: $(SRC_D)\crypto\bf\blowfish.h
+        $(CP) $(SRC_D)\crypto\bf\blowfish.h $(INC_D)\blowfish.h
+
+$(INC_D)\cast.h: $(SRC_D)\crypto\cast\cast.h
+        $(CP) $(SRC_D)\crypto\cast\cast.h $(INC_D)\cast.h
+
+$(INC_D)\bn.h: $(SRC_D)\crypto\bn\bn.h
+        $(CP) $(SRC_D)\crypto\bn\bn.h $(INC_D)\bn.h
+
+$(INC_D)\rsa.h: $(SRC_D)\crypto\rsa\rsa.h
+        $(CP) $(SRC_D)\crypto\rsa\rsa.h $(INC_D)\rsa.h
+
+$(INC_D)\dsa.h: $(SRC_D)\crypto\dsa\dsa.h
+        $(CP) $(SRC_D)\crypto\dsa\dsa.h $(INC_D)\dsa.h
+
+$(INC_D)\dh.h: $(SRC_D)\crypto\dh\dh.h
+        $(CP) $(SRC_D)\crypto\dh\dh.h $(INC_D)\dh.h
+
+$(INC_D)\buffer.h: $(SRC_D)\crypto\buffer\buffer.h
+        $(CP) $(SRC_D)\crypto\buffer\buffer.h $(INC_D)\buffer.h
+
+$(INC_D)\bio.h: $(SRC_D)\crypto\bio\bio.h
+        $(CP) $(SRC_D)\crypto\bio\bio.h $(INC_D)\bio.h
+
+$(INC_D)\bss_file.c: $(SRC_D)\crypto\bio\bss_file.c
+        $(CP) $(SRC_D)\crypto\bio\bss_file.c $(INC_D)\bss_file.c
+
+$(INC_D)\stack.h: $(SRC_D)\crypto\stack\stack.h
+        $(CP) $(SRC_D)\crypto\stack\stack.h $(INC_D)\stack.h
+
+$(INC_D)\lhash.h: $(SRC_D)\crypto\lhash\lhash.h
+        $(CP) $(SRC_D)\crypto\lhash\lhash.h $(INC_D)\lhash.h
+
+$(INC_D)\rand.h: $(SRC_D)\crypto\rand\rand.h
+        $(CP) $(SRC_D)\crypto\rand\rand.h $(INC_D)\rand.h
+
+$(INC_D)\err.h: $(SRC_D)\crypto\err\err.h
+        $(CP) $(SRC_D)\crypto\err\err.h $(INC_D)\err.h
+
+$(INC_D)\objects.h: $(SRC_D)\crypto\objects\objects.h
+        $(CP) $(SRC_D)\crypto\objects\objects.h $(INC_D)\objects.h
+
+$(INC_D)\evp.h: $(SRC_D)\crypto\evp\evp.h
+        $(CP) $(SRC_D)\crypto\evp\evp.h $(INC_D)\evp.h
+
+$(INC_D)\pem.h: $(SRC_D)\crypto\pem\pem.h
+        $(CP) $(SRC_D)\crypto\pem\pem.h $(INC_D)\pem.h
+
+$(INC_D)\asn1.h: $(SRC_D)\crypto\asn1\asn1.h
+        $(CP) $(SRC_D)\crypto\asn1\asn1.h $(INC_D)\asn1.h
+
+$(INC_D)\asn1_mac.h: $(SRC_D)\crypto\asn1\asn1_mac.h
+        $(CP) $(SRC_D)\crypto\asn1\asn1_mac.h $(INC_D)\asn1_mac.h
+
+$(INC_D)\x509.h: $(SRC_D)\crypto\x509\x509.h
+        $(CP) $(SRC_D)\crypto\x509\x509.h $(INC_D)\x509.h
+
+$(INC_D)\x509_vfy.h: $(SRC_D)\crypto\x509\x509_vfy.h
+        $(CP) $(SRC_D)\crypto\x509\x509_vfy.h $(INC_D)\x509_vfy.h
+
+$(INC_D)\conf.h: $(SRC_D)\crypto\conf\conf.h
+        $(CP) $(SRC_D)\crypto\conf\conf.h $(INC_D)\conf.h
+
+$(INC_D)\txt_db.h: $(SRC_D)\crypto\txt_db\txt_db.h
+        $(CP) $(SRC_D)\crypto\txt_db\txt_db.h $(INC_D)\txt_db.h
+
+$(INC_D)\pkcs7.h: $(SRC_D)\crypto\pkcs7\pkcs7.h
+        $(CP) $(SRC_D)\crypto\pkcs7\pkcs7.h $(INC_D)\pkcs7.h
+
+$(INC_D)\ssl.h: $(SRC_D)\ssl\ssl.h
+        $(CP) $(SRC_D)\ssl\ssl.h $(INC_D)\ssl.h
+
+$(INC_D)\ssl2.h: $(SRC_D)\ssl\ssl2.h
+        $(CP) $(SRC_D)\ssl\ssl2.h $(INC_D)\ssl2.h
+
+$(INC_D)\ssl3.h: $(SRC_D)\ssl\ssl3.h
+        $(CP) $(SRC_D)\ssl\ssl3.h $(INC_D)\ssl3.h
+
+$(INC_D)\ssl23.h: $(SRC_D)\ssl\ssl23.h
+        $(CP) $(SRC_D)\ssl\ssl23.h $(INC_D)\ssl23.h
+
+$(INC_D)\tls1.h: $(SRC_D)\ssl\tls1.h
+        $(CP) $(SRC_D)\ssl\tls1.h $(INC_D)\tls1.h
+
+$(OBJ_D)\md2test.obj: $(SRC_D)\crypto\md2\md2test.c
+        $(CC) /Fo$(OBJ_D)\md2test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\md2\md2test.c
+
+$(OBJ_D)\md5test.obj: $(SRC_D)\crypto\md5\md5test.c
+        $(CC) /Fo$(OBJ_D)\md5test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\md5\md5test.c
+
+$(OBJ_D)\shatest.obj: $(SRC_D)\crypto\sha\shatest.c
+        $(CC) /Fo$(OBJ_D)\shatest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\sha\shatest.c
+
+$(OBJ_D)\sha1test.obj: $(SRC_D)\crypto\sha\sha1test.c
+        $(CC) /Fo$(OBJ_D)\sha1test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\sha\sha1test.c
+
+$(OBJ_D)\mdc2test.obj: $(SRC_D)\crypto\mdc2\mdc2test.c
+        $(CC) /Fo$(OBJ_D)\mdc2test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\mdc2\mdc2test.c
+
+$(OBJ_D)\hmactest.obj: $(SRC_D)\crypto\hmac\hmactest.c
+        $(CC) /Fo$(OBJ_D)\hmactest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\hmac\hmactest.c
+
+$(OBJ_D)\rmdtest.obj: $(SRC_D)\crypto\ripemd\rmdtest.c
+        $(CC) /Fo$(OBJ_D)\rmdtest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\ripemd\rmdtest.c
+
+$(OBJ_D)\destest.obj: $(SRC_D)\crypto\des\destest.c
+        $(CC) /Fo$(OBJ_D)\destest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\des\destest.c
+
+$(OBJ_D)\rc2test.obj: $(SRC_D)\crypto\rc2\rc2test.c
+        $(CC) /Fo$(OBJ_D)\rc2test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2test.c
+
+$(OBJ_D)\rc4test.obj: $(SRC_D)\crypto\rc4\rc4test.c
+        $(CC) /Fo$(OBJ_D)\rc4test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rc4\rc4test.c
+
+$(OBJ_D)\rc5test.obj: $(SRC_D)\crypto\rc5\rc5test.c
+        $(CC) /Fo$(OBJ_D)\rc5test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5test.c
+
+$(OBJ_D)\ideatest.obj: $(SRC_D)\crypto\idea\ideatest.c
+        $(CC) /Fo$(OBJ_D)\ideatest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\idea\ideatest.c
+
+$(OBJ_D)\bftest.obj: $(SRC_D)\crypto\bf\bftest.c
+        $(CC) /Fo$(OBJ_D)\bftest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\bf\bftest.c
+
+$(OBJ_D)\casttest.obj: $(SRC_D)\crypto\cast\casttest.c
+        $(CC) /Fo$(OBJ_D)\casttest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\cast\casttest.c
+
+$(OBJ_D)\bntest.obj: $(SRC_D)\crypto\bn\bntest.c
+        $(CC) /Fo$(OBJ_D)\bntest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\bn\bntest.c
+
+$(OBJ_D)\exptest.obj: $(SRC_D)\crypto\bn\exptest.c
+        $(CC) /Fo$(OBJ_D)\exptest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\bn\exptest.c
+
+$(OBJ_D)\dsatest.obj: $(SRC_D)\crypto\dsa\dsatest.c
+        $(CC) /Fo$(OBJ_D)\dsatest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\dsa\dsatest.c
+
+$(OBJ_D)\dhtest.obj: $(SRC_D)\crypto\dh\dhtest.c
+        $(CC) /Fo$(OBJ_D)\dhtest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\dh\dhtest.c
+
+$(OBJ_D)\randtest.obj: $(SRC_D)\crypto\rand\randtest.c
+        $(CC) /Fo$(OBJ_D)\randtest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rand\randtest.c
+
+$(OBJ_D)\ssltest.obj: $(SRC_D)\ssl\ssltest.c
+        $(CC) /Fo$(OBJ_D)\ssltest.obj $(APP_CFLAGS) -c $(SRC_D)\ssl\ssltest.c
+
+$(OBJ_D)\verify.obj: $(SRC_D)\apps\verify.c
+        $(CC) /Fo$(OBJ_D)\verify.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\verify.c
+
+$(OBJ_D)\asn1pars.obj: $(SRC_D)\apps\asn1pars.c
+        $(CC) /Fo$(OBJ_D)\asn1pars.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\asn1pars.c
+
+$(OBJ_D)\req.obj: $(SRC_D)\apps\req.c
+        $(CC) /Fo$(OBJ_D)\req.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\req.c
+
+$(OBJ_D)\dgst.obj: $(SRC_D)\apps\dgst.c
+        $(CC) /Fo$(OBJ_D)\dgst.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dgst.c
+
+$(OBJ_D)\dh.obj: $(SRC_D)\apps\dh.c
+        $(CC) /Fo$(OBJ_D)\dh.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dh.c
+
+$(OBJ_D)\enc.obj: $(SRC_D)\apps\enc.c
+        $(CC) /Fo$(OBJ_D)\enc.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\enc.c
+
+$(OBJ_D)\gendh.obj: $(SRC_D)\apps\gendh.c
+        $(CC) /Fo$(OBJ_D)\gendh.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\gendh.c
+
+$(OBJ_D)\errstr.obj: $(SRC_D)\apps\errstr.c
+        $(CC) /Fo$(OBJ_D)\errstr.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\errstr.c
+
+$(OBJ_D)\ca.obj: $(SRC_D)\apps\ca.c
+        $(CC) /Fo$(OBJ_D)\ca.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\ca.c
+
+$(OBJ_D)\pkcs7.obj: $(SRC_D)\apps\pkcs7.c
+        $(CC) /Fo$(OBJ_D)\pkcs7.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\pkcs7.c
+
+$(OBJ_D)\crl2p7.obj: $(SRC_D)\apps\crl2p7.c
+        $(CC) /Fo$(OBJ_D)\crl2p7.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\crl2p7.c
+
+$(OBJ_D)\crl.obj: $(SRC_D)\apps\crl.c
+        $(CC) /Fo$(OBJ_D)\crl.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\crl.c
+
+$(OBJ_D)\rsa.obj: $(SRC_D)\apps\rsa.c
+        $(CC) /Fo$(OBJ_D)\rsa.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\rsa.c
+
+$(OBJ_D)\dsa.obj: $(SRC_D)\apps\dsa.c
+        $(CC) /Fo$(OBJ_D)\dsa.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dsa.c
+
+$(OBJ_D)\dsaparam.obj: $(SRC_D)\apps\dsaparam.c
+        $(CC) /Fo$(OBJ_D)\dsaparam.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dsaparam.c
+
+$(OBJ_D)\x509.obj: $(SRC_D)\apps\x509.c
+        $(CC) /Fo$(OBJ_D)\x509.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\x509.c
+
+$(OBJ_D)\genrsa.obj: $(SRC_D)\apps\genrsa.c
+        $(CC) /Fo$(OBJ_D)\genrsa.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\genrsa.c
+
+$(OBJ_D)\s_server.obj: $(SRC_D)\apps\s_server.c
+        $(CC) /Fo$(OBJ_D)\s_server.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_server.c
+
+$(OBJ_D)\s_client.obj: $(SRC_D)\apps\s_client.c
+        $(CC) /Fo$(OBJ_D)\s_client.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_client.c
+
+$(OBJ_D)\speed.obj: $(SRC_D)\apps\speed.c
+        $(CC) /Fo$(OBJ_D)\speed.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\speed.c
+
+$(OBJ_D)\s_time.obj: $(SRC_D)\apps\s_time.c
+        $(CC) /Fo$(OBJ_D)\s_time.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_time.c
+
+$(OBJ_D)\apps.obj: $(SRC_D)\apps\apps.c
+        $(CC) /Fo$(OBJ_D)\apps.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\apps.c
+
+$(OBJ_D)\s_cb.obj: $(SRC_D)\apps\s_cb.c
+        $(CC) /Fo$(OBJ_D)\s_cb.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_cb.c
+
+$(OBJ_D)\s_socket.obj: $(SRC_D)\apps\s_socket.c
+        $(CC) /Fo$(OBJ_D)\s_socket.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_socket.c
+
+$(OBJ_D)\version.obj: $(SRC_D)\apps\version.c
+        $(CC) /Fo$(OBJ_D)\version.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\version.c
+
+$(OBJ_D)\sess_id.obj: $(SRC_D)\apps\sess_id.c
+        $(CC) /Fo$(OBJ_D)\sess_id.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\sess_id.c
+
+$(OBJ_D)\ciphers.obj: $(SRC_D)\apps\ciphers.c
+        $(CC) /Fo$(OBJ_D)\ciphers.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\ciphers.c
+
+$(OBJ_D)\ssleay.obj: $(SRC_D)\apps\ssleay.c
+        $(CC) /Fo$(OBJ_D)\ssleay.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\ssleay.c
+
+crypto\bn\asm\bn-win32.obj: crypto\bn\asm\bn-win32.asm
+        $(ASM) /Focrypto\bn\asm\bn-win32.obj $(SRC_D)\crypto\bn\asm\bn-win32.asm
+
+crypto\des\asm\d-win32.obj: crypto\des\asm\d-win32.asm
+        $(ASM) /Focrypto\des\asm\d-win32.obj $(SRC_D)\crypto\des\asm\d-win32.asm
+
+crypto\des\asm\y-win32.obj: crypto\des\asm\y-win32.asm
+        $(ASM) /Focrypto\des\asm\y-win32.obj $(SRC_D)\crypto\des\asm\y-win32.asm
+
+crypto\bf\asm\b-win32.obj: crypto\bf\asm\b-win32.asm
+        $(ASM) /Focrypto\bf\asm\b-win32.obj $(SRC_D)\crypto\bf\asm\b-win32.asm
+
+crypto\cast\asm\c-win32.obj: crypto\cast\asm\c-win32.asm
+        $(ASM) /Focrypto\cast\asm\c-win32.obj $(SRC_D)\crypto\cast\asm\c-win32.asm
+
+crypto\rc4\asm\r4-win32.obj: crypto\rc4\asm\r4-win32.asm
+        $(ASM) /Focrypto\rc4\asm\r4-win32.obj $(SRC_D)\crypto\rc4\asm\r4-win32.asm
+
+crypto\rc5\asm\r5-win32.obj: crypto\rc5\asm\r5-win32.asm
+        $(ASM) /Focrypto\rc5\asm\r5-win32.obj $(SRC_D)\crypto\rc5\asm\r5-win32.asm
+
+crypto\md5\asm\m5-win32.obj: crypto\md5\asm\m5-win32.asm
+        $(ASM) /Focrypto\md5\asm\m5-win32.obj $(SRC_D)\crypto\md5\asm\m5-win32.asm
+
+crypto\sha\asm\s1-win32.obj: crypto\sha\asm\s1-win32.asm
+        $(ASM) /Focrypto\sha\asm\s1-win32.obj $(SRC_D)\crypto\sha\asm\s1-win32.asm
+
+crypto\ripemd\asm\rm-win32.obj: crypto\ripemd\asm\rm-win32.asm
+        $(ASM) /Focrypto\ripemd\asm\rm-win32.obj $(SRC_D)\crypto\ripemd\asm\rm-win32.asm
+
+$(OBJ_D)\cryptlib.obj: $(SRC_D)\crypto\cryptlib.c
+        $(CC) /Fo$(OBJ_D)\cryptlib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cryptlib.c
+
+$(OBJ_D)\mem.obj: $(SRC_D)\crypto\mem.c
+        $(CC) /Fo$(OBJ_D)\mem.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\mem.c
+
+$(OBJ_D)\cversion.obj: $(SRC_D)\crypto\cversion.c
+        $(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DCFLAGS="\"$(CC) $(CFLAG)\"" -c $(SRC_D)\crypto\cversion.c
+
+$(OBJ_D)\ex_data.obj: $(SRC_D)\crypto\ex_data.c
+        $(CC) /Fo$(OBJ_D)\ex_data.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\ex_data.c
+
+$(OBJ_D)\cpt_err.obj: $(SRC_D)\crypto\cpt_err.c
+        $(CC) /Fo$(OBJ_D)\cpt_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cpt_err.c
+
+$(OBJ_D)\md2_dgst.obj: $(SRC_D)\crypto\md2\md2_dgst.c
+        $(CC) /Fo$(OBJ_D)\md2_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md2\md2_dgst.c
+
+$(OBJ_D)\md2_one.obj: $(SRC_D)\crypto\md2\md2_one.c
+        $(CC) /Fo$(OBJ_D)\md2_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md2\md2_one.c
+
+$(OBJ_D)\md5_dgst.obj: $(SRC_D)\crypto\md5\md5_dgst.c
+        $(CC) /Fo$(OBJ_D)\md5_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md5\md5_dgst.c
+
+$(OBJ_D)\md5_one.obj: $(SRC_D)\crypto\md5\md5_one.c
+        $(CC) /Fo$(OBJ_D)\md5_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md5\md5_one.c
+
+$(OBJ_D)\sha_dgst.obj: $(SRC_D)\crypto\sha\sha_dgst.c
+        $(CC) /Fo$(OBJ_D)\sha_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha_dgst.c
+
+$(OBJ_D)\sha1dgst.obj: $(SRC_D)\crypto\sha\sha1dgst.c
+        $(CC) /Fo$(OBJ_D)\sha1dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha1dgst.c
+
+$(OBJ_D)\sha_one.obj: $(SRC_D)\crypto\sha\sha_one.c
+        $(CC) /Fo$(OBJ_D)\sha_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha_one.c
+
+$(OBJ_D)\sha1_one.obj: $(SRC_D)\crypto\sha\sha1_one.c
+        $(CC) /Fo$(OBJ_D)\sha1_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha1_one.c
+
+$(OBJ_D)\mdc2dgst.obj: $(SRC_D)\crypto\mdc2\mdc2dgst.c
+        $(CC) /Fo$(OBJ_D)\mdc2dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\mdc2\mdc2dgst.c
+
+$(OBJ_D)\mdc2_one.obj: $(SRC_D)\crypto\mdc2\mdc2_one.c
+        $(CC) /Fo$(OBJ_D)\mdc2_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\mdc2\mdc2_one.c
+
+$(OBJ_D)\hmac.obj: $(SRC_D)\crypto\hmac\hmac.c
+        $(CC) /Fo$(OBJ_D)\hmac.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\hmac\hmac.c
+
+$(OBJ_D)\rmd_dgst.obj: $(SRC_D)\crypto\ripemd\rmd_dgst.c
+        $(CC) /Fo$(OBJ_D)\rmd_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\ripemd\rmd_dgst.c
+
+$(OBJ_D)\rmd_one.obj: $(SRC_D)\crypto\ripemd\rmd_one.c
+        $(CC) /Fo$(OBJ_D)\rmd_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\ripemd\rmd_one.c
+
+$(OBJ_D)\set_key.obj: $(SRC_D)\crypto\des\set_key.c
+        $(CC) /Fo$(OBJ_D)\set_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\set_key.c
+
+$(OBJ_D)\ecb_enc.obj: $(SRC_D)\crypto\des\ecb_enc.c
+        $(CC) /Fo$(OBJ_D)\ecb_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ecb_enc.c
+
+$(OBJ_D)\cbc_enc.obj: $(SRC_D)\crypto\des\cbc_enc.c
+        $(CC) /Fo$(OBJ_D)\cbc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cbc_enc.c
+
+$(OBJ_D)\ecb3_enc.obj: $(SRC_D)\crypto\des\ecb3_enc.c
+        $(CC) /Fo$(OBJ_D)\ecb3_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ecb3_enc.c
+
+$(OBJ_D)\cfb64enc.obj: $(SRC_D)\crypto\des\cfb64enc.c
+        $(CC) /Fo$(OBJ_D)\cfb64enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cfb64enc.c
+
+$(OBJ_D)\cfb64ede.obj: $(SRC_D)\crypto\des\cfb64ede.c
+        $(CC) /Fo$(OBJ_D)\cfb64ede.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cfb64ede.c
+
+$(OBJ_D)\cfb_enc.obj: $(SRC_D)\crypto\des\cfb_enc.c
+        $(CC) /Fo$(OBJ_D)\cfb_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cfb_enc.c
+
+$(OBJ_D)\ofb64ede.obj: $(SRC_D)\crypto\des\ofb64ede.c
+        $(CC) /Fo$(OBJ_D)\ofb64ede.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ofb64ede.c
+
+$(OBJ_D)\enc_read.obj: $(SRC_D)\crypto\des\enc_read.c
+        $(CC) /Fo$(OBJ_D)\enc_read.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\enc_read.c
+
+$(OBJ_D)\enc_writ.obj: $(SRC_D)\crypto\des\enc_writ.c
+        $(CC) /Fo$(OBJ_D)\enc_writ.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\enc_writ.c
+
+$(OBJ_D)\ofb64enc.obj: $(SRC_D)\crypto\des\ofb64enc.c
+        $(CC) /Fo$(OBJ_D)\ofb64enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ofb64enc.c
+
+$(OBJ_D)\ofb_enc.obj: $(SRC_D)\crypto\des\ofb_enc.c
+        $(CC) /Fo$(OBJ_D)\ofb_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ofb_enc.c
+
+$(OBJ_D)\str2key.obj: $(SRC_D)\crypto\des\str2key.c
+        $(CC) /Fo$(OBJ_D)\str2key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\str2key.c
+
+$(OBJ_D)\pcbc_enc.obj: $(SRC_D)\crypto\des\pcbc_enc.c
+        $(CC) /Fo$(OBJ_D)\pcbc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\pcbc_enc.c
+
+$(OBJ_D)\qud_cksm.obj: $(SRC_D)\crypto\des\qud_cksm.c
+        $(CC) /Fo$(OBJ_D)\qud_cksm.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\qud_cksm.c
+
+$(OBJ_D)\rand_key.obj: $(SRC_D)\crypto\des\rand_key.c
+        $(CC) /Fo$(OBJ_D)\rand_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\rand_key.c
+
+$(OBJ_D)\des_enc.obj: $(SRC_D)\crypto\des\des_enc.c
+        $(CC) /Fo$(OBJ_D)\des_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\des_enc.c
+
+$(OBJ_D)\fcrypt_b.obj: $(SRC_D)\crypto\des\fcrypt_b.c
+        $(CC) /Fo$(OBJ_D)\fcrypt_b.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\fcrypt_b.c
+
+$(OBJ_D)\read2pwd.obj: $(SRC_D)\crypto\des\read2pwd.c
+        $(CC) /Fo$(OBJ_D)\read2pwd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\read2pwd.c
+
+$(OBJ_D)\fcrypt.obj: $(SRC_D)\crypto\des\fcrypt.c
+        $(CC) /Fo$(OBJ_D)\fcrypt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\fcrypt.c
+
+$(OBJ_D)\xcbc_enc.obj: $(SRC_D)\crypto\des\xcbc_enc.c
+        $(CC) /Fo$(OBJ_D)\xcbc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\xcbc_enc.c
+
+$(OBJ_D)\read_pwd.obj: $(SRC_D)\crypto\des\read_pwd.c
+        $(CC) /Fo$(OBJ_D)\read_pwd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\read_pwd.c
+
+$(OBJ_D)\rpc_enc.obj: $(SRC_D)\crypto\des\rpc_enc.c
+        $(CC) /Fo$(OBJ_D)\rpc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\rpc_enc.c
+
+$(OBJ_D)\cbc_cksm.obj: $(SRC_D)\crypto\des\cbc_cksm.c
+        $(CC) /Fo$(OBJ_D)\cbc_cksm.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cbc_cksm.c
+
+$(OBJ_D)\supp.obj: $(SRC_D)\crypto\des\supp.c
+        $(CC) /Fo$(OBJ_D)\supp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\supp.c
+
+$(OBJ_D)\rc2_ecb.obj: $(SRC_D)\crypto\rc2\rc2_ecb.c
+        $(CC) /Fo$(OBJ_D)\rc2_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2_ecb.c
+
+$(OBJ_D)\rc2_skey.obj: $(SRC_D)\crypto\rc2\rc2_skey.c
+        $(CC) /Fo$(OBJ_D)\rc2_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2_skey.c
+
+$(OBJ_D)\rc2_cbc.obj: $(SRC_D)\crypto\rc2\rc2_cbc.c
+        $(CC) /Fo$(OBJ_D)\rc2_cbc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2_cbc.c
+
+$(OBJ_D)\rc2cfb64.obj: $(SRC_D)\crypto\rc2\rc2cfb64.c
+        $(CC) /Fo$(OBJ_D)\rc2cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2cfb64.c
+
+$(OBJ_D)\rc2ofb64.obj: $(SRC_D)\crypto\rc2\rc2ofb64.c
+        $(CC) /Fo$(OBJ_D)\rc2ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2ofb64.c
+
+$(OBJ_D)\rc4_skey.obj: $(SRC_D)\crypto\rc4\rc4_skey.c
+        $(CC) /Fo$(OBJ_D)\rc4_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc4\rc4_skey.c
+
+$(OBJ_D)\rc4_enc.obj: $(SRC_D)\crypto\rc4\rc4_enc.c
+        $(CC) /Fo$(OBJ_D)\rc4_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc4\rc4_enc.c
+
+$(OBJ_D)\rc5_skey.obj: $(SRC_D)\crypto\rc5\rc5_skey.c
+        $(CC) /Fo$(OBJ_D)\rc5_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5_skey.c
+
+$(OBJ_D)\rc5_ecb.obj: $(SRC_D)\crypto\rc5\rc5_ecb.c
+        $(CC) /Fo$(OBJ_D)\rc5_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5_ecb.c
+
+$(OBJ_D)\rc5_enc.obj: $(SRC_D)\crypto\rc5\rc5_enc.c
+        $(CC) /Fo$(OBJ_D)\rc5_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5_enc.c
+
+$(OBJ_D)\rc5cfb64.obj: $(SRC_D)\crypto\rc5\rc5cfb64.c
+        $(CC) /Fo$(OBJ_D)\rc5cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5cfb64.c
+
+$(OBJ_D)\rc5ofb64.obj: $(SRC_D)\crypto\rc5\rc5ofb64.c
+        $(CC) /Fo$(OBJ_D)\rc5ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5ofb64.c
+
+$(OBJ_D)\i_cbc.obj: $(SRC_D)\crypto\idea\i_cbc.c
+        $(CC) /Fo$(OBJ_D)\i_cbc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_cbc.c
+
+$(OBJ_D)\i_cfb64.obj: $(SRC_D)\crypto\idea\i_cfb64.c
+        $(CC) /Fo$(OBJ_D)\i_cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_cfb64.c
+
+$(OBJ_D)\i_ofb64.obj: $(SRC_D)\crypto\idea\i_ofb64.c
+        $(CC) /Fo$(OBJ_D)\i_ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_ofb64.c
+
+$(OBJ_D)\i_ecb.obj: $(SRC_D)\crypto\idea\i_ecb.c
+        $(CC) /Fo$(OBJ_D)\i_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_ecb.c
+
+$(OBJ_D)\i_skey.obj: $(SRC_D)\crypto\idea\i_skey.c
+        $(CC) /Fo$(OBJ_D)\i_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_skey.c
+
+$(OBJ_D)\bf_skey.obj: $(SRC_D)\crypto\bf\bf_skey.c
+        $(CC) /Fo$(OBJ_D)\bf_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_skey.c
+
+$(OBJ_D)\bf_ecb.obj: $(SRC_D)\crypto\bf\bf_ecb.c
+        $(CC) /Fo$(OBJ_D)\bf_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_ecb.c
+
+$(OBJ_D)\bf_enc.obj: $(SRC_D)\crypto\bf\bf_enc.c
+        $(CC) /Fo$(OBJ_D)\bf_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_enc.c
+
+$(OBJ_D)\bf_cfb64.obj: $(SRC_D)\crypto\bf\bf_cfb64.c
+        $(CC) /Fo$(OBJ_D)\bf_cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_cfb64.c
+
+$(OBJ_D)\bf_ofb64.obj: $(SRC_D)\crypto\bf\bf_ofb64.c
+        $(CC) /Fo$(OBJ_D)\bf_ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_ofb64.c
+
+$(OBJ_D)\c_skey.obj: $(SRC_D)\crypto\cast\c_skey.c
+        $(CC) /Fo$(OBJ_D)\c_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_skey.c
+
+$(OBJ_D)\c_ecb.obj: $(SRC_D)\crypto\cast\c_ecb.c
+        $(CC) /Fo$(OBJ_D)\c_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_ecb.c
+
+$(OBJ_D)\c_enc.obj: $(SRC_D)\crypto\cast\c_enc.c
+        $(CC) /Fo$(OBJ_D)\c_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_enc.c
+
+$(OBJ_D)\c_cfb64.obj: $(SRC_D)\crypto\cast\c_cfb64.c
+        $(CC) /Fo$(OBJ_D)\c_cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_cfb64.c
+
+$(OBJ_D)\c_ofb64.obj: $(SRC_D)\crypto\cast\c_ofb64.c
+        $(CC) /Fo$(OBJ_D)\c_ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_ofb64.c
+
+$(OBJ_D)\bn_add.obj: $(SRC_D)\crypto\bn\bn_add.c
+        $(CC) /Fo$(OBJ_D)\bn_add.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_add.c
+
+$(OBJ_D)\bn_div.obj: $(SRC_D)\crypto\bn\bn_div.c
+        $(CC) /Fo$(OBJ_D)\bn_div.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_div.c
+
+$(OBJ_D)\bn_exp.obj: $(SRC_D)\crypto\bn\bn_exp.c
+        $(CC) /Fo$(OBJ_D)\bn_exp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_exp.c
+
+$(OBJ_D)\bn_lib.obj: $(SRC_D)\crypto\bn\bn_lib.c
+        $(CC) /Fo$(OBJ_D)\bn_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_lib.c
+
+$(OBJ_D)\bn_mod.obj: $(SRC_D)\crypto\bn\bn_mod.c
+        $(CC) /Fo$(OBJ_D)\bn_mod.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mod.c
+
+$(OBJ_D)\bn_mul.obj: $(SRC_D)\crypto\bn\bn_mul.c
+        $(CC) /Fo$(OBJ_D)\bn_mul.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mul.c
+
+$(OBJ_D)\bn_print.obj: $(SRC_D)\crypto\bn\bn_print.c
+        $(CC) /Fo$(OBJ_D)\bn_print.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_print.c
+
+$(OBJ_D)\bn_rand.obj: $(SRC_D)\crypto\bn\bn_rand.c
+        $(CC) /Fo$(OBJ_D)\bn_rand.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_rand.c
+
+$(OBJ_D)\bn_shift.obj: $(SRC_D)\crypto\bn\bn_shift.c
+        $(CC) /Fo$(OBJ_D)\bn_shift.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_shift.c
+
+$(OBJ_D)\bn_sub.obj: $(SRC_D)\crypto\bn\bn_sub.c
+        $(CC) /Fo$(OBJ_D)\bn_sub.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_sub.c
+
+$(OBJ_D)\bn_word.obj: $(SRC_D)\crypto\bn\bn_word.c
+        $(CC) /Fo$(OBJ_D)\bn_word.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_word.c
+
+$(OBJ_D)\bn_blind.obj: $(SRC_D)\crypto\bn\bn_blind.c
+        $(CC) /Fo$(OBJ_D)\bn_blind.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_blind.c
+
+$(OBJ_D)\bn_gcd.obj: $(SRC_D)\crypto\bn\bn_gcd.c
+        $(CC) /Fo$(OBJ_D)\bn_gcd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_gcd.c
+
+$(OBJ_D)\bn_prime.obj: $(SRC_D)\crypto\bn\bn_prime.c
+        $(CC) /Fo$(OBJ_D)\bn_prime.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_prime.c
+
+$(OBJ_D)\bn_err.obj: $(SRC_D)\crypto\bn\bn_err.c
+        $(CC) /Fo$(OBJ_D)\bn_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_err.c
+
+$(OBJ_D)\bn_sqr.obj: $(SRC_D)\crypto\bn\bn_sqr.c
+        $(CC) /Fo$(OBJ_D)\bn_sqr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_sqr.c
+
+$(OBJ_D)\bn_mulw.obj: $(SRC_D)\crypto\bn\bn_mulw.c
+        $(CC) /Fo$(OBJ_D)\bn_mulw.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mulw.c
+
+$(OBJ_D)\bn_recp.obj: $(SRC_D)\crypto\bn\bn_recp.c
+        $(CC) /Fo$(OBJ_D)\bn_recp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_recp.c
+
+$(OBJ_D)\bn_mont.obj: $(SRC_D)\crypto\bn\bn_mont.c
+        $(CC) /Fo$(OBJ_D)\bn_mont.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mont.c
+
+$(OBJ_D)\bn_mpi.obj: $(SRC_D)\crypto\bn\bn_mpi.c
+        $(CC) /Fo$(OBJ_D)\bn_mpi.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mpi.c
+
+$(OBJ_D)\rsa_eay.obj: $(SRC_D)\crypto\rsa\rsa_eay.c
+        $(CC) /Fo$(OBJ_D)\rsa_eay.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_eay.c
+
+$(OBJ_D)\rsa_gen.obj: $(SRC_D)\crypto\rsa\rsa_gen.c
+        $(CC) /Fo$(OBJ_D)\rsa_gen.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_gen.c
+
+$(OBJ_D)\rsa_lib.obj: $(SRC_D)\crypto\rsa\rsa_lib.c
+        $(CC) /Fo$(OBJ_D)\rsa_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_lib.c
+
+$(OBJ_D)\rsa_sign.obj: $(SRC_D)\crypto\rsa\rsa_sign.c
+        $(CC) /Fo$(OBJ_D)\rsa_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_sign.c
+
+$(OBJ_D)\rsa_saos.obj: $(SRC_D)\crypto\rsa\rsa_saos.c
+        $(CC) /Fo$(OBJ_D)\rsa_saos.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_saos.c
+
+$(OBJ_D)\rsa_err.obj: $(SRC_D)\crypto\rsa\rsa_err.c
+        $(CC) /Fo$(OBJ_D)\rsa_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_err.c
+
+$(OBJ_D)\rsa_pk1.obj: $(SRC_D)\crypto\rsa\rsa_pk1.c
+        $(CC) /Fo$(OBJ_D)\rsa_pk1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_pk1.c
+
+$(OBJ_D)\rsa_ssl.obj: $(SRC_D)\crypto\rsa\rsa_ssl.c
+        $(CC) /Fo$(OBJ_D)\rsa_ssl.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_ssl.c
+
+$(OBJ_D)\rsa_none.obj: $(SRC_D)\crypto\rsa\rsa_none.c
+        $(CC) /Fo$(OBJ_D)\rsa_none.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_none.c
+
+$(OBJ_D)\dsa_gen.obj: $(SRC_D)\crypto\dsa\dsa_gen.c
+        $(CC) /Fo$(OBJ_D)\dsa_gen.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_gen.c
+
+$(OBJ_D)\dsa_key.obj: $(SRC_D)\crypto\dsa\dsa_key.c
+        $(CC) /Fo$(OBJ_D)\dsa_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_key.c
+
+$(OBJ_D)\dsa_lib.obj: $(SRC_D)\crypto\dsa\dsa_lib.c
+        $(CC) /Fo$(OBJ_D)\dsa_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_lib.c
+
+$(OBJ_D)\dsa_vrf.obj: $(SRC_D)\crypto\dsa\dsa_vrf.c
+        $(CC) /Fo$(OBJ_D)\dsa_vrf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_vrf.c
+
+$(OBJ_D)\dsa_sign.obj: $(SRC_D)\crypto\dsa\dsa_sign.c
+        $(CC) /Fo$(OBJ_D)\dsa_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_sign.c
+
+$(OBJ_D)\dsa_err.obj: $(SRC_D)\crypto\dsa\dsa_err.c
+        $(CC) /Fo$(OBJ_D)\dsa_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_err.c
+
+$(OBJ_D)\dh_gen.obj: $(SRC_D)\crypto\dh\dh_gen.c
+        $(CC) /Fo$(OBJ_D)\dh_gen.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_gen.c
+
+$(OBJ_D)\dh_key.obj: $(SRC_D)\crypto\dh\dh_key.c
+        $(CC) /Fo$(OBJ_D)\dh_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_key.c
+
+$(OBJ_D)\dh_lib.obj: $(SRC_D)\crypto\dh\dh_lib.c
+        $(CC) /Fo$(OBJ_D)\dh_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_lib.c
+
+$(OBJ_D)\dh_check.obj: $(SRC_D)\crypto\dh\dh_check.c
+        $(CC) /Fo$(OBJ_D)\dh_check.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_check.c
+
+$(OBJ_D)\dh_err.obj: $(SRC_D)\crypto\dh\dh_err.c
+        $(CC) /Fo$(OBJ_D)\dh_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_err.c
+
+$(OBJ_D)\buffer.obj: $(SRC_D)\crypto\buffer\buffer.c
+        $(CC) /Fo$(OBJ_D)\buffer.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\buffer\buffer.c
+
+$(OBJ_D)\buf_err.obj: $(SRC_D)\crypto\buffer\buf_err.c
+        $(CC) /Fo$(OBJ_D)\buf_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\buffer\buf_err.c
+
+$(OBJ_D)\bio_lib.obj: $(SRC_D)\crypto\bio\bio_lib.c
+        $(CC) /Fo$(OBJ_D)\bio_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bio_lib.c
+
+$(OBJ_D)\bio_cb.obj: $(SRC_D)\crypto\bio\bio_cb.c
+        $(CC) /Fo$(OBJ_D)\bio_cb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bio_cb.c
+
+$(OBJ_D)\bio_err.obj: $(SRC_D)\crypto\bio\bio_err.c
+        $(CC) /Fo$(OBJ_D)\bio_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bio_err.c
+
+$(OBJ_D)\bss_mem.obj: $(SRC_D)\crypto\bio\bss_mem.c
+        $(CC) /Fo$(OBJ_D)\bss_mem.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_mem.c
+
+$(OBJ_D)\bss_null.obj: $(SRC_D)\crypto\bio\bss_null.c
+        $(CC) /Fo$(OBJ_D)\bss_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_null.c
+
+$(OBJ_D)\bss_fd.obj: $(SRC_D)\crypto\bio\bss_fd.c
+        $(CC) /Fo$(OBJ_D)\bss_fd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_fd.c
+
+$(OBJ_D)\bss_file.obj: $(SRC_D)\crypto\bio\bss_file.c
+        $(CC) /Fo$(OBJ_D)\bss_file.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_file.c
+
+$(OBJ_D)\bss_sock.obj: $(SRC_D)\crypto\bio\bss_sock.c
+        $(CC) /Fo$(OBJ_D)\bss_sock.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_sock.c
+
+$(OBJ_D)\bss_conn.obj: $(SRC_D)\crypto\bio\bss_conn.c
+        $(CC) /Fo$(OBJ_D)\bss_conn.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_conn.c
+
+$(OBJ_D)\bf_null.obj: $(SRC_D)\crypto\bio\bf_null.c
+        $(CC) /Fo$(OBJ_D)\bf_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bf_null.c
+
+$(OBJ_D)\bf_buff.obj: $(SRC_D)\crypto\bio\bf_buff.c
+        $(CC) /Fo$(OBJ_D)\bf_buff.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bf_buff.c
+
+$(OBJ_D)\b_print.obj: $(SRC_D)\crypto\bio\b_print.c
+        $(CC) /Fo$(OBJ_D)\b_print.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\b_print.c
+
+$(OBJ_D)\b_dump.obj: $(SRC_D)\crypto\bio\b_dump.c
+        $(CC) /Fo$(OBJ_D)\b_dump.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\b_dump.c
+
+$(OBJ_D)\b_sock.obj: $(SRC_D)\crypto\bio\b_sock.c
+        $(CC) /Fo$(OBJ_D)\b_sock.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\b_sock.c
+
+$(OBJ_D)\bss_acpt.obj: $(SRC_D)\crypto\bio\bss_acpt.c
+        $(CC) /Fo$(OBJ_D)\bss_acpt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_acpt.c
+
+$(OBJ_D)\bf_nbio.obj: $(SRC_D)\crypto\bio\bf_nbio.c
+        $(CC) /Fo$(OBJ_D)\bf_nbio.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bf_nbio.c
+
+$(OBJ_D)\stack.obj: $(SRC_D)\crypto\stack\stack.c
+        $(CC) /Fo$(OBJ_D)\stack.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\stack\stack.c
+
+$(OBJ_D)\lhash.obj: $(SRC_D)\crypto\lhash\lhash.c
+        $(CC) /Fo$(OBJ_D)\lhash.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\lhash\lhash.c
+
+$(OBJ_D)\lh_stats.obj: $(SRC_D)\crypto\lhash\lh_stats.c
+        $(CC) /Fo$(OBJ_D)\lh_stats.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\lhash\lh_stats.c
+
+$(OBJ_D)\md_rand.obj: $(SRC_D)\crypto\rand\md_rand.c
+        $(CC) /Fo$(OBJ_D)\md_rand.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rand\md_rand.c
+
+$(OBJ_D)\randfile.obj: $(SRC_D)\crypto\rand\randfile.c
+        $(CC) /Fo$(OBJ_D)\randfile.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rand\randfile.c
+
+$(OBJ_D)\err.obj: $(SRC_D)\crypto\err\err.c
+        $(CC) /Fo$(OBJ_D)\err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\err\err.c
+
+$(OBJ_D)\err_all.obj: $(SRC_D)\crypto\err\err_all.c
+        $(CC) /Fo$(OBJ_D)\err_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\err\err_all.c
+
+$(OBJ_D)\err_prn.obj: $(SRC_D)\crypto\err\err_prn.c
+        $(CC) /Fo$(OBJ_D)\err_prn.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\err\err_prn.c
+
+$(OBJ_D)\obj_dat.obj: $(SRC_D)\crypto\objects\obj_dat.c
+        $(CC) /Fo$(OBJ_D)\obj_dat.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\objects\obj_dat.c
+
+$(OBJ_D)\obj_lib.obj: $(SRC_D)\crypto\objects\obj_lib.c
+        $(CC) /Fo$(OBJ_D)\obj_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\objects\obj_lib.c
+
+$(OBJ_D)\obj_err.obj: $(SRC_D)\crypto\objects\obj_err.c
+        $(CC) /Fo$(OBJ_D)\obj_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\objects\obj_err.c
+
+$(OBJ_D)\encode.obj: $(SRC_D)\crypto\evp\encode.c
+        $(CC) /Fo$(OBJ_D)\encode.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\encode.c
+
+$(OBJ_D)\digest.obj: $(SRC_D)\crypto\evp\digest.c
+        $(CC) /Fo$(OBJ_D)\digest.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\digest.c
+
+$(OBJ_D)\evp_enc.obj: $(SRC_D)\crypto\evp\evp_enc.c
+        $(CC) /Fo$(OBJ_D)\evp_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_enc.c
+
+$(OBJ_D)\evp_key.obj: $(SRC_D)\crypto\evp\evp_key.c
+        $(CC) /Fo$(OBJ_D)\evp_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_key.c
+
+$(OBJ_D)\e_ecb_d.obj: $(SRC_D)\crypto\evp\e_ecb_d.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_d.c
+
+$(OBJ_D)\e_cbc_d.obj: $(SRC_D)\crypto\evp\e_cbc_d.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_d.c
+
+$(OBJ_D)\e_cfb_d.obj: $(SRC_D)\crypto\evp\e_cfb_d.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_d.c
+
+$(OBJ_D)\e_ofb_d.obj: $(SRC_D)\crypto\evp\e_ofb_d.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_d.c
+
+$(OBJ_D)\e_ecb_i.obj: $(SRC_D)\crypto\evp\e_ecb_i.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_i.c
+
+$(OBJ_D)\e_cbc_i.obj: $(SRC_D)\crypto\evp\e_cbc_i.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_i.c
+
+$(OBJ_D)\e_cfb_i.obj: $(SRC_D)\crypto\evp\e_cfb_i.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_i.c
+
+$(OBJ_D)\e_ofb_i.obj: $(SRC_D)\crypto\evp\e_ofb_i.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_i.c
+
+$(OBJ_D)\e_ecb_3d.obj: $(SRC_D)\crypto\evp\e_ecb_3d.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_3d.c
+
+$(OBJ_D)\e_cbc_3d.obj: $(SRC_D)\crypto\evp\e_cbc_3d.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_3d.c
+
+$(OBJ_D)\e_rc4.obj: $(SRC_D)\crypto\evp\e_rc4.c
+        $(CC) /Fo$(OBJ_D)\e_rc4.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_rc4.c
+
+$(OBJ_D)\names.obj: $(SRC_D)\crypto\evp\names.c
+        $(CC) /Fo$(OBJ_D)\names.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\names.c
+
+$(OBJ_D)\e_cfb_3d.obj: $(SRC_D)\crypto\evp\e_cfb_3d.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_3d.c
+
+$(OBJ_D)\e_ofb_3d.obj: $(SRC_D)\crypto\evp\e_ofb_3d.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_3d.c
+
+$(OBJ_D)\e_xcbc_d.obj: $(SRC_D)\crypto\evp\e_xcbc_d.c
+        $(CC) /Fo$(OBJ_D)\e_xcbc_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_xcbc_d.c
+
+$(OBJ_D)\e_ecb_r2.obj: $(SRC_D)\crypto\evp\e_ecb_r2.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_r2.c
+
+$(OBJ_D)\e_cbc_r2.obj: $(SRC_D)\crypto\evp\e_cbc_r2.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_r2.c
+
+$(OBJ_D)\e_cfb_r2.obj: $(SRC_D)\crypto\evp\e_cfb_r2.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_r2.c
+
+$(OBJ_D)\e_ofb_r2.obj: $(SRC_D)\crypto\evp\e_ofb_r2.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_r2.c
+
+$(OBJ_D)\e_ecb_bf.obj: $(SRC_D)\crypto\evp\e_ecb_bf.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_bf.c
+
+$(OBJ_D)\e_cbc_bf.obj: $(SRC_D)\crypto\evp\e_cbc_bf.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_bf.c
+
+$(OBJ_D)\e_cfb_bf.obj: $(SRC_D)\crypto\evp\e_cfb_bf.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_bf.c
+
+$(OBJ_D)\e_ofb_bf.obj: $(SRC_D)\crypto\evp\e_ofb_bf.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_bf.c
+
+$(OBJ_D)\e_ecb_c.obj: $(SRC_D)\crypto\evp\e_ecb_c.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_c.c
+
+$(OBJ_D)\e_cbc_c.obj: $(SRC_D)\crypto\evp\e_cbc_c.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_c.c
+
+$(OBJ_D)\e_cfb_c.obj: $(SRC_D)\crypto\evp\e_cfb_c.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_c.c
+
+$(OBJ_D)\e_ofb_c.obj: $(SRC_D)\crypto\evp\e_ofb_c.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_c.c
+
+$(OBJ_D)\e_ecb_r5.obj: $(SRC_D)\crypto\evp\e_ecb_r5.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_r5.c
+
+$(OBJ_D)\e_cbc_r5.obj: $(SRC_D)\crypto\evp\e_cbc_r5.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_r5.c
+
+$(OBJ_D)\e_cfb_r5.obj: $(SRC_D)\crypto\evp\e_cfb_r5.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_r5.c
+
+$(OBJ_D)\e_ofb_r5.obj: $(SRC_D)\crypto\evp\e_ofb_r5.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_r5.c
+
+$(OBJ_D)\m_null.obj: $(SRC_D)\crypto\evp\m_null.c
+        $(CC) /Fo$(OBJ_D)\m_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_null.c
+
+$(OBJ_D)\m_md2.obj: $(SRC_D)\crypto\evp\m_md2.c
+        $(CC) /Fo$(OBJ_D)\m_md2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_md2.c
+
+$(OBJ_D)\m_md5.obj: $(SRC_D)\crypto\evp\m_md5.c
+        $(CC) /Fo$(OBJ_D)\m_md5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_md5.c
+
+$(OBJ_D)\m_sha.obj: $(SRC_D)\crypto\evp\m_sha.c
+        $(CC) /Fo$(OBJ_D)\m_sha.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_sha.c
+
+$(OBJ_D)\m_sha1.obj: $(SRC_D)\crypto\evp\m_sha1.c
+        $(CC) /Fo$(OBJ_D)\m_sha1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_sha1.c
+
+$(OBJ_D)\m_dss.obj: $(SRC_D)\crypto\evp\m_dss.c
+        $(CC) /Fo$(OBJ_D)\m_dss.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_dss.c
+
+$(OBJ_D)\m_dss1.obj: $(SRC_D)\crypto\evp\m_dss1.c
+        $(CC) /Fo$(OBJ_D)\m_dss1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_dss1.c
+
+$(OBJ_D)\m_mdc2.obj: $(SRC_D)\crypto\evp\m_mdc2.c
+        $(CC) /Fo$(OBJ_D)\m_mdc2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_mdc2.c
+
+$(OBJ_D)\m_ripemd.obj: $(SRC_D)\crypto\evp\m_ripemd.c
+        $(CC) /Fo$(OBJ_D)\m_ripemd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_ripemd.c
+
+$(OBJ_D)\p_open.obj: $(SRC_D)\crypto\evp\p_open.c
+        $(CC) /Fo$(OBJ_D)\p_open.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_open.c
+
+$(OBJ_D)\p_seal.obj: $(SRC_D)\crypto\evp\p_seal.c
+        $(CC) /Fo$(OBJ_D)\p_seal.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_seal.c
+
+$(OBJ_D)\p_sign.obj: $(SRC_D)\crypto\evp\p_sign.c
+        $(CC) /Fo$(OBJ_D)\p_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_sign.c
+
+$(OBJ_D)\p_verify.obj: $(SRC_D)\crypto\evp\p_verify.c
+        $(CC) /Fo$(OBJ_D)\p_verify.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_verify.c
+
+$(OBJ_D)\p_lib.obj: $(SRC_D)\crypto\evp\p_lib.c
+        $(CC) /Fo$(OBJ_D)\p_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_lib.c
+
+$(OBJ_D)\p_enc.obj: $(SRC_D)\crypto\evp\p_enc.c
+        $(CC) /Fo$(OBJ_D)\p_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_enc.c
+
+$(OBJ_D)\p_dec.obj: $(SRC_D)\crypto\evp\p_dec.c
+        $(CC) /Fo$(OBJ_D)\p_dec.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_dec.c
+
+$(OBJ_D)\bio_md.obj: $(SRC_D)\crypto\evp\bio_md.c
+        $(CC) /Fo$(OBJ_D)\bio_md.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\bio_md.c
+
+$(OBJ_D)\bio_b64.obj: $(SRC_D)\crypto\evp\bio_b64.c
+        $(CC) /Fo$(OBJ_D)\bio_b64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\bio_b64.c
+
+$(OBJ_D)\bio_enc.obj: $(SRC_D)\crypto\evp\bio_enc.c
+        $(CC) /Fo$(OBJ_D)\bio_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\bio_enc.c
+
+$(OBJ_D)\evp_err.obj: $(SRC_D)\crypto\evp\evp_err.c
+        $(CC) /Fo$(OBJ_D)\evp_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_err.c
+
+$(OBJ_D)\e_null.obj: $(SRC_D)\crypto\evp\e_null.c
+        $(CC) /Fo$(OBJ_D)\e_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_null.c
+
+$(OBJ_D)\c_all.obj: $(SRC_D)\crypto\evp\c_all.c
+        $(CC) /Fo$(OBJ_D)\c_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\c_all.c
+
+$(OBJ_D)\evp_lib.obj: $(SRC_D)\crypto\evp\evp_lib.c
+        $(CC) /Fo$(OBJ_D)\evp_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_lib.c
+
+$(OBJ_D)\pem_sign.obj: $(SRC_D)\crypto\pem\pem_sign.c
+        $(CC) /Fo$(OBJ_D)\pem_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_sign.c
+
+$(OBJ_D)\pem_seal.obj: $(SRC_D)\crypto\pem\pem_seal.c
+        $(CC) /Fo$(OBJ_D)\pem_seal.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_seal.c
+
+$(OBJ_D)\pem_info.obj: $(SRC_D)\crypto\pem\pem_info.c
+        $(CC) /Fo$(OBJ_D)\pem_info.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_info.c
+
+$(OBJ_D)\pem_lib.obj: $(SRC_D)\crypto\pem\pem_lib.c
+        $(CC) /Fo$(OBJ_D)\pem_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_lib.c
+
+$(OBJ_D)\pem_all.obj: $(SRC_D)\crypto\pem\pem_all.c
+        $(CC) /Fo$(OBJ_D)\pem_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_all.c
+
+$(OBJ_D)\pem_err.obj: $(SRC_D)\crypto\pem\pem_err.c
+        $(CC) /Fo$(OBJ_D)\pem_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_err.c
+
+$(OBJ_D)\a_object.obj: $(SRC_D)\crypto\asn1\a_object.c
+        $(CC) /Fo$(OBJ_D)\a_object.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_object.c
+
+$(OBJ_D)\a_bitstr.obj: $(SRC_D)\crypto\asn1\a_bitstr.c
+        $(CC) /Fo$(OBJ_D)\a_bitstr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_bitstr.c
+
+$(OBJ_D)\a_utctm.obj: $(SRC_D)\crypto\asn1\a_utctm.c
+        $(CC) /Fo$(OBJ_D)\a_utctm.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_utctm.c
+
+$(OBJ_D)\a_int.obj: $(SRC_D)\crypto\asn1\a_int.c
+        $(CC) /Fo$(OBJ_D)\a_int.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_int.c
+
+$(OBJ_D)\a_octet.obj: $(SRC_D)\crypto\asn1\a_octet.c
+        $(CC) /Fo$(OBJ_D)\a_octet.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_octet.c
+
+$(OBJ_D)\a_print.obj: $(SRC_D)\crypto\asn1\a_print.c
+        $(CC) /Fo$(OBJ_D)\a_print.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_print.c
+
+$(OBJ_D)\a_type.obj: $(SRC_D)\crypto\asn1\a_type.c
+        $(CC) /Fo$(OBJ_D)\a_type.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_type.c
+
+$(OBJ_D)\a_set.obj: $(SRC_D)\crypto\asn1\a_set.c
+        $(CC) /Fo$(OBJ_D)\a_set.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_set.c
+
+$(OBJ_D)\a_dup.obj: $(SRC_D)\crypto\asn1\a_dup.c
+        $(CC) /Fo$(OBJ_D)\a_dup.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_dup.c
+
+$(OBJ_D)\a_d2i_fp.obj: $(SRC_D)\crypto\asn1\a_d2i_fp.c
+        $(CC) /Fo$(OBJ_D)\a_d2i_fp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_d2i_fp.c
+
+$(OBJ_D)\a_i2d_fp.obj: $(SRC_D)\crypto\asn1\a_i2d_fp.c
+        $(CC) /Fo$(OBJ_D)\a_i2d_fp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_i2d_fp.c
+
+$(OBJ_D)\a_sign.obj: $(SRC_D)\crypto\asn1\a_sign.c
+        $(CC) /Fo$(OBJ_D)\a_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_sign.c
+
+$(OBJ_D)\a_digest.obj: $(SRC_D)\crypto\asn1\a_digest.c
+        $(CC) /Fo$(OBJ_D)\a_digest.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_digest.c
+
+$(OBJ_D)\a_verify.obj: $(SRC_D)\crypto\asn1\a_verify.c
+        $(CC) /Fo$(OBJ_D)\a_verify.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_verify.c
+
+$(OBJ_D)\x_algor.obj: $(SRC_D)\crypto\asn1\x_algor.c
+        $(CC) /Fo$(OBJ_D)\x_algor.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_algor.c
+
+$(OBJ_D)\x_val.obj: $(SRC_D)\crypto\asn1\x_val.c
+        $(CC) /Fo$(OBJ_D)\x_val.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_val.c
+
+$(OBJ_D)\x_pubkey.obj: $(SRC_D)\crypto\asn1\x_pubkey.c
+        $(CC) /Fo$(OBJ_D)\x_pubkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_pubkey.c
+
+$(OBJ_D)\x_sig.obj: $(SRC_D)\crypto\asn1\x_sig.c
+        $(CC) /Fo$(OBJ_D)\x_sig.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_sig.c
+
+$(OBJ_D)\x_req.obj: $(SRC_D)\crypto\asn1\x_req.c
+        $(CC) /Fo$(OBJ_D)\x_req.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_req.c
+
+$(OBJ_D)\x_attrib.obj: $(SRC_D)\crypto\asn1\x_attrib.c
+        $(CC) /Fo$(OBJ_D)\x_attrib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_attrib.c
+
+$(OBJ_D)\x_name.obj: $(SRC_D)\crypto\asn1\x_name.c
+        $(CC) /Fo$(OBJ_D)\x_name.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_name.c
+
+$(OBJ_D)\x_cinf.obj: $(SRC_D)\crypto\asn1\x_cinf.c
+        $(CC) /Fo$(OBJ_D)\x_cinf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_cinf.c
+
+$(OBJ_D)\x_x509.obj: $(SRC_D)\crypto\asn1\x_x509.c
+        $(CC) /Fo$(OBJ_D)\x_x509.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_x509.c
+
+$(OBJ_D)\x_crl.obj: $(SRC_D)\crypto\asn1\x_crl.c
+        $(CC) /Fo$(OBJ_D)\x_crl.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_crl.c
+
+$(OBJ_D)\x_info.obj: $(SRC_D)\crypto\asn1\x_info.c
+        $(CC) /Fo$(OBJ_D)\x_info.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_info.c
+
+$(OBJ_D)\x_spki.obj: $(SRC_D)\crypto\asn1\x_spki.c
+        $(CC) /Fo$(OBJ_D)\x_spki.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_spki.c
+
+$(OBJ_D)\d2i_r_pr.obj: $(SRC_D)\crypto\asn1\d2i_r_pr.c
+        $(CC) /Fo$(OBJ_D)\d2i_r_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_r_pr.c
+
+$(OBJ_D)\i2d_r_pr.obj: $(SRC_D)\crypto\asn1\i2d_r_pr.c
+        $(CC) /Fo$(OBJ_D)\i2d_r_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_r_pr.c
+
+$(OBJ_D)\d2i_r_pu.obj: $(SRC_D)\crypto\asn1\d2i_r_pu.c
+        $(CC) /Fo$(OBJ_D)\d2i_r_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_r_pu.c
+
+$(OBJ_D)\i2d_r_pu.obj: $(SRC_D)\crypto\asn1\i2d_r_pu.c
+        $(CC) /Fo$(OBJ_D)\i2d_r_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_r_pu.c
+
+$(OBJ_D)\d2i_s_pr.obj: $(SRC_D)\crypto\asn1\d2i_s_pr.c
+        $(CC) /Fo$(OBJ_D)\d2i_s_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_s_pr.c
+
+$(OBJ_D)\i2d_s_pr.obj: $(SRC_D)\crypto\asn1\i2d_s_pr.c
+        $(CC) /Fo$(OBJ_D)\i2d_s_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_s_pr.c
+
+$(OBJ_D)\d2i_s_pu.obj: $(SRC_D)\crypto\asn1\d2i_s_pu.c
+        $(CC) /Fo$(OBJ_D)\d2i_s_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_s_pu.c
+
+$(OBJ_D)\i2d_s_pu.obj: $(SRC_D)\crypto\asn1\i2d_s_pu.c
+        $(CC) /Fo$(OBJ_D)\i2d_s_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_s_pu.c
+
+$(OBJ_D)\d2i_pu.obj: $(SRC_D)\crypto\asn1\d2i_pu.c
+        $(CC) /Fo$(OBJ_D)\d2i_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_pu.c
+
+$(OBJ_D)\d2i_pr.obj: $(SRC_D)\crypto\asn1\d2i_pr.c
+        $(CC) /Fo$(OBJ_D)\d2i_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_pr.c
+
+$(OBJ_D)\i2d_pu.obj: $(SRC_D)\crypto\asn1\i2d_pu.c
+        $(CC) /Fo$(OBJ_D)\i2d_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_pu.c
+
+$(OBJ_D)\i2d_pr.obj: $(SRC_D)\crypto\asn1\i2d_pr.c
+        $(CC) /Fo$(OBJ_D)\i2d_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_pr.c
+
+$(OBJ_D)\t_req.obj: $(SRC_D)\crypto\asn1\t_req.c
+        $(CC) /Fo$(OBJ_D)\t_req.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\t_req.c
+
+$(OBJ_D)\t_x509.obj: $(SRC_D)\crypto\asn1\t_x509.c
+        $(CC) /Fo$(OBJ_D)\t_x509.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\t_x509.c
+
+$(OBJ_D)\t_pkey.obj: $(SRC_D)\crypto\asn1\t_pkey.c
+        $(CC) /Fo$(OBJ_D)\t_pkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\t_pkey.c
+
+$(OBJ_D)\p7_i_s.obj: $(SRC_D)\crypto\asn1\p7_i_s.c
+        $(CC) /Fo$(OBJ_D)\p7_i_s.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_i_s.c
+
+$(OBJ_D)\p7_signi.obj: $(SRC_D)\crypto\asn1\p7_signi.c
+        $(CC) /Fo$(OBJ_D)\p7_signi.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_signi.c
+
+$(OBJ_D)\p7_signd.obj: $(SRC_D)\crypto\asn1\p7_signd.c
+        $(CC) /Fo$(OBJ_D)\p7_signd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_signd.c
+
+$(OBJ_D)\p7_recip.obj: $(SRC_D)\crypto\asn1\p7_recip.c
+        $(CC) /Fo$(OBJ_D)\p7_recip.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_recip.c
+
+$(OBJ_D)\p7_enc_c.obj: $(SRC_D)\crypto\asn1\p7_enc_c.c
+        $(CC) /Fo$(OBJ_D)\p7_enc_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_enc_c.c
+
+$(OBJ_D)\p7_evp.obj: $(SRC_D)\crypto\asn1\p7_evp.c
+        $(CC) /Fo$(OBJ_D)\p7_evp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_evp.c
+
+$(OBJ_D)\p7_dgst.obj: $(SRC_D)\crypto\asn1\p7_dgst.c
+        $(CC) /Fo$(OBJ_D)\p7_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_dgst.c
+
+$(OBJ_D)\p7_s_e.obj: $(SRC_D)\crypto\asn1\p7_s_e.c
+        $(CC) /Fo$(OBJ_D)\p7_s_e.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_s_e.c
+
+$(OBJ_D)\p7_enc.obj: $(SRC_D)\crypto\asn1\p7_enc.c
+        $(CC) /Fo$(OBJ_D)\p7_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_enc.c
+
+$(OBJ_D)\p7_lib.obj: $(SRC_D)\crypto\asn1\p7_lib.c
+        $(CC) /Fo$(OBJ_D)\p7_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_lib.c
+
+$(OBJ_D)\f_int.obj: $(SRC_D)\crypto\asn1\f_int.c
+        $(CC) /Fo$(OBJ_D)\f_int.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\f_int.c
+
+$(OBJ_D)\f_string.obj: $(SRC_D)\crypto\asn1\f_string.c
+        $(CC) /Fo$(OBJ_D)\f_string.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\f_string.c
+
+$(OBJ_D)\i2d_dhp.obj: $(SRC_D)\crypto\asn1\i2d_dhp.c
+        $(CC) /Fo$(OBJ_D)\i2d_dhp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_dhp.c
+
+$(OBJ_D)\i2d_dsap.obj: $(SRC_D)\crypto\asn1\i2d_dsap.c
+        $(CC) /Fo$(OBJ_D)\i2d_dsap.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_dsap.c
+
+$(OBJ_D)\d2i_dhp.obj: $(SRC_D)\crypto\asn1\d2i_dhp.c
+        $(CC) /Fo$(OBJ_D)\d2i_dhp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_dhp.c
+
+$(OBJ_D)\d2i_dsap.obj: $(SRC_D)\crypto\asn1\d2i_dsap.c
+        $(CC) /Fo$(OBJ_D)\d2i_dsap.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_dsap.c
+
+$(OBJ_D)\n_pkey.obj: $(SRC_D)\crypto\asn1\n_pkey.c
+        $(CC) /Fo$(OBJ_D)\n_pkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\n_pkey.c
+
+$(OBJ_D)\a_hdr.obj: $(SRC_D)\crypto\asn1\a_hdr.c
+        $(CC) /Fo$(OBJ_D)\a_hdr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_hdr.c
+
+$(OBJ_D)\x_pkey.obj: $(SRC_D)\crypto\asn1\x_pkey.c
+        $(CC) /Fo$(OBJ_D)\x_pkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_pkey.c
+
+$(OBJ_D)\a_bool.obj: $(SRC_D)\crypto\asn1\a_bool.c
+        $(CC) /Fo$(OBJ_D)\a_bool.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_bool.c
+
+$(OBJ_D)\x_exten.obj: $(SRC_D)\crypto\asn1\x_exten.c
+        $(CC) /Fo$(OBJ_D)\x_exten.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_exten.c
+
+$(OBJ_D)\asn1_par.obj: $(SRC_D)\crypto\asn1\asn1_par.c
+        $(CC) /Fo$(OBJ_D)\asn1_par.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\asn1_par.c
+
+$(OBJ_D)\asn1_lib.obj: $(SRC_D)\crypto\asn1\asn1_lib.c
+        $(CC) /Fo$(OBJ_D)\asn1_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\asn1_lib.c
+
+$(OBJ_D)\asn1_err.obj: $(SRC_D)\crypto\asn1\asn1_err.c
+        $(CC) /Fo$(OBJ_D)\asn1_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\asn1_err.c
+
+$(OBJ_D)\a_meth.obj: $(SRC_D)\crypto\asn1\a_meth.c
+        $(CC) /Fo$(OBJ_D)\a_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_meth.c
+
+$(OBJ_D)\a_bytes.obj: $(SRC_D)\crypto\asn1\a_bytes.c
+        $(CC) /Fo$(OBJ_D)\a_bytes.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_bytes.c
+
+$(OBJ_D)\evp_asn1.obj: $(SRC_D)\crypto\asn1\evp_asn1.c
+        $(CC) /Fo$(OBJ_D)\evp_asn1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\evp_asn1.c
+
+$(OBJ_D)\x509_def.obj: $(SRC_D)\crypto\x509\x509_def.c
+        $(CC) /Fo$(OBJ_D)\x509_def.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_def.c
+
+$(OBJ_D)\x509_d2.obj: $(SRC_D)\crypto\x509\x509_d2.c
+        $(CC) /Fo$(OBJ_D)\x509_d2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_d2.c
+
+$(OBJ_D)\x509_r2x.obj: $(SRC_D)\crypto\x509\x509_r2x.c
+        $(CC) /Fo$(OBJ_D)\x509_r2x.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_r2x.c
+
+$(OBJ_D)\x509_cmp.obj: $(SRC_D)\crypto\x509\x509_cmp.c
+        $(CC) /Fo$(OBJ_D)\x509_cmp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_cmp.c
+
+$(OBJ_D)\x509_obj.obj: $(SRC_D)\crypto\x509\x509_obj.c
+        $(CC) /Fo$(OBJ_D)\x509_obj.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_obj.c
+
+$(OBJ_D)\x509_req.obj: $(SRC_D)\crypto\x509\x509_req.c
+        $(CC) /Fo$(OBJ_D)\x509_req.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_req.c
+
+$(OBJ_D)\x509_vfy.obj: $(SRC_D)\crypto\x509\x509_vfy.c
+        $(CC) /Fo$(OBJ_D)\x509_vfy.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_vfy.c
+
+$(OBJ_D)\x509_set.obj: $(SRC_D)\crypto\x509\x509_set.c
+        $(CC) /Fo$(OBJ_D)\x509_set.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_set.c
+
+$(OBJ_D)\x509rset.obj: $(SRC_D)\crypto\x509\x509rset.c
+        $(CC) /Fo$(OBJ_D)\x509rset.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509rset.c
+
+$(OBJ_D)\x509_err.obj: $(SRC_D)\crypto\x509\x509_err.c
+        $(CC) /Fo$(OBJ_D)\x509_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_err.c
+
+$(OBJ_D)\x509name.obj: $(SRC_D)\crypto\x509\x509name.c
+        $(CC) /Fo$(OBJ_D)\x509name.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509name.c
+
+$(OBJ_D)\x509_v3.obj: $(SRC_D)\crypto\x509\x509_v3.c
+        $(CC) /Fo$(OBJ_D)\x509_v3.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_v3.c
+
+$(OBJ_D)\x509_ext.obj: $(SRC_D)\crypto\x509\x509_ext.c
+        $(CC) /Fo$(OBJ_D)\x509_ext.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_ext.c
+
+$(OBJ_D)\x509pack.obj: $(SRC_D)\crypto\x509\x509pack.c
+        $(CC) /Fo$(OBJ_D)\x509pack.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509pack.c
+
+$(OBJ_D)\x509type.obj: $(SRC_D)\crypto\x509\x509type.c
+        $(CC) /Fo$(OBJ_D)\x509type.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509type.c
+
+$(OBJ_D)\x509_lu.obj: $(SRC_D)\crypto\x509\x509_lu.c
+        $(CC) /Fo$(OBJ_D)\x509_lu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_lu.c
+
+$(OBJ_D)\x_all.obj: $(SRC_D)\crypto\x509\x_all.c
+        $(CC) /Fo$(OBJ_D)\x_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x_all.c
+
+$(OBJ_D)\x509_txt.obj: $(SRC_D)\crypto\x509\x509_txt.c
+        $(CC) /Fo$(OBJ_D)\x509_txt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_txt.c
+
+$(OBJ_D)\by_file.obj: $(SRC_D)\crypto\x509\by_file.c
+        $(CC) /Fo$(OBJ_D)\by_file.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\by_file.c
+
+$(OBJ_D)\by_dir.obj: $(SRC_D)\crypto\x509\by_dir.c
+        $(CC) /Fo$(OBJ_D)\by_dir.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\by_dir.c
+
+$(OBJ_D)\v3_net.obj: $(SRC_D)\crypto\x509\v3_net.c
+        $(CC) /Fo$(OBJ_D)\v3_net.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\v3_net.c
+
+$(OBJ_D)\v3_x509.obj: $(SRC_D)\crypto\x509\v3_x509.c
+        $(CC) /Fo$(OBJ_D)\v3_x509.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\v3_x509.c
+
+$(OBJ_D)\conf.obj: $(SRC_D)\crypto\conf\conf.c
+        $(CC) /Fo$(OBJ_D)\conf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\conf\conf.c
+
+$(OBJ_D)\conf_err.obj: $(SRC_D)\crypto\conf\conf_err.c
+        $(CC) /Fo$(OBJ_D)\conf_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\conf\conf_err.c
+
+$(OBJ_D)\txt_db.obj: $(SRC_D)\crypto\txt_db\txt_db.c
+        $(CC) /Fo$(OBJ_D)\txt_db.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\txt_db\txt_db.c
+
+$(OBJ_D)\pk7_lib.obj: $(SRC_D)\crypto\pkcs7\pk7_lib.c
+        $(CC) /Fo$(OBJ_D)\pk7_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pkcs7\pk7_lib.c
+
+$(OBJ_D)\pkcs7err.obj: $(SRC_D)\crypto\pkcs7\pkcs7err.c
+        $(CC) /Fo$(OBJ_D)\pkcs7err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pkcs7\pkcs7err.c
+
+$(OBJ_D)\pk7_doit.obj: $(SRC_D)\crypto\pkcs7\pk7_doit.c
+        $(CC) /Fo$(OBJ_D)\pk7_doit.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pkcs7\pk7_doit.c
+
+$(OBJ_D)\s2_meth.obj: $(SRC_D)\ssl\s2_meth.c
+        $(CC) /Fo$(OBJ_D)\s2_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_meth.c
+
+$(OBJ_D)\s2_srvr.obj: $(SRC_D)\ssl\s2_srvr.c
+        $(CC) /Fo$(OBJ_D)\s2_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_srvr.c
+
+$(OBJ_D)\s2_clnt.obj: $(SRC_D)\ssl\s2_clnt.c
+        $(CC) /Fo$(OBJ_D)\s2_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_clnt.c
+
+$(OBJ_D)\s2_lib.obj: $(SRC_D)\ssl\s2_lib.c
+        $(CC) /Fo$(OBJ_D)\s2_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_lib.c
+
+$(OBJ_D)\s2_enc.obj: $(SRC_D)\ssl\s2_enc.c
+        $(CC) /Fo$(OBJ_D)\s2_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_enc.c
+
+$(OBJ_D)\s2_pkt.obj: $(SRC_D)\ssl\s2_pkt.c
+        $(CC) /Fo$(OBJ_D)\s2_pkt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_pkt.c
+
+$(OBJ_D)\s3_meth.obj: $(SRC_D)\ssl\s3_meth.c
+        $(CC) /Fo$(OBJ_D)\s3_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_meth.c
+
+$(OBJ_D)\s3_srvr.obj: $(SRC_D)\ssl\s3_srvr.c
+        $(CC) /Fo$(OBJ_D)\s3_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_srvr.c
+
+$(OBJ_D)\s3_clnt.obj: $(SRC_D)\ssl\s3_clnt.c
+        $(CC) /Fo$(OBJ_D)\s3_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_clnt.c
+
+$(OBJ_D)\s3_lib.obj: $(SRC_D)\ssl\s3_lib.c
+        $(CC) /Fo$(OBJ_D)\s3_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_lib.c
+
+$(OBJ_D)\s3_enc.obj: $(SRC_D)\ssl\s3_enc.c
+        $(CC) /Fo$(OBJ_D)\s3_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_enc.c
+
+$(OBJ_D)\s3_pkt.obj: $(SRC_D)\ssl\s3_pkt.c
+        $(CC) /Fo$(OBJ_D)\s3_pkt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_pkt.c
+
+$(OBJ_D)\s3_both.obj: $(SRC_D)\ssl\s3_both.c
+        $(CC) /Fo$(OBJ_D)\s3_both.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_both.c
+
+$(OBJ_D)\s23_meth.obj: $(SRC_D)\ssl\s23_meth.c
+        $(CC) /Fo$(OBJ_D)\s23_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_meth.c
+
+$(OBJ_D)\s23_srvr.obj: $(SRC_D)\ssl\s23_srvr.c
+        $(CC) /Fo$(OBJ_D)\s23_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_srvr.c
+
+$(OBJ_D)\s23_clnt.obj: $(SRC_D)\ssl\s23_clnt.c
+        $(CC) /Fo$(OBJ_D)\s23_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_clnt.c
+
+$(OBJ_D)\s23_lib.obj: $(SRC_D)\ssl\s23_lib.c
+        $(CC) /Fo$(OBJ_D)\s23_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_lib.c
+
+$(OBJ_D)\s23_pkt.obj: $(SRC_D)\ssl\s23_pkt.c
+        $(CC) /Fo$(OBJ_D)\s23_pkt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_pkt.c
+
+$(OBJ_D)\t1_meth.obj: $(SRC_D)\ssl\t1_meth.c
+        $(CC) /Fo$(OBJ_D)\t1_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_meth.c
+
+$(OBJ_D)\t1_srvr.obj: $(SRC_D)\ssl\t1_srvr.c
+        $(CC) /Fo$(OBJ_D)\t1_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_srvr.c
+
+$(OBJ_D)\t1_clnt.obj: $(SRC_D)\ssl\t1_clnt.c
+        $(CC) /Fo$(OBJ_D)\t1_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_clnt.c
+
+$(OBJ_D)\t1_lib.obj: $(SRC_D)\ssl\t1_lib.c
+        $(CC) /Fo$(OBJ_D)\t1_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_lib.c
+
+$(OBJ_D)\t1_enc.obj: $(SRC_D)\ssl\t1_enc.c
+        $(CC) /Fo$(OBJ_D)\t1_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_enc.c
+
+$(OBJ_D)\ssl_lib.obj: $(SRC_D)\ssl\ssl_lib.c
+        $(CC) /Fo$(OBJ_D)\ssl_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_lib.c
+
+$(OBJ_D)\ssl_err2.obj: $(SRC_D)\ssl\ssl_err2.c
+        $(CC) /Fo$(OBJ_D)\ssl_err2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_err2.c
+
+$(OBJ_D)\ssl_cert.obj: $(SRC_D)\ssl\ssl_cert.c
+        $(CC) /Fo$(OBJ_D)\ssl_cert.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_cert.c
+
+$(OBJ_D)\ssl_sess.obj: $(SRC_D)\ssl\ssl_sess.c
+        $(CC) /Fo$(OBJ_D)\ssl_sess.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_sess.c
+
+$(OBJ_D)\ssl_ciph.obj: $(SRC_D)\ssl\ssl_ciph.c
+        $(CC) /Fo$(OBJ_D)\ssl_ciph.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_ciph.c
+
+$(OBJ_D)\ssl_stat.obj: $(SRC_D)\ssl\ssl_stat.c
+        $(CC) /Fo$(OBJ_D)\ssl_stat.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_stat.c
+
+$(OBJ_D)\ssl_rsa.obj: $(SRC_D)\ssl\ssl_rsa.c
+        $(CC) /Fo$(OBJ_D)\ssl_rsa.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_rsa.c
+
+$(OBJ_D)\ssl_asn1.obj: $(SRC_D)\ssl\ssl_asn1.c
+        $(CC) /Fo$(OBJ_D)\ssl_asn1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_asn1.c
+
+$(OBJ_D)\ssl_txt.obj: $(SRC_D)\ssl\ssl_txt.c
+        $(CC) /Fo$(OBJ_D)\ssl_txt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_txt.c
+
+$(OBJ_D)\ssl_algs.obj: $(SRC_D)\ssl\ssl_algs.c
+        $(CC) /Fo$(OBJ_D)\ssl_algs.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_algs.c
+
+$(OBJ_D)\bio_ssl.obj: $(SRC_D)\ssl\bio_ssl.c
+        $(CC) /Fo$(OBJ_D)\bio_ssl.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\bio_ssl.c
+
+$(OBJ_D)\ssl_err.obj: $(SRC_D)\ssl\ssl_err.c
+        $(CC) /Fo$(OBJ_D)\ssl_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_err.c
+
+$(OBJ_D)\rsaref.obj: $(SRC_D)\rsaref\rsaref.c
+        $(CC) /Fo$(OBJ_D)\rsaref.obj  $(LIB_CFLAGS) -c $(SRC_D)\rsaref\rsaref.c
+
+$(OBJ_D)\rsar_err.obj: $(SRC_D)\rsaref\rsar_err.c
+        $(CC) /Fo$(OBJ_D)\rsar_err.obj  $(LIB_CFLAGS) -c $(SRC_D)\rsaref\rsar_err.c
+
+$(TEST_D)\md2test.exe: $(OBJ_D)\md2test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\md2test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\md2test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\md5test.exe: $(OBJ_D)\md5test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\md5test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\md5test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\shatest.exe: $(OBJ_D)\shatest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\shatest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\shatest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\sha1test.exe: $(OBJ_D)\sha1test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\sha1test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\sha1test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\mdc2test.exe: $(OBJ_D)\mdc2test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\mdc2test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\mdc2test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\hmactest.exe: $(OBJ_D)\hmactest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\hmactest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\hmactest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\rmdtest.exe: $(OBJ_D)\rmdtest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\rmdtest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rmdtest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\destest.exe: $(OBJ_D)\destest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\destest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\destest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\rc2test.exe: $(OBJ_D)\rc2test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\rc2test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rc2test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\rc4test.exe: $(OBJ_D)\rc4test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\rc4test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rc4test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\rc5test.exe: $(OBJ_D)\rc5test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\rc5test.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rc5test.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\ideatest.exe: $(OBJ_D)\ideatest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\ideatest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\ideatest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\bftest.exe: $(OBJ_D)\bftest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\bftest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\bftest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\casttest.exe: $(OBJ_D)\casttest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\casttest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\casttest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\bntest.exe: $(OBJ_D)\bntest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\bntest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\bntest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\exptest.exe: $(OBJ_D)\exptest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\exptest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\exptest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\dsatest.exe: $(OBJ_D)\dsatest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\dsatest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\dsatest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\dhtest.exe: $(OBJ_D)\dhtest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\dhtest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\dhtest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\randtest.exe: $(OBJ_D)\randtest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\randtest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\randtest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(TEST_D)\ssltest.exe: $(OBJ_D)\ssltest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(TEST_D)\ssltest.exe @<<
+  $(APP_EX_OBJ) $(OBJ_D)\ssltest.obj $(L_LIBS) $(EX_LIBS)
+<<
+
+$(O_SSL): $(SSLOBJ)
+        $(LINK) $(MLFLAGS) /out:$(O_SSL) /def:ms/SSLEAY32.def @<<
+  $(SHLIB_EX_OBJ) $(SSLOBJ)  $(L_CRYPTO) wsock32.lib gdi32.lib
+<<
+
+$(O_RSAGLUE): $(RSAGLUEOBJ)
+        $(MKLIB) /out:$(O_RSAGLUE) @<<
+  $(RSAGLUEOBJ)
+<<
+
+$(O_CRYPTO): $(CRYPTOOBJ)
+        $(LINK) $(MLFLAGS) /out:$(O_CRYPTO) /def:ms/LIBEAY32.def @<<
+  $(SHLIB_EX_OBJ) $(CRYPTOOBJ)  wsock32.lib gdi32.lib
+<<
+
+$(BIN_D)\$(E_EXE).exe: $(E_OBJ) $(LIBS_DEP)
+  $(LINK) $(LFLAGS) /out:$(BIN_D)\$(E_EXE).exe @<<
+  $(APP_EX_OBJ) $(E_OBJ) $(L_LIBS) $(EX_LIBS)
+<<
+
diff --git a/src/lib/libssl/src/ms/ssleay16.def b/src/lib/libssl/src/ms/ssleay16.def
new file mode 100644
index 0000000000..2c61644308
--- /dev/null
+++ b/src/lib/libssl/src/ms/ssleay16.def
@@ -0,0 +1,171 @@
+;
+; Definition file for the DDL version of the SSLEAY16 library from SSLeay
+;
+
+LIBRARY         SSLEAY16
+
+DESCRIPTION     'SSLeay SSLEAY16 - eay@cryptsoft.com'
+
+CODE            PRELOAD MOVEABLE
+DATA            PRELOAD MOVEABLE SINGLE
+
+EXETYPE         WINDOWS
+
+HEAPSIZE        4096
+STACKSIZE       8192
+
+EXPORTS
+    _SSLeay_add_ssl_algorithms          @109
+    _BIO_f_ssl                          @121
+    _BIO_new_buffer_ssl_connect         @173
+    _BIO_new_ssl                        @122
+    _BIO_new_ssl_connect                @174
+    _BIO_ssl_copy_session_id            @124
+    _BIO_ssl_shutdown                   @131
+    _ERR_load_SSL_strings               @1
+    _SSL_CIPHER_description             @2
+    _SSL_CIPHER_get_bits                @128
+    _SSL_CIPHER_get_name                @130
+    _SSL_CIPHER_get_version             @129
+    _SSL_CTX_add_client_CA              @3
+    _SSL_CTX_add_session                @4
+    _SSL_CTX_check_private_key          @5
+    _SSL_CTX_ctrl                       @6
+    _SSL_CTX_flush_sessions             @7
+    _SSL_CTX_free                       @8
+    _SSL_CTX_get_client_CA_list         @9
+    _SSL_CTX_get_ex_data                @138
+    _SSL_CTX_get_ex_new_index           @167
+    _SSL_CTX_get_quiet_shutdown         @140
+    _SSL_CTX_get_verify_callback        @10
+    _SSL_CTX_get_verify_mode            @11
+    _SSL_CTX_load_verify_locations      @141
+    _SSL_CTX_new                        @12
+    _SSL_CTX_remove_session             @13
+    _SSL_CTX_set_cert_verify_cb         @14
+    _SSL_CTX_set_cipher_list            @15
+    _SSL_CTX_set_client_CA_list         @16
+    _SSL_CTX_set_default_passwd_cb      @17
+    _SSL_CTX_set_default_verify_paths   @142
+    _SSL_CTX_set_ex_data                @143
+    _SSL_CTX_set_quiet_shutdown         @145
+    _SSL_CTX_set_ssl_version            @19
+    _SSL_CTX_set_verify                 @21
+    _SSL_CTX_use_PrivateKey             @22
+    _SSL_CTX_use_PrivateKey_ASN1        @23
+    _SSL_CTX_use_PrivateKey_file        @24
+    _SSL_CTX_use_RSAPrivateKey          @25
+    _SSL_CTX_use_RSAPrivateKey_ASN1     @26
+    _SSL_CTX_use_RSAPrivateKey_file     @27
+    _SSL_CTX_use_certificate            @28
+    _SSL_CTX_use_certificate_ASN1       @29
+    _SSL_CTX_use_certificate_file       @30
+    _SSL_SESSION_cmp                    @132
+    _SSL_SESSION_free                   @31
+    _SSL_SESSION_get_ex_data            @146
+    _SSL_SESSION_get_ex_new_index       @168
+    _SSL_SESSION_get_time               @134
+    _SSL_SESSION_get_timeout            @136
+    _SSL_SESSION_hash                   @133
+    _SSL_SESSION_new                    @32
+    _SSL_SESSION_print                  @33
+    _SSL_SESSION_set_ex_data            @148
+    _SSL_SESSION_set_time               @135
+    _SSL_SESSION_set_timeout            @137
+    _SSL_accept                         @35
+    _SSL_add_client_CA                  @36
+    _SSL_alert_desc_string              @37
+    _SSL_alert_desc_string_long         @38
+    _SSL_alert_type_string              @39
+    _SSL_alert_type_string_long         @40
+    _SSL_check_private_key              @41
+    _SSL_clear                          @42
+    _SSL_connect                        @43
+    _SSL_copy_session_id                @44
+    _SSL_ctrl                           @45
+    _SSL_do_handshake                   @125
+    _SSL_dup                            @46
+    _SSL_dup_CA_list                    @47
+    _SSL_free                           @48
+    _SSL_get_SSL_CTX                    @150
+    _SSL_get_certificate                @49
+    _SSL_get_cipher_list                @52
+    _SSL_get_ciphers                    @55
+    _SSL_get_client_CA_list             @56
+    _SSL_get_current_cipher             @127
+    _SSL_get_default_timeout            @57
+    _SSL_get_error                      @58
+    _SSL_get_ex_data                    @151
+    _SSL_get_ex_new_index               @169
+    _SSL_get_fd                         @59
+    _SSL_get_info_callback              @165
+    _SSL_get_peer_cert_chain            @60
+    _SSL_get_peer_certificate           @61
+    _SSL_get_privatekey                 @126
+    _SSL_get_quiet_shutdown             @153
+    _SSL_get_rbio                       @63
+    _SSL_get_read_ahead                 @64
+    _SSL_get_session                    @154
+    _SSL_get_shared_ciphers             @65
+    _SSL_get_shutdown                   @155
+    _SSL_get_ssl_method                 @66
+    _SSL_get_verify_mode                @70
+    _SSL_get_verify_result              @157
+    _SSL_get_version                    @71
+    _SSL_get_wbio                       @72
+    _SSL_load_client_CA_file            @73
+    _SSL_load_error_strings             @74
+    _SSL_new                            @75
+    _SSL_peek                           @76
+    _SSL_pending                        @77
+    _SSL_read                           @78
+    _SSL_renegotiate                    @79
+    _SSL_rstate_string                  @80
+    _SSL_rstate_string_long             @81
+    _SSL_set_accept_state               @82
+    _SSL_set_bio                        @83
+    _SSL_set_cipher_list                @84
+    _SSL_set_client_CA_list             @85
+    _SSL_set_connect_state              @86
+    _SSL_set_ex_data                    @158
+    _SSL_set_fd                         @87
+    _SSL_set_info_callback              @160
+    _SSL_set_quiet_shutdown             @161
+    _SSL_set_read_ahead                 @88
+    _SSL_set_rfd                        @89
+    _SSL_set_session                    @90
+    _SSL_set_shutdown                   @162
+    _SSL_set_ssl_method                 @91
+    _SSL_set_verify                     @94
+    _SSL_set_verify_result              @163
+    _SSL_set_wfd                        @95
+    _SSL_shutdown                       @96
+    _SSL_state                          @166
+    _SSL_state_string                   @97
+    _SSL_state_string_long              @98
+    _SSL_use_PrivateKey                 @99
+    _SSL_use_PrivateKey_ASN1            @100
+    _SSL_use_PrivateKey_file            @101
+    _SSL_use_RSAPrivateKey              @102
+    _SSL_use_RSAPrivateKey_ASN1         @103
+    _SSL_use_RSAPrivateKey_file         @104
+    _SSL_use_certificate                @105
+    _SSL_use_certificate_ASN1           @106
+    _SSL_use_certificate_file           @107
+    _SSL_version                        @164
+    _SSL_write                          @108
+    _SSLv23_client_method               @110
+    _SSLv23_method                      @111
+    _SSLv23_server_method               @112
+    _SSLv2_client_method                @113
+    _SSLv2_method                       @114
+    _SSLv2_server_method                @115
+    _SSLv3_client_method                @116
+    _SSLv3_method                       @117
+    _SSLv3_server_method                @118
+    _TLSv1_client_method                @172
+    _TLSv1_method                       @170
+    _TLSv1_server_method                @171
+    _d2i_SSL_SESSION                    @119
+    _i2d_SSL_SESSION                    @120
+
diff --git a/src/lib/libssl/src/ms/ssleay32.def b/src/lib/libssl/src/ms/ssleay32.def
new file mode 100644
index 0000000000..aa823b8069
--- /dev/null
+++ b/src/lib/libssl/src/ms/ssleay32.def
@@ -0,0 +1,164 @@
+;
+; Definition file for the DDL version of the SSLEAY32 library from SSLeay
+;
+
+LIBRARY         SSLEAY32
+
+DESCRIPTION     'SSLeay SSLEAY32 - eay@cryptsoft.com'
+
+EXPORTS
+    SSLeay_add_ssl_algorithms          @109
+    BIO_f_ssl                          @121
+    BIO_new_buffer_ssl_connect         @173
+    BIO_new_ssl                        @122
+    BIO_new_ssl_connect                @174
+    BIO_ssl_copy_session_id            @124
+    BIO_ssl_shutdown                   @131
+    ERR_load_SSL_strings               @1
+    SSL_CIPHER_description             @2
+    SSL_CIPHER_get_bits                @128
+    SSL_CIPHER_get_name                @130
+    SSL_CIPHER_get_version             @129
+    SSL_CTX_add_client_CA              @3
+    SSL_CTX_add_session                @4
+    SSL_CTX_check_private_key          @5
+    SSL_CTX_ctrl                       @6
+    SSL_CTX_flush_sessions             @7
+    SSL_CTX_free                       @8
+    SSL_CTX_get_client_CA_list         @9
+    SSL_CTX_get_ex_data                @138
+    SSL_CTX_get_ex_new_index           @167
+    SSL_CTX_get_quiet_shutdown         @140
+    SSL_CTX_get_verify_callback        @10
+    SSL_CTX_get_verify_mode            @11
+    SSL_CTX_load_verify_locations      @141
+    SSL_CTX_new                        @12
+    SSL_CTX_remove_session             @13
+    SSL_CTX_set_cert_verify_cb         @14
+    SSL_CTX_set_cipher_list            @15
+    SSL_CTX_set_client_CA_list         @16
+    SSL_CTX_set_default_passwd_cb      @17
+    SSL_CTX_set_default_verify_paths   @142
+    SSL_CTX_set_ex_data                @143
+    SSL_CTX_set_quiet_shutdown         @145
+    SSL_CTX_set_ssl_version            @19
+    SSL_CTX_set_verify                 @21
+    SSL_CTX_use_PrivateKey             @22
+    SSL_CTX_use_PrivateKey_ASN1        @23
+    SSL_CTX_use_PrivateKey_file        @24
+    SSL_CTX_use_RSAPrivateKey          @25
+    SSL_CTX_use_RSAPrivateKey_ASN1     @26
+    SSL_CTX_use_RSAPrivateKey_file     @27
+    SSL_CTX_use_certificate            @28
+    SSL_CTX_use_certificate_ASN1       @29
+    SSL_CTX_use_certificate_file       @30
+    SSL_SESSION_cmp                    @132
+    SSL_SESSION_free                   @31
+    SSL_SESSION_get_ex_data            @146
+    SSL_SESSION_get_ex_new_index       @168
+    SSL_SESSION_get_time               @134
+    SSL_SESSION_get_timeout            @136
+    SSL_SESSION_hash                   @133
+    SSL_SESSION_new                    @32
+    SSL_SESSION_print                  @33
+    SSL_SESSION_print_fp               @34
+    SSL_SESSION_set_ex_data            @148
+    SSL_SESSION_set_time               @135
+    SSL_SESSION_set_timeout            @137
+    SSL_accept                         @35
+    SSL_add_client_CA                  @36
+    SSL_alert_desc_string              @37
+    SSL_alert_desc_string_long         @38
+    SSL_alert_type_string              @39
+    SSL_alert_type_string_long         @40
+    SSL_check_private_key              @41
+    SSL_clear                          @42
+    SSL_connect                        @43
+    SSL_copy_session_id                @44
+    SSL_ctrl                           @45
+    SSL_do_handshake                   @125
+    SSL_dup                            @46
+    SSL_dup_CA_list                    @47
+    SSL_free                           @48
+    SSL_get_SSL_CTX                    @150
+    SSL_get_certificate                @49
+    SSL_get_cipher_list                @52
+    SSL_get_ciphers                    @55
+    SSL_get_client_CA_list             @56
+    SSL_get_current_cipher             @127
+    SSL_get_default_timeout            @57
+    SSL_get_error                      @58
+    SSL_get_ex_data                    @151
+    SSL_get_ex_new_index               @169
+    SSL_get_fd                         @59
+    SSL_get_info_callback              @165
+    SSL_get_peer_cert_chain            @60
+    SSL_get_peer_certificate           @61
+    SSL_get_privatekey                 @126
+    SSL_get_quiet_shutdown             @153
+    SSL_get_rbio                       @63
+    SSL_get_read_ahead                 @64
+    SSL_get_session                    @154
+    SSL_get_shared_ciphers             @65
+    SSL_get_shutdown                   @155
+    SSL_get_ssl_method                 @66
+    SSL_get_verify_mode                @70
+    SSL_get_verify_result              @157
+    SSL_get_version                    @71
+    SSL_get_wbio                       @72
+    SSL_load_client_CA_file            @73
+    SSL_load_error_strings             @74
+    SSL_new                            @75
+    SSL_peek                           @76
+    SSL_pending                        @77
+    SSL_read                           @78
+    SSL_renegotiate                    @79
+    SSL_rstate_string                  @80
+    SSL_rstate_string_long             @81
+    SSL_set_accept_state               @82
+    SSL_set_bio                        @83
+    SSL_set_cipher_list                @84
+    SSL_set_client_CA_list             @85
+    SSL_set_connect_state              @86
+    SSL_set_ex_data                    @158
+    SSL_set_fd                         @87
+    SSL_set_info_callback              @160
+    SSL_set_quiet_shutdown             @161
+    SSL_set_read_ahead                 @88
+    SSL_set_rfd                        @89
+    SSL_set_session                    @90
+    SSL_set_shutdown                   @162
+    SSL_set_ssl_method                 @91
+    SSL_set_verify                     @94
+    SSL_set_verify_result              @163
+    SSL_set_wfd                        @95
+    SSL_shutdown                       @96
+    SSL_state                          @166
+    SSL_state_string                   @97
+    SSL_state_string_long              @98
+    SSL_use_PrivateKey                 @99
+    SSL_use_PrivateKey_ASN1            @100
+    SSL_use_PrivateKey_file            @101
+    SSL_use_RSAPrivateKey              @102
+    SSL_use_RSAPrivateKey_ASN1         @103
+    SSL_use_RSAPrivateKey_file         @104
+    SSL_use_certificate                @105
+    SSL_use_certificate_ASN1           @106
+    SSL_use_certificate_file           @107
+    SSL_version                        @164
+    SSL_write                          @108
+    SSLv23_client_method               @110
+    SSLv23_method                      @111
+    SSLv23_server_method               @112
+    SSLv2_client_method                @113
+    SSLv2_method                       @114
+    SSLv2_server_method                @115
+    SSLv3_client_method                @116
+    SSLv3_method                       @117
+    SSLv3_server_method                @118
+    TLSv1_client_method                @172
+    TLSv1_method                       @170
+    TLSv1_server_method                @171
+    d2i_SSL_SESSION                    @119
+    i2d_SSL_SESSION                    @120
+
diff --git a/src/lib/libssl/src/ms/w31dll.mak b/src/lib/libssl/src/ms/w31dll.mak
new file mode 100644
index 0000000000..6821d82604
--- /dev/null
+++ b/src/lib/libssl/src/ms/w31dll.mak
@@ -0,0 +1,2295 @@
+# This makefile has been automatically generated from the SSLeay distribution.
+# This single makefile will build the complete SSLeay distribution and
+# by default leave the 'intertesting' output files in .\out and the stuff
+# that needs deleting in .\tmp.
+# The file was generated by running 'make makefile.one', which
+# does a 'make files', which writes all the environment variables from all
+# the makefiles to the file call MINFO.  This file is used by
+# util\mk1mf.pl to generate makefile.one.
+# The 'makefile per directory' system suites me when developing this
+# library and also so I can 'distribute' indervidual library sections.
+# The one monster makefile better suits building in non-unix
+# environments.
+
+INSTALLTOP=\usr\local\ssl
+
+# Set your compiler options
+CC=cl
+CFLAG=/ALw /Gx- /Gt256 /Gf /G2 /f- /Ocgnotb2 /W3 /WX -DL_ENDIAN /nologo -DWINDOWS -DWIN16
+APP_CFLAG=/Gw /FPi87
+LIB_CFLAG=/Gw -D_WINDLL -D_DLL
+SHLIB_CFLAG=
+APP_EX_OBJ=setargv.obj
+SHLIB_EX_OBJ=
+# add extra libraries to this define, for solaris -lsocket -lnsl would
+# be added
+EX_LIBS=oldnames llibcewq libw winsock
+
+# The SSLeay directory
+SRC_D=.
+
+LINK=link
+LFLAGS= /FARCALL /NOLOGO /NOD /SEG:1024 /ONERROR:NOEXE /NOE /PACKC:60000 /PACKD:60000 /STACK:20000 /ALIGN:256
+
+BN_MULW_OBJ=crypto\bn\asm\x86w32.obj
+BN_MULW_SRC=crypto\bn\asm\x86w32.asm
+DES_ENC_OBJ=
+DES_ENC_SRC=
+DES_CRYPT_OBJ=
+DES_CRYPT_SRC=
+BF_ENC_OBJ=
+BF_ENC_SRC=
+CAST_ENC_OBJ=
+CAST_ENC_SRC=
+RC4_ENC_OBJ=
+RC4_ENC_SRC=
+RC5_ENC_OBJ=
+RC5_ENC_SRC=
+MD5_ASM_OBJ=
+MD5_ASM_SRC=
+SHA1_ASM_OBJ=
+SHA1_ASM_SRC=
+RMD160_ASM_OBJ=
+RMD160_ASM_SRC=
+
+# The output directory for everything intersting
+OUT_D=out16dll
+# The output directory for all the temporary muck
+TMP_D=tmp16dll
+# The output directory for the header files
+INC_D=inc16
+
+CP=copy
+RM=del
+RANLIB=
+MKDIR=mkdir
+MKLIB=lib /PAGESIZE:1024
+MLFLAGS= /FARCALL /NOLOGO /NOD /SEG:1024 /ONERROR:NOEXE /NOE /PACKC:60000 /PACKD:60000
+ASM=ml /Cp /c /Cx
+
+######################################################
+# You should not need to touch anything below this point
+######################################################
+
+E_EXE=ssleay
+SSL=ssleay16
+CRYPTO=libeay16
+RSAGLUE=RSAglue
+
+# BIN_D  - Binary output directory
+# TEST_D - Binary test file output directory
+# LIB_D  - library output directory
+BIN_D=$(OUT_D)
+TEST_D=$(OUT_D)
+LIB_D=$(OUT_D)
+
+# INCL_D - local library directory
+# OBJ_D  - temp object file directory
+OBJ_D=$(TMP_D)
+INCL_D=$(TMP_D)
+
+O_SSL=     $(LIB_D)\$(SSL).dll
+O_CRYPTO=  $(LIB_D)\$(CRYPTO).dll
+O_RSAGLUE= $(LIB_D)\$(RSAGLUE).lib
+SO_SSL=    $(SSL)
+SO_CRYPTO= $(CRYPTO)
+L_SSL=     $(LIB_D)\$(SSL).lib
+L_CRYPTO=  $(LIB_D)\$(CRYPTO).lib
+
+L_LIBS= $(L_SSL) $(L_CRYPTO)
+#L_LIBS= $(O_SSL) $(O_RSAGLUE) -lrsaref $(O_CRYPTO)
+
+######################################################
+# Don't touch anything below this point
+######################################################
+
+INC=-I$(INC_D) -I$(INCL_D)
+APP_CFLAGS=$(INC) $(CFLAG) $(APP_CFLAG)
+LIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG)
+SHLIB_CFLAGS=$(INC) $(CFLAG) $(LIB_CFLAG) $(SHLIB_CFLAG)
+LIBS_DEP=$(O_CRYPTO) $(O_RSAGLUE) $(O_SSL)
+
+#############################################
+HEADER=$(INCL_D)\cryptlib.h \
+        $(INCL_D)\date.h $(INCL_D)\md5_locl.h $(INCL_D)\sha_locl.h \
+        $(INCL_D)\rmd_locl.h $(INCL_D)\rmdconst.h $(INCL_D)\des_locl.h \
+        $(INCL_D)\rpc_des.h $(INCL_D)\podd.h $(INCL_D)\sk.h \
+        $(INCL_D)\spr.h $(INCL_D)\des_ver.h $(INCL_D)\rc2_locl.h \
+        $(INCL_D)\rc4_locl.h $(INCL_D)\rc5_locl.h $(INCL_D)\idea_lcl.h \
+        $(INCL_D)\bf_pi.h $(INCL_D)\bf_locl.h $(INCL_D)\cast_s.h \
+        $(INCL_D)\cast_lcl.h $(INCL_D)\bn_lcl.h $(INCL_D)\bn_prime.h \
+        $(INCL_D)\obj_dat.h $(INCL_D)\conf_lcl.h $(INCL_D)\ssl_locl.h \
+        $(INCL_D)\rsaref.h $(INCL_D)\apps.h $(INCL_D)\progs.h \
+        $(INCL_D)\s_apps.h $(INCL_D)\testdsa.h $(INCL_D)\testrsa.h
+
+EXHEADER=$(INC_D)\e_os.h \
+        $(INC_D)\crypto.h $(INC_D)\cryptall.h $(INC_D)\md2.h \
+        $(INC_D)\md5.h $(INC_D)\sha.h $(INC_D)\mdc2.h \
+        $(INC_D)\hmac.h $(INC_D)\ripemd.h $(INC_D)\des.h \
+        $(INC_D)\rc2.h $(INC_D)\rc4.h $(INC_D)\rc5.h \
+        $(INC_D)\idea.h $(INC_D)\blowfish.h $(INC_D)\cast.h \
+        $(INC_D)\bn.h $(INC_D)\rsa.h $(INC_D)\dsa.h \
+        $(INC_D)\dh.h $(INC_D)\buffer.h $(INC_D)\bio.h \
+        $(INC_D)\bss_file.c $(INC_D)\stack.h $(INC_D)\lhash.h \
+        $(INC_D)\rand.h $(INC_D)\err.h $(INC_D)\objects.h \
+        $(INC_D)\evp.h $(INC_D)\pem.h $(INC_D)\asn1.h \
+        $(INC_D)\asn1_mac.h $(INC_D)\x509.h $(INC_D)\x509_vfy.h \
+        $(INC_D)\conf.h $(INC_D)\txt_db.h $(INC_D)\pkcs7.h \
+        $(INC_D)\ssl.h $(INC_D)\ssl2.h $(INC_D)\ssl3.h \
+        $(INC_D)\ssl23.h $(INC_D)\tls1.h
+
+T_OBJ=$(OBJ_D)\md2test.obj \
+        $(OBJ_D)\md5test.obj $(OBJ_D)\shatest.obj $(OBJ_D)\sha1test.obj \
+        $(OBJ_D)\mdc2test.obj $(OBJ_D)\hmactest.obj $(OBJ_D)\rmdtest.obj \
+        $(OBJ_D)\destest.obj $(OBJ_D)\rc2test.obj $(OBJ_D)\rc4test.obj \
+        $(OBJ_D)\rc5test.obj $(OBJ_D)\ideatest.obj $(OBJ_D)\bftest.obj \
+        $(OBJ_D)\casttest.obj $(OBJ_D)\bntest.obj $(OBJ_D)\exptest.obj \
+        $(OBJ_D)\dsatest.obj $(OBJ_D)\dhtest.obj $(OBJ_D)\randtest.obj \
+        $(OBJ_D)\ssltest.obj
+
+E_OBJ=$(OBJ_D)\verify.obj \
+        $(OBJ_D)\asn1pars.obj $(OBJ_D)\req.obj $(OBJ_D)\dgst.obj \
+        $(OBJ_D)\dh.obj $(OBJ_D)\enc.obj $(OBJ_D)\gendh.obj \
+        $(OBJ_D)\errstr.obj $(OBJ_D)\ca.obj $(OBJ_D)\pkcs7.obj \
+        $(OBJ_D)\crl2p7.obj $(OBJ_D)\crl.obj $(OBJ_D)\rsa.obj \
+        $(OBJ_D)\dsa.obj $(OBJ_D)\dsaparam.obj $(OBJ_D)\x509.obj \
+        $(OBJ_D)\genrsa.obj $(OBJ_D)\s_server.obj $(OBJ_D)\s_client.obj \
+        $(OBJ_D)\speed.obj $(OBJ_D)\s_time.obj $(OBJ_D)\apps.obj \
+        $(OBJ_D)\s_cb.obj $(OBJ_D)\s_socket.obj $(OBJ_D)\version.obj \
+        $(OBJ_D)\sess_id.obj $(OBJ_D)\ciphers.obj $(OBJ_D)\ssleay.obj
+
+CRYPTOOBJ=$(OBJ_D)\cryptlib.obj \
+        $(OBJ_D)\mem.obj $(OBJ_D)\cversion.obj $(OBJ_D)\ex_data.obj \
+        $(OBJ_D)\cpt_err.obj $(OBJ_D)\md2_dgst.obj $(OBJ_D)\md2_one.obj \
+        $(OBJ_D)\md5_dgst.obj $(OBJ_D)\md5_one.obj $(OBJ_D)\sha_dgst.obj \
+        $(OBJ_D)\sha1dgst.obj $(OBJ_D)\sha_one.obj $(OBJ_D)\sha1_one.obj \
+        $(OBJ_D)\mdc2dgst.obj $(OBJ_D)\mdc2_one.obj $(OBJ_D)\hmac.obj \
+        $(OBJ_D)\rmd_dgst.obj $(OBJ_D)\rmd_one.obj $(OBJ_D)\set_key.obj \
+        $(OBJ_D)\ecb_enc.obj $(OBJ_D)\cbc_enc.obj $(OBJ_D)\ecb3_enc.obj \
+        $(OBJ_D)\cfb64enc.obj $(OBJ_D)\cfb64ede.obj $(OBJ_D)\cfb_enc.obj \
+        $(OBJ_D)\ofb64ede.obj $(OBJ_D)\enc_read.obj $(OBJ_D)\enc_writ.obj \
+        $(OBJ_D)\ofb64enc.obj $(OBJ_D)\ofb_enc.obj $(OBJ_D)\str2key.obj \
+        $(OBJ_D)\pcbc_enc.obj $(OBJ_D)\qud_cksm.obj $(OBJ_D)\rand_key.obj \
+        $(OBJ_D)\des_enc.obj $(OBJ_D)\fcrypt_b.obj $(OBJ_D)\read2pwd.obj \
+        $(OBJ_D)\fcrypt.obj $(OBJ_D)\xcbc_enc.obj $(OBJ_D)\read_pwd.obj \
+        $(OBJ_D)\rpc_enc.obj $(OBJ_D)\cbc_cksm.obj $(OBJ_D)\supp.obj \
+        $(OBJ_D)\rc2_ecb.obj $(OBJ_D)\rc2_skey.obj $(OBJ_D)\rc2_cbc.obj \
+        $(OBJ_D)\rc2cfb64.obj $(OBJ_D)\rc2ofb64.obj $(OBJ_D)\rc4_skey.obj \
+        $(OBJ_D)\rc4_enc.obj $(OBJ_D)\rc5_skey.obj $(OBJ_D)\rc5_ecb.obj \
+        $(OBJ_D)\rc5_enc.obj $(OBJ_D)\rc5cfb64.obj $(OBJ_D)\rc5ofb64.obj \
+        $(OBJ_D)\i_cbc.obj $(OBJ_D)\i_cfb64.obj $(OBJ_D)\i_ofb64.obj \
+        $(OBJ_D)\i_ecb.obj $(OBJ_D)\i_skey.obj $(OBJ_D)\bf_skey.obj \
+        $(OBJ_D)\bf_ecb.obj $(OBJ_D)\bf_enc.obj $(OBJ_D)\bf_cfb64.obj \
+        $(OBJ_D)\bf_ofb64.obj $(OBJ_D)\c_skey.obj $(OBJ_D)\c_ecb.obj \
+        $(OBJ_D)\c_enc.obj $(OBJ_D)\c_cfb64.obj $(OBJ_D)\c_ofb64.obj \
+        $(OBJ_D)\bn_add.obj $(OBJ_D)\bn_div.obj $(OBJ_D)\bn_exp.obj \
+        $(OBJ_D)\bn_lib.obj $(OBJ_D)\bn_mod.obj $(OBJ_D)\bn_mul.obj \
+        $(OBJ_D)\bn_print.obj $(OBJ_D)\bn_rand.obj $(OBJ_D)\bn_shift.obj \
+        $(OBJ_D)\bn_sub.obj $(OBJ_D)\bn_word.obj $(OBJ_D)\bn_blind.obj \
+        $(OBJ_D)\bn_gcd.obj $(OBJ_D)\bn_prime.obj $(OBJ_D)\bn_err.obj \
+        $(OBJ_D)\bn_sqr.obj $(BN_MULW_OBJ) $(OBJ_D)\bn_recp.obj \
+        $(OBJ_D)\bn_mont.obj $(OBJ_D)\bn_mpi.obj $(OBJ_D)\rsa_eay.obj \
+        $(OBJ_D)\rsa_gen.obj $(OBJ_D)\rsa_lib.obj $(OBJ_D)\rsa_sign.obj \
+        $(OBJ_D)\rsa_saos.obj $(OBJ_D)\rsa_err.obj $(OBJ_D)\rsa_pk1.obj \
+        $(OBJ_D)\rsa_ssl.obj $(OBJ_D)\rsa_none.obj $(OBJ_D)\dsa_gen.obj \
+        $(OBJ_D)\dsa_key.obj $(OBJ_D)\dsa_lib.obj $(OBJ_D)\dsa_vrf.obj \
+        $(OBJ_D)\dsa_sign.obj $(OBJ_D)\dsa_err.obj $(OBJ_D)\dh_gen.obj \
+        $(OBJ_D)\dh_key.obj $(OBJ_D)\dh_lib.obj $(OBJ_D)\dh_check.obj \
+        $(OBJ_D)\dh_err.obj $(OBJ_D)\buffer.obj $(OBJ_D)\buf_err.obj \
+        $(OBJ_D)\bio_lib.obj $(OBJ_D)\bio_cb.obj $(OBJ_D)\bio_err.obj \
+        $(OBJ_D)\bss_mem.obj $(OBJ_D)\bss_null.obj $(OBJ_D)\bss_fd.obj \
+        $(OBJ_D)\bss_file.obj $(OBJ_D)\bss_sock.obj $(OBJ_D)\bss_conn.obj \
+        $(OBJ_D)\bf_null.obj $(OBJ_D)\bf_buff.obj $(OBJ_D)\b_print.obj \
+        $(OBJ_D)\b_dump.obj $(OBJ_D)\b_sock.obj $(OBJ_D)\bss_acpt.obj \
+        $(OBJ_D)\bf_nbio.obj $(OBJ_D)\stack.obj $(OBJ_D)\lhash.obj \
+        $(OBJ_D)\lh_stats.obj $(OBJ_D)\md_rand.obj $(OBJ_D)\randfile.obj \
+        $(OBJ_D)\err.obj $(OBJ_D)\err_all.obj $(OBJ_D)\err_prn.obj \
+        $(OBJ_D)\obj_dat.obj $(OBJ_D)\obj_lib.obj $(OBJ_D)\obj_err.obj \
+        $(OBJ_D)\encode.obj $(OBJ_D)\digest.obj $(OBJ_D)\evp_enc.obj \
+        $(OBJ_D)\evp_key.obj $(OBJ_D)\e_ecb_d.obj $(OBJ_D)\e_cbc_d.obj \
+        $(OBJ_D)\e_cfb_d.obj $(OBJ_D)\e_ofb_d.obj $(OBJ_D)\e_ecb_i.obj \
+        $(OBJ_D)\e_cbc_i.obj $(OBJ_D)\e_cfb_i.obj $(OBJ_D)\e_ofb_i.obj \
+        $(OBJ_D)\e_ecb_3d.obj $(OBJ_D)\e_cbc_3d.obj $(OBJ_D)\e_rc4.obj \
+        $(OBJ_D)\names.obj $(OBJ_D)\e_cfb_3d.obj $(OBJ_D)\e_ofb_3d.obj \
+        $(OBJ_D)\e_xcbc_d.obj $(OBJ_D)\e_ecb_r2.obj $(OBJ_D)\e_cbc_r2.obj \
+        $(OBJ_D)\e_cfb_r2.obj $(OBJ_D)\e_ofb_r2.obj $(OBJ_D)\e_ecb_bf.obj \
+        $(OBJ_D)\e_cbc_bf.obj $(OBJ_D)\e_cfb_bf.obj $(OBJ_D)\e_ofb_bf.obj \
+        $(OBJ_D)\e_ecb_c.obj $(OBJ_D)\e_cbc_c.obj $(OBJ_D)\e_cfb_c.obj \
+        $(OBJ_D)\e_ofb_c.obj $(OBJ_D)\e_ecb_r5.obj $(OBJ_D)\e_cbc_r5.obj \
+        $(OBJ_D)\e_cfb_r5.obj $(OBJ_D)\e_ofb_r5.obj $(OBJ_D)\m_null.obj \
+        $(OBJ_D)\m_md2.obj $(OBJ_D)\m_md5.obj $(OBJ_D)\m_sha.obj \
+        $(OBJ_D)\m_sha1.obj $(OBJ_D)\m_dss.obj $(OBJ_D)\m_dss1.obj \
+        $(OBJ_D)\m_mdc2.obj $(OBJ_D)\m_ripemd.obj $(OBJ_D)\p_open.obj \
+        $(OBJ_D)\p_seal.obj $(OBJ_D)\p_sign.obj $(OBJ_D)\p_verify.obj \
+        $(OBJ_D)\p_lib.obj $(OBJ_D)\p_enc.obj $(OBJ_D)\p_dec.obj \
+        $(OBJ_D)\bio_md.obj $(OBJ_D)\bio_b64.obj $(OBJ_D)\bio_enc.obj \
+        $(OBJ_D)\evp_err.obj $(OBJ_D)\e_null.obj $(OBJ_D)\c_all.obj \
+        $(OBJ_D)\evp_lib.obj $(OBJ_D)\pem_sign.obj $(OBJ_D)\pem_seal.obj \
+        $(OBJ_D)\pem_info.obj $(OBJ_D)\pem_lib.obj $(OBJ_D)\pem_all.obj \
+        $(OBJ_D)\pem_err.obj $(OBJ_D)\a_object.obj $(OBJ_D)\a_bitstr.obj \
+        $(OBJ_D)\a_utctm.obj $(OBJ_D)\a_int.obj $(OBJ_D)\a_octet.obj \
+        $(OBJ_D)\a_print.obj $(OBJ_D)\a_type.obj $(OBJ_D)\a_set.obj \
+        $(OBJ_D)\a_dup.obj $(OBJ_D)\a_d2i_fp.obj $(OBJ_D)\a_i2d_fp.obj \
+        $(OBJ_D)\a_sign.obj $(OBJ_D)\a_digest.obj $(OBJ_D)\a_verify.obj \
+        $(OBJ_D)\x_algor.obj $(OBJ_D)\x_val.obj $(OBJ_D)\x_pubkey.obj \
+        $(OBJ_D)\x_sig.obj $(OBJ_D)\x_req.obj $(OBJ_D)\x_attrib.obj \
+        $(OBJ_D)\x_name.obj $(OBJ_D)\x_cinf.obj $(OBJ_D)\x_x509.obj \
+        $(OBJ_D)\x_crl.obj $(OBJ_D)\x_info.obj $(OBJ_D)\x_spki.obj \
+        $(OBJ_D)\d2i_r_pr.obj $(OBJ_D)\i2d_r_pr.obj $(OBJ_D)\d2i_r_pu.obj \
+        $(OBJ_D)\i2d_r_pu.obj $(OBJ_D)\d2i_s_pr.obj $(OBJ_D)\i2d_s_pr.obj \
+        $(OBJ_D)\d2i_s_pu.obj $(OBJ_D)\i2d_s_pu.obj $(OBJ_D)\d2i_pu.obj \
+        $(OBJ_D)\d2i_pr.obj $(OBJ_D)\i2d_pu.obj $(OBJ_D)\i2d_pr.obj \
+        $(OBJ_D)\t_req.obj $(OBJ_D)\t_x509.obj $(OBJ_D)\t_pkey.obj \
+        $(OBJ_D)\p7_i_s.obj $(OBJ_D)\p7_signi.obj $(OBJ_D)\p7_signd.obj \
+        $(OBJ_D)\p7_recip.obj $(OBJ_D)\p7_enc_c.obj $(OBJ_D)\p7_evp.obj \
+        $(OBJ_D)\p7_dgst.obj $(OBJ_D)\p7_s_e.obj $(OBJ_D)\p7_enc.obj \
+        $(OBJ_D)\p7_lib.obj $(OBJ_D)\f_int.obj $(OBJ_D)\f_string.obj \
+        $(OBJ_D)\i2d_dhp.obj $(OBJ_D)\i2d_dsap.obj $(OBJ_D)\d2i_dhp.obj \
+        $(OBJ_D)\d2i_dsap.obj $(OBJ_D)\n_pkey.obj $(OBJ_D)\a_hdr.obj \
+        $(OBJ_D)\x_pkey.obj $(OBJ_D)\a_bool.obj $(OBJ_D)\x_exten.obj \
+        $(OBJ_D)\asn1_par.obj $(OBJ_D)\asn1_lib.obj $(OBJ_D)\asn1_err.obj \
+        $(OBJ_D)\a_meth.obj $(OBJ_D)\a_bytes.obj $(OBJ_D)\evp_asn1.obj \
+        $(OBJ_D)\x509_def.obj $(OBJ_D)\x509_d2.obj $(OBJ_D)\x509_r2x.obj \
+        $(OBJ_D)\x509_cmp.obj $(OBJ_D)\x509_obj.obj $(OBJ_D)\x509_req.obj \
+        $(OBJ_D)\x509_vfy.obj $(OBJ_D)\x509_set.obj $(OBJ_D)\x509rset.obj \
+        $(OBJ_D)\x509_err.obj $(OBJ_D)\x509name.obj $(OBJ_D)\x509_v3.obj \
+        $(OBJ_D)\x509_ext.obj $(OBJ_D)\x509pack.obj $(OBJ_D)\x509type.obj \
+        $(OBJ_D)\x509_lu.obj $(OBJ_D)\x_all.obj $(OBJ_D)\x509_txt.obj \
+        $(OBJ_D)\by_file.obj $(OBJ_D)\by_dir.obj $(OBJ_D)\v3_net.obj \
+        $(OBJ_D)\v3_x509.obj $(OBJ_D)\conf.obj $(OBJ_D)\conf_err.obj \
+        $(OBJ_D)\txt_db.obj $(OBJ_D)\pk7_lib.obj $(OBJ_D)\pkcs7err.obj \
+        $(OBJ_D)\pk7_doit.obj
+
+SSLOBJ=$(OBJ_D)\s2_meth.obj \
+        $(OBJ_D)\s2_srvr.obj $(OBJ_D)\s2_clnt.obj $(OBJ_D)\s2_lib.obj \
+        $(OBJ_D)\s2_enc.obj $(OBJ_D)\s2_pkt.obj $(OBJ_D)\s3_meth.obj \
+        $(OBJ_D)\s3_srvr.obj $(OBJ_D)\s3_clnt.obj $(OBJ_D)\s3_lib.obj \
+        $(OBJ_D)\s3_enc.obj $(OBJ_D)\s3_pkt.obj $(OBJ_D)\s3_both.obj \
+        $(OBJ_D)\s23_meth.obj $(OBJ_D)\s23_srvr.obj $(OBJ_D)\s23_clnt.obj \
+        $(OBJ_D)\s23_lib.obj $(OBJ_D)\s23_pkt.obj $(OBJ_D)\t1_meth.obj \
+        $(OBJ_D)\t1_srvr.obj $(OBJ_D)\t1_clnt.obj $(OBJ_D)\t1_lib.obj \
+        $(OBJ_D)\t1_enc.obj $(OBJ_D)\ssl_lib.obj $(OBJ_D)\ssl_err2.obj \
+        $(OBJ_D)\ssl_cert.obj $(OBJ_D)\ssl_sess.obj $(OBJ_D)\ssl_ciph.obj \
+        $(OBJ_D)\ssl_stat.obj $(OBJ_D)\ssl_rsa.obj $(OBJ_D)\ssl_asn1.obj \
+        $(OBJ_D)\ssl_txt.obj $(OBJ_D)\ssl_algs.obj $(OBJ_D)\bio_ssl.obj \
+        $(OBJ_D)\ssl_err.obj
+
+RSAGLUEOBJ=$(OBJ_D)\rsaref.obj \
+        $(OBJ_D)\rsar_err.obj
+
+T_EXE=$(TEST_D)\md2test.exe \
+        $(TEST_D)\md5test.exe $(TEST_D)\shatest.exe $(TEST_D)\sha1test.exe \
+        $(TEST_D)\mdc2test.exe $(TEST_D)\hmactest.exe $(TEST_D)\rmdtest.exe \
+        $(TEST_D)\destest.exe $(TEST_D)\rc2test.exe $(TEST_D)\rc4test.exe \
+        $(TEST_D)\rc5test.exe $(TEST_D)\ideatest.exe $(TEST_D)\bftest.exe \
+        $(TEST_D)\casttest.exe $(TEST_D)\bntest.exe $(TEST_D)\exptest.exe \
+        $(TEST_D)\dsatest.exe $(TEST_D)\dhtest.exe $(TEST_D)\randtest.exe \
+        $(TEST_D)\ssltest.exe
+
+###################################################################
+all: banner $(TMP_D) $(BIN_D) $(TEST_D) $(LIB_D) $(INC_D) headers lib exe
+
+banner:
+        @echo Make sure you have run 'perl Configure VC-WIN16' in the
+        @echo top level directory, if you don't have perl, you will
+        @echo need to probably edit crypto/bn/bn.h, check the
+        @echo documentation for details.
+
+
+$(TMP_D):
+        $(MKDIR) $(TMP_D)
+
+$(BIN_D):
+        $(MKDIR) $(BIN_D)
+
+$(TEST_D):
+        $(MKDIR) $(TEST_D)
+
+$(LIB_D):
+        $(MKDIR) $(LIB_D)
+
+$(INC_D):
+        $(MKDIR) $(INC_D)
+
+headers: $(HEADER) $(EXHEADER)
+
+lib: $(LIBS_DEP)
+
+exe: $(T_EXE) $(BIN_D)\$(E_EXE).exe
+
+install:
+        $(MKDIR) $(INSTALLTOP)
+        $(MKDIR) $(INSTALLTOP)\bin
+        $(MKDIR) $(INSTALLTOP)\include
+        $(MKDIR) $(INSTALLTOP)\lib
+        $(CP) $(INC_D)\*.[ch] $(INSTALLTOP)\include
+        $(CP) $(BIN_D)\$(E_EXE).exe $(INSTALLTOP)\bin
+        $(CP) $(O_SSL) $(INSTALLTOP)\lib
+        $(CP) $(O_CRYPTO) $(INSTALLTOP)\lib
+
+clean:
+        $(RM) $(TMP_D)\*.*
+
+vclean:
+        $(RM) $(TMP_D)\*.*
+        $(RM) $(OUT_D)\*.*
+
+$(INCL_D)\cryptlib.h: $(SRC_D)\crypto\cryptlib.h
+        $(CP) $(SRC_D)\crypto\cryptlib.h $(INCL_D)\cryptlib.h
+
+$(INCL_D)\date.h: $(SRC_D)\crypto\date.h
+        $(CP) $(SRC_D)\crypto\date.h $(INCL_D)\date.h
+
+$(INCL_D)\md5_locl.h: $(SRC_D)\crypto\md5\md5_locl.h
+        $(CP) $(SRC_D)\crypto\md5\md5_locl.h $(INCL_D)\md5_locl.h
+
+$(INCL_D)\sha_locl.h: $(SRC_D)\crypto\sha\sha_locl.h
+        $(CP) $(SRC_D)\crypto\sha\sha_locl.h $(INCL_D)\sha_locl.h
+
+$(INCL_D)\rmd_locl.h: $(SRC_D)\crypto\ripemd\rmd_locl.h
+        $(CP) $(SRC_D)\crypto\ripemd\rmd_locl.h $(INCL_D)\rmd_locl.h
+
+$(INCL_D)\rmdconst.h: $(SRC_D)\crypto\ripemd\rmdconst.h
+        $(CP) $(SRC_D)\crypto\ripemd\rmdconst.h $(INCL_D)\rmdconst.h
+
+$(INCL_D)\des_locl.h: $(SRC_D)\crypto\des\des_locl.h
+        $(CP) $(SRC_D)\crypto\des\des_locl.h $(INCL_D)\des_locl.h
+
+$(INCL_D)\rpc_des.h: $(SRC_D)\crypto\des\rpc_des.h
+        $(CP) $(SRC_D)\crypto\des\rpc_des.h $(INCL_D)\rpc_des.h
+
+$(INCL_D)\podd.h: $(SRC_D)\crypto\des\podd.h
+        $(CP) $(SRC_D)\crypto\des\podd.h $(INCL_D)\podd.h
+
+$(INCL_D)\sk.h: $(SRC_D)\crypto\des\sk.h
+        $(CP) $(SRC_D)\crypto\des\sk.h $(INCL_D)\sk.h
+
+$(INCL_D)\spr.h: $(SRC_D)\crypto\des\spr.h
+        $(CP) $(SRC_D)\crypto\des\spr.h $(INCL_D)\spr.h
+
+$(INCL_D)\des_ver.h: $(SRC_D)\crypto\des\des_ver.h
+        $(CP) $(SRC_D)\crypto\des\des_ver.h $(INCL_D)\des_ver.h
+
+$(INCL_D)\rc2_locl.h: $(SRC_D)\crypto\rc2\rc2_locl.h
+        $(CP) $(SRC_D)\crypto\rc2\rc2_locl.h $(INCL_D)\rc2_locl.h
+
+$(INCL_D)\rc4_locl.h: $(SRC_D)\crypto\rc4\rc4_locl.h
+        $(CP) $(SRC_D)\crypto\rc4\rc4_locl.h $(INCL_D)\rc4_locl.h
+
+$(INCL_D)\rc5_locl.h: $(SRC_D)\crypto\rc5\rc5_locl.h
+        $(CP) $(SRC_D)\crypto\rc5\rc5_locl.h $(INCL_D)\rc5_locl.h
+
+$(INCL_D)\idea_lcl.h: $(SRC_D)\crypto\idea\idea_lcl.h
+        $(CP) $(SRC_D)\crypto\idea\idea_lcl.h $(INCL_D)\idea_lcl.h
+
+$(INCL_D)\bf_pi.h: $(SRC_D)\crypto\bf\bf_pi.h
+        $(CP) $(SRC_D)\crypto\bf\bf_pi.h $(INCL_D)\bf_pi.h
+
+$(INCL_D)\bf_locl.h: $(SRC_D)\crypto\bf\bf_locl.h
+        $(CP) $(SRC_D)\crypto\bf\bf_locl.h $(INCL_D)\bf_locl.h
+
+$(INCL_D)\cast_s.h: $(SRC_D)\crypto\cast\cast_s.h
+        $(CP) $(SRC_D)\crypto\cast\cast_s.h $(INCL_D)\cast_s.h
+
+$(INCL_D)\cast_lcl.h: $(SRC_D)\crypto\cast\cast_lcl.h
+        $(CP) $(SRC_D)\crypto\cast\cast_lcl.h $(INCL_D)\cast_lcl.h
+
+$(INCL_D)\bn_lcl.h: $(SRC_D)\crypto\bn\bn_lcl.h
+        $(CP) $(SRC_D)\crypto\bn\bn_lcl.h $(INCL_D)\bn_lcl.h
+
+$(INCL_D)\bn_prime.h: $(SRC_D)\crypto\bn\bn_prime.h
+        $(CP) $(SRC_D)\crypto\bn\bn_prime.h $(INCL_D)\bn_prime.h
+
+$(INCL_D)\obj_dat.h: $(SRC_D)\crypto\objects\obj_dat.h
+        $(CP) $(SRC_D)\crypto\objects\obj_dat.h $(INCL_D)\obj_dat.h
+
+$(INCL_D)\conf_lcl.h: $(SRC_D)\crypto\conf\conf_lcl.h
+        $(CP) $(SRC_D)\crypto\conf\conf_lcl.h $(INCL_D)\conf_lcl.h
+
+$(INCL_D)\ssl_locl.h: $(SRC_D)\ssl\ssl_locl.h
+        $(CP) $(SRC_D)\ssl\ssl_locl.h $(INCL_D)\ssl_locl.h
+
+$(INCL_D)\rsaref.h: $(SRC_D)\rsaref\rsaref.h
+        $(CP) $(SRC_D)\rsaref\rsaref.h $(INCL_D)\rsaref.h
+
+$(INCL_D)\apps.h: $(SRC_D)\apps\apps.h
+        $(CP) $(SRC_D)\apps\apps.h $(INCL_D)\apps.h
+
+$(INCL_D)\progs.h: $(SRC_D)\apps\progs.h
+        $(CP) $(SRC_D)\apps\progs.h $(INCL_D)\progs.h
+
+$(INCL_D)\s_apps.h: $(SRC_D)\apps\s_apps.h
+        $(CP) $(SRC_D)\apps\s_apps.h $(INCL_D)\s_apps.h
+
+$(INCL_D)\testdsa.h: $(SRC_D)\apps\testdsa.h
+        $(CP) $(SRC_D)\apps\testdsa.h $(INCL_D)\testdsa.h
+
+$(INCL_D)\testrsa.h: $(SRC_D)\apps\testrsa.h
+        $(CP) $(SRC_D)\apps\testrsa.h $(INCL_D)\testrsa.h
+
+$(INC_D)\e_os.h: $(SRC_D)\.\e_os.h
+        $(CP) $(SRC_D)\.\e_os.h $(INC_D)\e_os.h
+
+$(INC_D)\crypto.h: $(SRC_D)\crypto\crypto.h
+        $(CP) $(SRC_D)\crypto\crypto.h $(INC_D)\crypto.h
+
+$(INC_D)\cryptall.h: $(SRC_D)\crypto\cryptall.h
+        $(CP) $(SRC_D)\crypto\cryptall.h $(INC_D)\cryptall.h
+
+$(INC_D)\md2.h: $(SRC_D)\crypto\md2\md2.h
+        $(CP) $(SRC_D)\crypto\md2\md2.h $(INC_D)\md2.h
+
+$(INC_D)\md5.h: $(SRC_D)\crypto\md5\md5.h
+        $(CP) $(SRC_D)\crypto\md5\md5.h $(INC_D)\md5.h
+
+$(INC_D)\sha.h: $(SRC_D)\crypto\sha\sha.h
+        $(CP) $(SRC_D)\crypto\sha\sha.h $(INC_D)\sha.h
+
+$(INC_D)\mdc2.h: $(SRC_D)\crypto\mdc2\mdc2.h
+        $(CP) $(SRC_D)\crypto\mdc2\mdc2.h $(INC_D)\mdc2.h
+
+$(INC_D)\hmac.h: $(SRC_D)\crypto\hmac\hmac.h
+        $(CP) $(SRC_D)\crypto\hmac\hmac.h $(INC_D)\hmac.h
+
+$(INC_D)\ripemd.h: $(SRC_D)\crypto\ripemd\ripemd.h
+        $(CP) $(SRC_D)\crypto\ripemd\ripemd.h $(INC_D)\ripemd.h
+
+$(INC_D)\des.h: $(SRC_D)\crypto\des\des.h
+        $(CP) $(SRC_D)\crypto\des\des.h $(INC_D)\des.h
+
+$(INC_D)\rc2.h: $(SRC_D)\crypto\rc2\rc2.h
+        $(CP) $(SRC_D)\crypto\rc2\rc2.h $(INC_D)\rc2.h
+
+$(INC_D)\rc4.h: $(SRC_D)\crypto\rc4\rc4.h
+        $(CP) $(SRC_D)\crypto\rc4\rc4.h $(INC_D)\rc4.h
+
+$(INC_D)\rc5.h: $(SRC_D)\crypto\rc5\rc5.h
+        $(CP) $(SRC_D)\crypto\rc5\rc5.h $(INC_D)\rc5.h
+
+$(INC_D)\idea.h: $(SRC_D)\crypto\idea\idea.h
+        $(CP) $(SRC_D)\crypto\idea\idea.h $(INC_D)\idea.h
+
+$(INC_D)\blowfish.h: $(SRC_D)\crypto\bf\blowfish.h
+        $(CP) $(SRC_D)\crypto\bf\blowfish.h $(INC_D)\blowfish.h
+
+$(INC_D)\cast.h: $(SRC_D)\crypto\cast\cast.h
+        $(CP) $(SRC_D)\crypto\cast\cast.h $(INC_D)\cast.h
+
+$(INC_D)\bn.h: $(SRC_D)\crypto\bn\bn.h
+        $(CP) $(SRC_D)\crypto\bn\bn.h $(INC_D)\bn.h
+
+$(INC_D)\rsa.h: $(SRC_D)\crypto\rsa\rsa.h
+        $(CP) $(SRC_D)\crypto\rsa\rsa.h $(INC_D)\rsa.h
+
+$(INC_D)\dsa.h: $(SRC_D)\crypto\dsa\dsa.h
+        $(CP) $(SRC_D)\crypto\dsa\dsa.h $(INC_D)\dsa.h
+
+$(INC_D)\dh.h: $(SRC_D)\crypto\dh\dh.h
+        $(CP) $(SRC_D)\crypto\dh\dh.h $(INC_D)\dh.h
+
+$(INC_D)\buffer.h: $(SRC_D)\crypto\buffer\buffer.h
+        $(CP) $(SRC_D)\crypto\buffer\buffer.h $(INC_D)\buffer.h
+
+$(INC_D)\bio.h: $(SRC_D)\crypto\bio\bio.h
+        $(CP) $(SRC_D)\crypto\bio\bio.h $(INC_D)\bio.h
+
+$(INC_D)\bss_file.c: $(SRC_D)\crypto\bio\bss_file.c
+        $(CP) $(SRC_D)\crypto\bio\bss_file.c $(INC_D)\bss_file.c
+
+$(INC_D)\stack.h: $(SRC_D)\crypto\stack\stack.h
+        $(CP) $(SRC_D)\crypto\stack\stack.h $(INC_D)\stack.h
+
+$(INC_D)\lhash.h: $(SRC_D)\crypto\lhash\lhash.h
+        $(CP) $(SRC_D)\crypto\lhash\lhash.h $(INC_D)\lhash.h
+
+$(INC_D)\rand.h: $(SRC_D)\crypto\rand\rand.h
+        $(CP) $(SRC_D)\crypto\rand\rand.h $(INC_D)\rand.h
+
+$(INC_D)\err.h: $(SRC_D)\crypto\err\err.h
+        $(CP) $(SRC_D)\crypto\err\err.h $(INC_D)\err.h
+
+$(INC_D)\objects.h: $(SRC_D)\crypto\objects\objects.h
+        $(CP) $(SRC_D)\crypto\objects\objects.h $(INC_D)\objects.h
+
+$(INC_D)\evp.h: $(SRC_D)\crypto\evp\evp.h
+        $(CP) $(SRC_D)\crypto\evp\evp.h $(INC_D)\evp.h
+
+$(INC_D)\pem.h: $(SRC_D)\crypto\pem\pem.h
+        $(CP) $(SRC_D)\crypto\pem\pem.h $(INC_D)\pem.h
+
+$(INC_D)\asn1.h: $(SRC_D)\crypto\asn1\asn1.h
+        $(CP) $(SRC_D)\crypto\asn1\asn1.h $(INC_D)\asn1.h
+
+$(INC_D)\asn1_mac.h: $(SRC_D)\crypto\asn1\asn1_mac.h
+        $(CP) $(SRC_D)\crypto\asn1\asn1_mac.h $(INC_D)\asn1_mac.h
+
+$(INC_D)\x509.h: $(SRC_D)\crypto\x509\x509.h
+        $(CP) $(SRC_D)\crypto\x509\x509.h $(INC_D)\x509.h
+
+$(INC_D)\x509_vfy.h: $(SRC_D)\crypto\x509\x509_vfy.h
+        $(CP) $(SRC_D)\crypto\x509\x509_vfy.h $(INC_D)\x509_vfy.h
+
+$(INC_D)\conf.h: $(SRC_D)\crypto\conf\conf.h
+        $(CP) $(SRC_D)\crypto\conf\conf.h $(INC_D)\conf.h
+
+$(INC_D)\txt_db.h: $(SRC_D)\crypto\txt_db\txt_db.h
+        $(CP) $(SRC_D)\crypto\txt_db\txt_db.h $(INC_D)\txt_db.h
+
+$(INC_D)\pkcs7.h: $(SRC_D)\crypto\pkcs7\pkcs7.h
+        $(CP) $(SRC_D)\crypto\pkcs7\pkcs7.h $(INC_D)\pkcs7.h
+
+$(INC_D)\ssl.h: $(SRC_D)\ssl\ssl.h
+        $(CP) $(SRC_D)\ssl\ssl.h $(INC_D)\ssl.h
+
+$(INC_D)\ssl2.h: $(SRC_D)\ssl\ssl2.h
+        $(CP) $(SRC_D)\ssl\ssl2.h $(INC_D)\ssl2.h
+
+$(INC_D)\ssl3.h: $(SRC_D)\ssl\ssl3.h
+        $(CP) $(SRC_D)\ssl\ssl3.h $(INC_D)\ssl3.h
+
+$(INC_D)\ssl23.h: $(SRC_D)\ssl\ssl23.h
+        $(CP) $(SRC_D)\ssl\ssl23.h $(INC_D)\ssl23.h
+
+$(INC_D)\tls1.h: $(SRC_D)\ssl\tls1.h
+        $(CP) $(SRC_D)\ssl\tls1.h $(INC_D)\tls1.h
+
+$(OBJ_D)\md2test.obj: $(SRC_D)\crypto\md2\md2test.c
+        $(CC) /Fo$(OBJ_D)\md2test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\md2\md2test.c
+
+$(OBJ_D)\md5test.obj: $(SRC_D)\crypto\md5\md5test.c
+        $(CC) /Fo$(OBJ_D)\md5test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\md5\md5test.c
+
+$(OBJ_D)\shatest.obj: $(SRC_D)\crypto\sha\shatest.c
+        $(CC) /Fo$(OBJ_D)\shatest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\sha\shatest.c
+
+$(OBJ_D)\sha1test.obj: $(SRC_D)\crypto\sha\sha1test.c
+        $(CC) /Fo$(OBJ_D)\sha1test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\sha\sha1test.c
+
+$(OBJ_D)\mdc2test.obj: $(SRC_D)\crypto\mdc2\mdc2test.c
+        $(CC) /Fo$(OBJ_D)\mdc2test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\mdc2\mdc2test.c
+
+$(OBJ_D)\hmactest.obj: $(SRC_D)\crypto\hmac\hmactest.c
+        $(CC) /Fo$(OBJ_D)\hmactest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\hmac\hmactest.c
+
+$(OBJ_D)\rmdtest.obj: $(SRC_D)\crypto\ripemd\rmdtest.c
+        $(CC) /Fo$(OBJ_D)\rmdtest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\ripemd\rmdtest.c
+
+$(OBJ_D)\destest.obj: $(SRC_D)\crypto\des\destest.c
+        $(CC) /Fo$(OBJ_D)\destest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\des\destest.c
+
+$(OBJ_D)\rc2test.obj: $(SRC_D)\crypto\rc2\rc2test.c
+        $(CC) /Fo$(OBJ_D)\rc2test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2test.c
+
+$(OBJ_D)\rc4test.obj: $(SRC_D)\crypto\rc4\rc4test.c
+        $(CC) /Fo$(OBJ_D)\rc4test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rc4\rc4test.c
+
+$(OBJ_D)\rc5test.obj: $(SRC_D)\crypto\rc5\rc5test.c
+        $(CC) /Fo$(OBJ_D)\rc5test.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5test.c
+
+$(OBJ_D)\ideatest.obj: $(SRC_D)\crypto\idea\ideatest.c
+        $(CC) /Fo$(OBJ_D)\ideatest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\idea\ideatest.c
+
+$(OBJ_D)\bftest.obj: $(SRC_D)\crypto\bf\bftest.c
+        $(CC) /Fo$(OBJ_D)\bftest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\bf\bftest.c
+
+$(OBJ_D)\casttest.obj: $(SRC_D)\crypto\cast\casttest.c
+        $(CC) /Fo$(OBJ_D)\casttest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\cast\casttest.c
+
+$(OBJ_D)\bntest.obj: $(SRC_D)\crypto\bn\bntest.c
+        $(CC) /Fo$(OBJ_D)\bntest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\bn\bntest.c
+
+$(OBJ_D)\exptest.obj: $(SRC_D)\crypto\bn\exptest.c
+        $(CC) /Fo$(OBJ_D)\exptest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\bn\exptest.c
+
+$(OBJ_D)\dsatest.obj: $(SRC_D)\crypto\dsa\dsatest.c
+        $(CC) /Fo$(OBJ_D)\dsatest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\dsa\dsatest.c
+
+$(OBJ_D)\dhtest.obj: $(SRC_D)\crypto\dh\dhtest.c
+        $(CC) /Fo$(OBJ_D)\dhtest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\dh\dhtest.c
+
+$(OBJ_D)\randtest.obj: $(SRC_D)\crypto\rand\randtest.c
+        $(CC) /Fo$(OBJ_D)\randtest.obj $(APP_CFLAGS) -c $(SRC_D)\crypto\rand\randtest.c
+
+$(OBJ_D)\ssltest.obj: $(SRC_D)\ssl\ssltest.c
+        $(CC) /Fo$(OBJ_D)\ssltest.obj $(APP_CFLAGS) -c $(SRC_D)\ssl\ssltest.c
+
+$(OBJ_D)\verify.obj: $(SRC_D)\apps\verify.c
+        $(CC) /Fo$(OBJ_D)\verify.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\verify.c
+
+$(OBJ_D)\asn1pars.obj: $(SRC_D)\apps\asn1pars.c
+        $(CC) /Fo$(OBJ_D)\asn1pars.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\asn1pars.c
+
+$(OBJ_D)\req.obj: $(SRC_D)\apps\req.c
+        $(CC) /Fo$(OBJ_D)\req.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\req.c
+
+$(OBJ_D)\dgst.obj: $(SRC_D)\apps\dgst.c
+        $(CC) /Fo$(OBJ_D)\dgst.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dgst.c
+
+$(OBJ_D)\dh.obj: $(SRC_D)\apps\dh.c
+        $(CC) /Fo$(OBJ_D)\dh.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dh.c
+
+$(OBJ_D)\enc.obj: $(SRC_D)\apps\enc.c
+        $(CC) /Fo$(OBJ_D)\enc.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\enc.c
+
+$(OBJ_D)\gendh.obj: $(SRC_D)\apps\gendh.c
+        $(CC) /Fo$(OBJ_D)\gendh.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\gendh.c
+
+$(OBJ_D)\errstr.obj: $(SRC_D)\apps\errstr.c
+        $(CC) /Fo$(OBJ_D)\errstr.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\errstr.c
+
+$(OBJ_D)\ca.obj: $(SRC_D)\apps\ca.c
+        $(CC) /Fo$(OBJ_D)\ca.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\ca.c
+
+$(OBJ_D)\pkcs7.obj: $(SRC_D)\apps\pkcs7.c
+        $(CC) /Fo$(OBJ_D)\pkcs7.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\pkcs7.c
+
+$(OBJ_D)\crl2p7.obj: $(SRC_D)\apps\crl2p7.c
+        $(CC) /Fo$(OBJ_D)\crl2p7.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\crl2p7.c
+
+$(OBJ_D)\crl.obj: $(SRC_D)\apps\crl.c
+        $(CC) /Fo$(OBJ_D)\crl.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\crl.c
+
+$(OBJ_D)\rsa.obj: $(SRC_D)\apps\rsa.c
+        $(CC) /Fo$(OBJ_D)\rsa.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\rsa.c
+
+$(OBJ_D)\dsa.obj: $(SRC_D)\apps\dsa.c
+        $(CC) /Fo$(OBJ_D)\dsa.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dsa.c
+
+$(OBJ_D)\dsaparam.obj: $(SRC_D)\apps\dsaparam.c
+        $(CC) /Fo$(OBJ_D)\dsaparam.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\dsaparam.c
+
+$(OBJ_D)\x509.obj: $(SRC_D)\apps\x509.c
+        $(CC) /Fo$(OBJ_D)\x509.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\x509.c
+
+$(OBJ_D)\genrsa.obj: $(SRC_D)\apps\genrsa.c
+        $(CC) /Fo$(OBJ_D)\genrsa.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\genrsa.c
+
+$(OBJ_D)\s_server.obj: $(SRC_D)\apps\s_server.c
+        $(CC) /Fo$(OBJ_D)\s_server.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_server.c
+
+$(OBJ_D)\s_client.obj: $(SRC_D)\apps\s_client.c
+        $(CC) /Fo$(OBJ_D)\s_client.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_client.c
+
+$(OBJ_D)\speed.obj: $(SRC_D)\apps\speed.c
+        $(CC) /Fo$(OBJ_D)\speed.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\speed.c
+
+$(OBJ_D)\s_time.obj: $(SRC_D)\apps\s_time.c
+        $(CC) /Fo$(OBJ_D)\s_time.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_time.c
+
+$(OBJ_D)\apps.obj: $(SRC_D)\apps\apps.c
+        $(CC) /Fo$(OBJ_D)\apps.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\apps.c
+
+$(OBJ_D)\s_cb.obj: $(SRC_D)\apps\s_cb.c
+        $(CC) /Fo$(OBJ_D)\s_cb.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_cb.c
+
+$(OBJ_D)\s_socket.obj: $(SRC_D)\apps\s_socket.c
+        $(CC) /Fo$(OBJ_D)\s_socket.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\s_socket.c
+
+$(OBJ_D)\version.obj: $(SRC_D)\apps\version.c
+        $(CC) /Fo$(OBJ_D)\version.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\version.c
+
+$(OBJ_D)\sess_id.obj: $(SRC_D)\apps\sess_id.c
+        $(CC) /Fo$(OBJ_D)\sess_id.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\sess_id.c
+
+$(OBJ_D)\ciphers.obj: $(SRC_D)\apps\ciphers.c
+        $(CC) /Fo$(OBJ_D)\ciphers.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\ciphers.c
+
+$(OBJ_D)\ssleay.obj: $(SRC_D)\apps\ssleay.c
+        $(CC) /Fo$(OBJ_D)\ssleay.obj -DMONOLITH $(APP_CFLAGS) -c $(SRC_D)\apps\ssleay.c
+
+crypto\bn\asm\x86w32.obj: crypto\bn\asm\x86w32.asm
+        $(ASM) /Focrypto\bn\asm\x86w32.obj $(SRC_D)\crypto\bn\asm\x86w32.asm
+
+$(OBJ_D)\cryptlib.obj: $(SRC_D)\crypto\cryptlib.c
+        $(CC) /Fo$(OBJ_D)\cryptlib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cryptlib.c
+
+$(OBJ_D)\mem.obj: $(SRC_D)\crypto\mem.c
+        $(CC) /Fo$(OBJ_D)\mem.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\mem.c
+
+$(OBJ_D)\cversion.obj: $(SRC_D)\crypto\cversion.c
+        $(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DCFLAGS="\"$(CC) $(CFLAG)\"" -c $(SRC_D)\crypto\cversion.c
+
+$(OBJ_D)\ex_data.obj: $(SRC_D)\crypto\ex_data.c
+        $(CC) /Fo$(OBJ_D)\ex_data.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\ex_data.c
+
+$(OBJ_D)\cpt_err.obj: $(SRC_D)\crypto\cpt_err.c
+        $(CC) /Fo$(OBJ_D)\cpt_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cpt_err.c
+
+$(OBJ_D)\md2_dgst.obj: $(SRC_D)\crypto\md2\md2_dgst.c
+        $(CC) /Fo$(OBJ_D)\md2_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md2\md2_dgst.c
+
+$(OBJ_D)\md2_one.obj: $(SRC_D)\crypto\md2\md2_one.c
+        $(CC) /Fo$(OBJ_D)\md2_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md2\md2_one.c
+
+$(OBJ_D)\md5_dgst.obj: $(SRC_D)\crypto\md5\md5_dgst.c
+        $(CC) /Fo$(OBJ_D)\md5_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md5\md5_dgst.c
+
+$(OBJ_D)\md5_one.obj: $(SRC_D)\crypto\md5\md5_one.c
+        $(CC) /Fo$(OBJ_D)\md5_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\md5\md5_one.c
+
+$(OBJ_D)\sha_dgst.obj: $(SRC_D)\crypto\sha\sha_dgst.c
+        $(CC) /Fo$(OBJ_D)\sha_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha_dgst.c
+
+$(OBJ_D)\sha1dgst.obj: $(SRC_D)\crypto\sha\sha1dgst.c
+        $(CC) /Fo$(OBJ_D)\sha1dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha1dgst.c
+
+$(OBJ_D)\sha_one.obj: $(SRC_D)\crypto\sha\sha_one.c
+        $(CC) /Fo$(OBJ_D)\sha_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha_one.c
+
+$(OBJ_D)\sha1_one.obj: $(SRC_D)\crypto\sha\sha1_one.c
+        $(CC) /Fo$(OBJ_D)\sha1_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\sha\sha1_one.c
+
+$(OBJ_D)\mdc2dgst.obj: $(SRC_D)\crypto\mdc2\mdc2dgst.c
+        $(CC) /Fo$(OBJ_D)\mdc2dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\mdc2\mdc2dgst.c
+
+$(OBJ_D)\mdc2_one.obj: $(SRC_D)\crypto\mdc2\mdc2_one.c
+        $(CC) /Fo$(OBJ_D)\mdc2_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\mdc2\mdc2_one.c
+
+$(OBJ_D)\hmac.obj: $(SRC_D)\crypto\hmac\hmac.c
+        $(CC) /Fo$(OBJ_D)\hmac.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\hmac\hmac.c
+
+$(OBJ_D)\rmd_dgst.obj: $(SRC_D)\crypto\ripemd\rmd_dgst.c
+        $(CC) /Fo$(OBJ_D)\rmd_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\ripemd\rmd_dgst.c
+
+$(OBJ_D)\rmd_one.obj: $(SRC_D)\crypto\ripemd\rmd_one.c
+        $(CC) /Fo$(OBJ_D)\rmd_one.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\ripemd\rmd_one.c
+
+$(OBJ_D)\set_key.obj: $(SRC_D)\crypto\des\set_key.c
+        $(CC) /Fo$(OBJ_D)\set_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\set_key.c
+
+$(OBJ_D)\ecb_enc.obj: $(SRC_D)\crypto\des\ecb_enc.c
+        $(CC) /Fo$(OBJ_D)\ecb_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ecb_enc.c
+
+$(OBJ_D)\cbc_enc.obj: $(SRC_D)\crypto\des\cbc_enc.c
+        $(CC) /Fo$(OBJ_D)\cbc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cbc_enc.c
+
+$(OBJ_D)\ecb3_enc.obj: $(SRC_D)\crypto\des\ecb3_enc.c
+        $(CC) /Fo$(OBJ_D)\ecb3_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ecb3_enc.c
+
+$(OBJ_D)\cfb64enc.obj: $(SRC_D)\crypto\des\cfb64enc.c
+        $(CC) /Fo$(OBJ_D)\cfb64enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cfb64enc.c
+
+$(OBJ_D)\cfb64ede.obj: $(SRC_D)\crypto\des\cfb64ede.c
+        $(CC) /Fo$(OBJ_D)\cfb64ede.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cfb64ede.c
+
+$(OBJ_D)\cfb_enc.obj: $(SRC_D)\crypto\des\cfb_enc.c
+        $(CC) /Fo$(OBJ_D)\cfb_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cfb_enc.c
+
+$(OBJ_D)\ofb64ede.obj: $(SRC_D)\crypto\des\ofb64ede.c
+        $(CC) /Fo$(OBJ_D)\ofb64ede.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ofb64ede.c
+
+$(OBJ_D)\enc_read.obj: $(SRC_D)\crypto\des\enc_read.c
+        $(CC) /Fo$(OBJ_D)\enc_read.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\enc_read.c
+
+$(OBJ_D)\enc_writ.obj: $(SRC_D)\crypto\des\enc_writ.c
+        $(CC) /Fo$(OBJ_D)\enc_writ.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\enc_writ.c
+
+$(OBJ_D)\ofb64enc.obj: $(SRC_D)\crypto\des\ofb64enc.c
+        $(CC) /Fo$(OBJ_D)\ofb64enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ofb64enc.c
+
+$(OBJ_D)\ofb_enc.obj: $(SRC_D)\crypto\des\ofb_enc.c
+        $(CC) /Fo$(OBJ_D)\ofb_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\ofb_enc.c
+
+$(OBJ_D)\str2key.obj: $(SRC_D)\crypto\des\str2key.c
+        $(CC) /Fo$(OBJ_D)\str2key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\str2key.c
+
+$(OBJ_D)\pcbc_enc.obj: $(SRC_D)\crypto\des\pcbc_enc.c
+        $(CC) /Fo$(OBJ_D)\pcbc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\pcbc_enc.c
+
+$(OBJ_D)\qud_cksm.obj: $(SRC_D)\crypto\des\qud_cksm.c
+        $(CC) /Fo$(OBJ_D)\qud_cksm.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\qud_cksm.c
+
+$(OBJ_D)\rand_key.obj: $(SRC_D)\crypto\des\rand_key.c
+        $(CC) /Fo$(OBJ_D)\rand_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\rand_key.c
+
+$(OBJ_D)\des_enc.obj: $(SRC_D)\crypto\des\des_enc.c
+        $(CC) /Fo$(OBJ_D)\des_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\des_enc.c
+
+$(OBJ_D)\fcrypt_b.obj: $(SRC_D)\crypto\des\fcrypt_b.c
+        $(CC) /Fo$(OBJ_D)\fcrypt_b.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\fcrypt_b.c
+
+$(OBJ_D)\read2pwd.obj: $(SRC_D)\crypto\des\read2pwd.c
+        $(CC) /Fo$(OBJ_D)\read2pwd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\read2pwd.c
+
+$(OBJ_D)\fcrypt.obj: $(SRC_D)\crypto\des\fcrypt.c
+        $(CC) /Fo$(OBJ_D)\fcrypt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\fcrypt.c
+
+$(OBJ_D)\xcbc_enc.obj: $(SRC_D)\crypto\des\xcbc_enc.c
+        $(CC) /Fo$(OBJ_D)\xcbc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\xcbc_enc.c
+
+$(OBJ_D)\read_pwd.obj: $(SRC_D)\crypto\des\read_pwd.c
+        $(CC) /Fo$(OBJ_D)\read_pwd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\read_pwd.c
+
+$(OBJ_D)\rpc_enc.obj: $(SRC_D)\crypto\des\rpc_enc.c
+        $(CC) /Fo$(OBJ_D)\rpc_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\rpc_enc.c
+
+$(OBJ_D)\cbc_cksm.obj: $(SRC_D)\crypto\des\cbc_cksm.c
+        $(CC) /Fo$(OBJ_D)\cbc_cksm.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\cbc_cksm.c
+
+$(OBJ_D)\supp.obj: $(SRC_D)\crypto\des\supp.c
+        $(CC) /Fo$(OBJ_D)\supp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\des\supp.c
+
+$(OBJ_D)\rc2_ecb.obj: $(SRC_D)\crypto\rc2\rc2_ecb.c
+        $(CC) /Fo$(OBJ_D)\rc2_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2_ecb.c
+
+$(OBJ_D)\rc2_skey.obj: $(SRC_D)\crypto\rc2\rc2_skey.c
+        $(CC) /Fo$(OBJ_D)\rc2_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2_skey.c
+
+$(OBJ_D)\rc2_cbc.obj: $(SRC_D)\crypto\rc2\rc2_cbc.c
+        $(CC) /Fo$(OBJ_D)\rc2_cbc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2_cbc.c
+
+$(OBJ_D)\rc2cfb64.obj: $(SRC_D)\crypto\rc2\rc2cfb64.c
+        $(CC) /Fo$(OBJ_D)\rc2cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2cfb64.c
+
+$(OBJ_D)\rc2ofb64.obj: $(SRC_D)\crypto\rc2\rc2ofb64.c
+        $(CC) /Fo$(OBJ_D)\rc2ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc2\rc2ofb64.c
+
+$(OBJ_D)\rc4_skey.obj: $(SRC_D)\crypto\rc4\rc4_skey.c
+        $(CC) /Fo$(OBJ_D)\rc4_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc4\rc4_skey.c
+
+$(OBJ_D)\rc4_enc.obj: $(SRC_D)\crypto\rc4\rc4_enc.c
+        $(CC) /Fo$(OBJ_D)\rc4_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc4\rc4_enc.c
+
+$(OBJ_D)\rc5_skey.obj: $(SRC_D)\crypto\rc5\rc5_skey.c
+        $(CC) /Fo$(OBJ_D)\rc5_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5_skey.c
+
+$(OBJ_D)\rc5_ecb.obj: $(SRC_D)\crypto\rc5\rc5_ecb.c
+        $(CC) /Fo$(OBJ_D)\rc5_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5_ecb.c
+
+$(OBJ_D)\rc5_enc.obj: $(SRC_D)\crypto\rc5\rc5_enc.c
+        $(CC) /Fo$(OBJ_D)\rc5_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5_enc.c
+
+$(OBJ_D)\rc5cfb64.obj: $(SRC_D)\crypto\rc5\rc5cfb64.c
+        $(CC) /Fo$(OBJ_D)\rc5cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5cfb64.c
+
+$(OBJ_D)\rc5ofb64.obj: $(SRC_D)\crypto\rc5\rc5ofb64.c
+        $(CC) /Fo$(OBJ_D)\rc5ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rc5\rc5ofb64.c
+
+$(OBJ_D)\i_cbc.obj: $(SRC_D)\crypto\idea\i_cbc.c
+        $(CC) /Fo$(OBJ_D)\i_cbc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_cbc.c
+
+$(OBJ_D)\i_cfb64.obj: $(SRC_D)\crypto\idea\i_cfb64.c
+        $(CC) /Fo$(OBJ_D)\i_cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_cfb64.c
+
+$(OBJ_D)\i_ofb64.obj: $(SRC_D)\crypto\idea\i_ofb64.c
+        $(CC) /Fo$(OBJ_D)\i_ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_ofb64.c
+
+$(OBJ_D)\i_ecb.obj: $(SRC_D)\crypto\idea\i_ecb.c
+        $(CC) /Fo$(OBJ_D)\i_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_ecb.c
+
+$(OBJ_D)\i_skey.obj: $(SRC_D)\crypto\idea\i_skey.c
+        $(CC) /Fo$(OBJ_D)\i_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\idea\i_skey.c
+
+$(OBJ_D)\bf_skey.obj: $(SRC_D)\crypto\bf\bf_skey.c
+        $(CC) /Fo$(OBJ_D)\bf_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_skey.c
+
+$(OBJ_D)\bf_ecb.obj: $(SRC_D)\crypto\bf\bf_ecb.c
+        $(CC) /Fo$(OBJ_D)\bf_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_ecb.c
+
+$(OBJ_D)\bf_enc.obj: $(SRC_D)\crypto\bf\bf_enc.c
+        $(CC) /Fo$(OBJ_D)\bf_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_enc.c
+
+$(OBJ_D)\bf_cfb64.obj: $(SRC_D)\crypto\bf\bf_cfb64.c
+        $(CC) /Fo$(OBJ_D)\bf_cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_cfb64.c
+
+$(OBJ_D)\bf_ofb64.obj: $(SRC_D)\crypto\bf\bf_ofb64.c
+        $(CC) /Fo$(OBJ_D)\bf_ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bf\bf_ofb64.c
+
+$(OBJ_D)\c_skey.obj: $(SRC_D)\crypto\cast\c_skey.c
+        $(CC) /Fo$(OBJ_D)\c_skey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_skey.c
+
+$(OBJ_D)\c_ecb.obj: $(SRC_D)\crypto\cast\c_ecb.c
+        $(CC) /Fo$(OBJ_D)\c_ecb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_ecb.c
+
+$(OBJ_D)\c_enc.obj: $(SRC_D)\crypto\cast\c_enc.c
+        $(CC) /Fo$(OBJ_D)\c_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_enc.c
+
+$(OBJ_D)\c_cfb64.obj: $(SRC_D)\crypto\cast\c_cfb64.c
+        $(CC) /Fo$(OBJ_D)\c_cfb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_cfb64.c
+
+$(OBJ_D)\c_ofb64.obj: $(SRC_D)\crypto\cast\c_ofb64.c
+        $(CC) /Fo$(OBJ_D)\c_ofb64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\cast\c_ofb64.c
+
+$(OBJ_D)\bn_add.obj: $(SRC_D)\crypto\bn\bn_add.c
+        $(CC) /Fo$(OBJ_D)\bn_add.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_add.c
+
+$(OBJ_D)\bn_div.obj: $(SRC_D)\crypto\bn\bn_div.c
+        $(CC) /Fo$(OBJ_D)\bn_div.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_div.c
+
+$(OBJ_D)\bn_exp.obj: $(SRC_D)\crypto\bn\bn_exp.c
+        $(CC) /Fo$(OBJ_D)\bn_exp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_exp.c
+
+$(OBJ_D)\bn_lib.obj: $(SRC_D)\crypto\bn\bn_lib.c
+        $(CC) /Fo$(OBJ_D)\bn_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_lib.c
+
+$(OBJ_D)\bn_mod.obj: $(SRC_D)\crypto\bn\bn_mod.c
+        $(CC) /Fo$(OBJ_D)\bn_mod.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mod.c
+
+$(OBJ_D)\bn_mul.obj: $(SRC_D)\crypto\bn\bn_mul.c
+        $(CC) /Fo$(OBJ_D)\bn_mul.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mul.c
+
+$(OBJ_D)\bn_print.obj: $(SRC_D)\crypto\bn\bn_print.c
+        $(CC) /Fo$(OBJ_D)\bn_print.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_print.c
+
+$(OBJ_D)\bn_rand.obj: $(SRC_D)\crypto\bn\bn_rand.c
+        $(CC) /Fo$(OBJ_D)\bn_rand.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_rand.c
+
+$(OBJ_D)\bn_shift.obj: $(SRC_D)\crypto\bn\bn_shift.c
+        $(CC) /Fo$(OBJ_D)\bn_shift.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_shift.c
+
+$(OBJ_D)\bn_sub.obj: $(SRC_D)\crypto\bn\bn_sub.c
+        $(CC) /Fo$(OBJ_D)\bn_sub.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_sub.c
+
+$(OBJ_D)\bn_word.obj: $(SRC_D)\crypto\bn\bn_word.c
+        $(CC) /Fo$(OBJ_D)\bn_word.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_word.c
+
+$(OBJ_D)\bn_blind.obj: $(SRC_D)\crypto\bn\bn_blind.c
+        $(CC) /Fo$(OBJ_D)\bn_blind.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_blind.c
+
+$(OBJ_D)\bn_gcd.obj: $(SRC_D)\crypto\bn\bn_gcd.c
+        $(CC) /Fo$(OBJ_D)\bn_gcd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_gcd.c
+
+$(OBJ_D)\bn_prime.obj: $(SRC_D)\crypto\bn\bn_prime.c
+        $(CC) /Fo$(OBJ_D)\bn_prime.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_prime.c
+
+$(OBJ_D)\bn_err.obj: $(SRC_D)\crypto\bn\bn_err.c
+        $(CC) /Fo$(OBJ_D)\bn_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_err.c
+
+$(OBJ_D)\bn_sqr.obj: $(SRC_D)\crypto\bn\bn_sqr.c
+        $(CC) /Fo$(OBJ_D)\bn_sqr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_sqr.c
+
+$(OBJ_D)\bn_mulw.obj: $(SRC_D)\crypto\bn\bn_mulw.c
+        $(CC) /Fo$(OBJ_D)\bn_mulw.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mulw.c
+
+$(OBJ_D)\bn_recp.obj: $(SRC_D)\crypto\bn\bn_recp.c
+        $(CC) /Fo$(OBJ_D)\bn_recp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_recp.c
+
+$(OBJ_D)\bn_mont.obj: $(SRC_D)\crypto\bn\bn_mont.c
+        $(CC) /Fo$(OBJ_D)\bn_mont.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mont.c
+
+$(OBJ_D)\bn_mpi.obj: $(SRC_D)\crypto\bn\bn_mpi.c
+        $(CC) /Fo$(OBJ_D)\bn_mpi.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bn\bn_mpi.c
+
+$(OBJ_D)\rsa_eay.obj: $(SRC_D)\crypto\rsa\rsa_eay.c
+        $(CC) /Fo$(OBJ_D)\rsa_eay.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_eay.c
+
+$(OBJ_D)\rsa_gen.obj: $(SRC_D)\crypto\rsa\rsa_gen.c
+        $(CC) /Fo$(OBJ_D)\rsa_gen.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_gen.c
+
+$(OBJ_D)\rsa_lib.obj: $(SRC_D)\crypto\rsa\rsa_lib.c
+        $(CC) /Fo$(OBJ_D)\rsa_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_lib.c
+
+$(OBJ_D)\rsa_sign.obj: $(SRC_D)\crypto\rsa\rsa_sign.c
+        $(CC) /Fo$(OBJ_D)\rsa_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_sign.c
+
+$(OBJ_D)\rsa_saos.obj: $(SRC_D)\crypto\rsa\rsa_saos.c
+        $(CC) /Fo$(OBJ_D)\rsa_saos.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_saos.c
+
+$(OBJ_D)\rsa_err.obj: $(SRC_D)\crypto\rsa\rsa_err.c
+        $(CC) /Fo$(OBJ_D)\rsa_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_err.c
+
+$(OBJ_D)\rsa_pk1.obj: $(SRC_D)\crypto\rsa\rsa_pk1.c
+        $(CC) /Fo$(OBJ_D)\rsa_pk1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_pk1.c
+
+$(OBJ_D)\rsa_ssl.obj: $(SRC_D)\crypto\rsa\rsa_ssl.c
+        $(CC) /Fo$(OBJ_D)\rsa_ssl.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_ssl.c
+
+$(OBJ_D)\rsa_none.obj: $(SRC_D)\crypto\rsa\rsa_none.c
+        $(CC) /Fo$(OBJ_D)\rsa_none.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rsa\rsa_none.c
+
+$(OBJ_D)\dsa_gen.obj: $(SRC_D)\crypto\dsa\dsa_gen.c
+        $(CC) /Fo$(OBJ_D)\dsa_gen.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_gen.c
+
+$(OBJ_D)\dsa_key.obj: $(SRC_D)\crypto\dsa\dsa_key.c
+        $(CC) /Fo$(OBJ_D)\dsa_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_key.c
+
+$(OBJ_D)\dsa_lib.obj: $(SRC_D)\crypto\dsa\dsa_lib.c
+        $(CC) /Fo$(OBJ_D)\dsa_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_lib.c
+
+$(OBJ_D)\dsa_vrf.obj: $(SRC_D)\crypto\dsa\dsa_vrf.c
+        $(CC) /Fo$(OBJ_D)\dsa_vrf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_vrf.c
+
+$(OBJ_D)\dsa_sign.obj: $(SRC_D)\crypto\dsa\dsa_sign.c
+        $(CC) /Fo$(OBJ_D)\dsa_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_sign.c
+
+$(OBJ_D)\dsa_err.obj: $(SRC_D)\crypto\dsa\dsa_err.c
+        $(CC) /Fo$(OBJ_D)\dsa_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dsa\dsa_err.c
+
+$(OBJ_D)\dh_gen.obj: $(SRC_D)\crypto\dh\dh_gen.c
+        $(CC) /Fo$(OBJ_D)\dh_gen.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_gen.c
+
+$(OBJ_D)\dh_key.obj: $(SRC_D)\crypto\dh\dh_key.c
+        $(CC) /Fo$(OBJ_D)\dh_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_key.c
+
+$(OBJ_D)\dh_lib.obj: $(SRC_D)\crypto\dh\dh_lib.c
+        $(CC) /Fo$(OBJ_D)\dh_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_lib.c
+
+$(OBJ_D)\dh_check.obj: $(SRC_D)\crypto\dh\dh_check.c
+        $(CC) /Fo$(OBJ_D)\dh_check.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_check.c
+
+$(OBJ_D)\dh_err.obj: $(SRC_D)\crypto\dh\dh_err.c
+        $(CC) /Fo$(OBJ_D)\dh_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\dh\dh_err.c
+
+$(OBJ_D)\buffer.obj: $(SRC_D)\crypto\buffer\buffer.c
+        $(CC) /Fo$(OBJ_D)\buffer.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\buffer\buffer.c
+
+$(OBJ_D)\buf_err.obj: $(SRC_D)\crypto\buffer\buf_err.c
+        $(CC) /Fo$(OBJ_D)\buf_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\buffer\buf_err.c
+
+$(OBJ_D)\bio_lib.obj: $(SRC_D)\crypto\bio\bio_lib.c
+        $(CC) /Fo$(OBJ_D)\bio_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bio_lib.c
+
+$(OBJ_D)\bio_cb.obj: $(SRC_D)\crypto\bio\bio_cb.c
+        $(CC) /Fo$(OBJ_D)\bio_cb.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bio_cb.c
+
+$(OBJ_D)\bio_err.obj: $(SRC_D)\crypto\bio\bio_err.c
+        $(CC) /Fo$(OBJ_D)\bio_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bio_err.c
+
+$(OBJ_D)\bss_mem.obj: $(SRC_D)\crypto\bio\bss_mem.c
+        $(CC) /Fo$(OBJ_D)\bss_mem.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_mem.c
+
+$(OBJ_D)\bss_null.obj: $(SRC_D)\crypto\bio\bss_null.c
+        $(CC) /Fo$(OBJ_D)\bss_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_null.c
+
+$(OBJ_D)\bss_fd.obj: $(SRC_D)\crypto\bio\bss_fd.c
+        $(CC) /Fo$(OBJ_D)\bss_fd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_fd.c
+
+$(OBJ_D)\bss_file.obj: $(SRC_D)\crypto\bio\bss_file.c
+        $(CC) /Fo$(OBJ_D)\bss_file.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_file.c
+
+$(OBJ_D)\bss_sock.obj: $(SRC_D)\crypto\bio\bss_sock.c
+        $(CC) /Fo$(OBJ_D)\bss_sock.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_sock.c
+
+$(OBJ_D)\bss_conn.obj: $(SRC_D)\crypto\bio\bss_conn.c
+        $(CC) /Fo$(OBJ_D)\bss_conn.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_conn.c
+
+$(OBJ_D)\bf_null.obj: $(SRC_D)\crypto\bio\bf_null.c
+        $(CC) /Fo$(OBJ_D)\bf_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bf_null.c
+
+$(OBJ_D)\bf_buff.obj: $(SRC_D)\crypto\bio\bf_buff.c
+        $(CC) /Fo$(OBJ_D)\bf_buff.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bf_buff.c
+
+$(OBJ_D)\b_print.obj: $(SRC_D)\crypto\bio\b_print.c
+        $(CC) /Fo$(OBJ_D)\b_print.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\b_print.c
+
+$(OBJ_D)\b_dump.obj: $(SRC_D)\crypto\bio\b_dump.c
+        $(CC) /Fo$(OBJ_D)\b_dump.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\b_dump.c
+
+$(OBJ_D)\b_sock.obj: $(SRC_D)\crypto\bio\b_sock.c
+        $(CC) /Fo$(OBJ_D)\b_sock.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\b_sock.c
+
+$(OBJ_D)\bss_acpt.obj: $(SRC_D)\crypto\bio\bss_acpt.c
+        $(CC) /Fo$(OBJ_D)\bss_acpt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bss_acpt.c
+
+$(OBJ_D)\bf_nbio.obj: $(SRC_D)\crypto\bio\bf_nbio.c
+        $(CC) /Fo$(OBJ_D)\bf_nbio.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\bio\bf_nbio.c
+
+$(OBJ_D)\stack.obj: $(SRC_D)\crypto\stack\stack.c
+        $(CC) /Fo$(OBJ_D)\stack.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\stack\stack.c
+
+$(OBJ_D)\lhash.obj: $(SRC_D)\crypto\lhash\lhash.c
+        $(CC) /Fo$(OBJ_D)\lhash.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\lhash\lhash.c
+
+$(OBJ_D)\lh_stats.obj: $(SRC_D)\crypto\lhash\lh_stats.c
+        $(CC) /Fo$(OBJ_D)\lh_stats.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\lhash\lh_stats.c
+
+$(OBJ_D)\md_rand.obj: $(SRC_D)\crypto\rand\md_rand.c
+        $(CC) /Fo$(OBJ_D)\md_rand.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rand\md_rand.c
+
+$(OBJ_D)\randfile.obj: $(SRC_D)\crypto\rand\randfile.c
+        $(CC) /Fo$(OBJ_D)\randfile.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\rand\randfile.c
+
+$(OBJ_D)\err.obj: $(SRC_D)\crypto\err\err.c
+        $(CC) /Fo$(OBJ_D)\err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\err\err.c
+
+$(OBJ_D)\err_all.obj: $(SRC_D)\crypto\err\err_all.c
+        $(CC) /Fo$(OBJ_D)\err_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\err\err_all.c
+
+$(OBJ_D)\err_prn.obj: $(SRC_D)\crypto\err\err_prn.c
+        $(CC) /Fo$(OBJ_D)\err_prn.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\err\err_prn.c
+
+$(OBJ_D)\obj_dat.obj: $(SRC_D)\crypto\objects\obj_dat.c
+        $(CC) /Fo$(OBJ_D)\obj_dat.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\objects\obj_dat.c
+
+$(OBJ_D)\obj_lib.obj: $(SRC_D)\crypto\objects\obj_lib.c
+        $(CC) /Fo$(OBJ_D)\obj_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\objects\obj_lib.c
+
+$(OBJ_D)\obj_err.obj: $(SRC_D)\crypto\objects\obj_err.c
+        $(CC) /Fo$(OBJ_D)\obj_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\objects\obj_err.c
+
+$(OBJ_D)\encode.obj: $(SRC_D)\crypto\evp\encode.c
+        $(CC) /Fo$(OBJ_D)\encode.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\encode.c
+
+$(OBJ_D)\digest.obj: $(SRC_D)\crypto\evp\digest.c
+        $(CC) /Fo$(OBJ_D)\digest.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\digest.c
+
+$(OBJ_D)\evp_enc.obj: $(SRC_D)\crypto\evp\evp_enc.c
+        $(CC) /Fo$(OBJ_D)\evp_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_enc.c
+
+$(OBJ_D)\evp_key.obj: $(SRC_D)\crypto\evp\evp_key.c
+        $(CC) /Fo$(OBJ_D)\evp_key.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_key.c
+
+$(OBJ_D)\e_ecb_d.obj: $(SRC_D)\crypto\evp\e_ecb_d.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_d.c
+
+$(OBJ_D)\e_cbc_d.obj: $(SRC_D)\crypto\evp\e_cbc_d.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_d.c
+
+$(OBJ_D)\e_cfb_d.obj: $(SRC_D)\crypto\evp\e_cfb_d.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_d.c
+
+$(OBJ_D)\e_ofb_d.obj: $(SRC_D)\crypto\evp\e_ofb_d.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_d.c
+
+$(OBJ_D)\e_ecb_i.obj: $(SRC_D)\crypto\evp\e_ecb_i.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_i.c
+
+$(OBJ_D)\e_cbc_i.obj: $(SRC_D)\crypto\evp\e_cbc_i.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_i.c
+
+$(OBJ_D)\e_cfb_i.obj: $(SRC_D)\crypto\evp\e_cfb_i.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_i.c
+
+$(OBJ_D)\e_ofb_i.obj: $(SRC_D)\crypto\evp\e_ofb_i.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_i.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_i.c
+
+$(OBJ_D)\e_ecb_3d.obj: $(SRC_D)\crypto\evp\e_ecb_3d.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_3d.c
+
+$(OBJ_D)\e_cbc_3d.obj: $(SRC_D)\crypto\evp\e_cbc_3d.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_3d.c
+
+$(OBJ_D)\e_rc4.obj: $(SRC_D)\crypto\evp\e_rc4.c
+        $(CC) /Fo$(OBJ_D)\e_rc4.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_rc4.c
+
+$(OBJ_D)\names.obj: $(SRC_D)\crypto\evp\names.c
+        $(CC) /Fo$(OBJ_D)\names.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\names.c
+
+$(OBJ_D)\e_cfb_3d.obj: $(SRC_D)\crypto\evp\e_cfb_3d.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_3d.c
+
+$(OBJ_D)\e_ofb_3d.obj: $(SRC_D)\crypto\evp\e_ofb_3d.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_3d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_3d.c
+
+$(OBJ_D)\e_xcbc_d.obj: $(SRC_D)\crypto\evp\e_xcbc_d.c
+        $(CC) /Fo$(OBJ_D)\e_xcbc_d.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_xcbc_d.c
+
+$(OBJ_D)\e_ecb_r2.obj: $(SRC_D)\crypto\evp\e_ecb_r2.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_r2.c
+
+$(OBJ_D)\e_cbc_r2.obj: $(SRC_D)\crypto\evp\e_cbc_r2.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_r2.c
+
+$(OBJ_D)\e_cfb_r2.obj: $(SRC_D)\crypto\evp\e_cfb_r2.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_r2.c
+
+$(OBJ_D)\e_ofb_r2.obj: $(SRC_D)\crypto\evp\e_ofb_r2.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_r2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_r2.c
+
+$(OBJ_D)\e_ecb_bf.obj: $(SRC_D)\crypto\evp\e_ecb_bf.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_bf.c
+
+$(OBJ_D)\e_cbc_bf.obj: $(SRC_D)\crypto\evp\e_cbc_bf.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_bf.c
+
+$(OBJ_D)\e_cfb_bf.obj: $(SRC_D)\crypto\evp\e_cfb_bf.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_bf.c
+
+$(OBJ_D)\e_ofb_bf.obj: $(SRC_D)\crypto\evp\e_ofb_bf.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_bf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_bf.c
+
+$(OBJ_D)\e_ecb_c.obj: $(SRC_D)\crypto\evp\e_ecb_c.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_c.c
+
+$(OBJ_D)\e_cbc_c.obj: $(SRC_D)\crypto\evp\e_cbc_c.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_c.c
+
+$(OBJ_D)\e_cfb_c.obj: $(SRC_D)\crypto\evp\e_cfb_c.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_c.c
+
+$(OBJ_D)\e_ofb_c.obj: $(SRC_D)\crypto\evp\e_ofb_c.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_c.c
+
+$(OBJ_D)\e_ecb_r5.obj: $(SRC_D)\crypto\evp\e_ecb_r5.c
+        $(CC) /Fo$(OBJ_D)\e_ecb_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ecb_r5.c
+
+$(OBJ_D)\e_cbc_r5.obj: $(SRC_D)\crypto\evp\e_cbc_r5.c
+        $(CC) /Fo$(OBJ_D)\e_cbc_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cbc_r5.c
+
+$(OBJ_D)\e_cfb_r5.obj: $(SRC_D)\crypto\evp\e_cfb_r5.c
+        $(CC) /Fo$(OBJ_D)\e_cfb_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_cfb_r5.c
+
+$(OBJ_D)\e_ofb_r5.obj: $(SRC_D)\crypto\evp\e_ofb_r5.c
+        $(CC) /Fo$(OBJ_D)\e_ofb_r5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_ofb_r5.c
+
+$(OBJ_D)\m_null.obj: $(SRC_D)\crypto\evp\m_null.c
+        $(CC) /Fo$(OBJ_D)\m_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_null.c
+
+$(OBJ_D)\m_md2.obj: $(SRC_D)\crypto\evp\m_md2.c
+        $(CC) /Fo$(OBJ_D)\m_md2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_md2.c
+
+$(OBJ_D)\m_md5.obj: $(SRC_D)\crypto\evp\m_md5.c
+        $(CC) /Fo$(OBJ_D)\m_md5.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_md5.c
+
+$(OBJ_D)\m_sha.obj: $(SRC_D)\crypto\evp\m_sha.c
+        $(CC) /Fo$(OBJ_D)\m_sha.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_sha.c
+
+$(OBJ_D)\m_sha1.obj: $(SRC_D)\crypto\evp\m_sha1.c
+        $(CC) /Fo$(OBJ_D)\m_sha1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_sha1.c
+
+$(OBJ_D)\m_dss.obj: $(SRC_D)\crypto\evp\m_dss.c
+        $(CC) /Fo$(OBJ_D)\m_dss.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_dss.c
+
+$(OBJ_D)\m_dss1.obj: $(SRC_D)\crypto\evp\m_dss1.c
+        $(CC) /Fo$(OBJ_D)\m_dss1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_dss1.c
+
+$(OBJ_D)\m_mdc2.obj: $(SRC_D)\crypto\evp\m_mdc2.c
+        $(CC) /Fo$(OBJ_D)\m_mdc2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_mdc2.c
+
+$(OBJ_D)\m_ripemd.obj: $(SRC_D)\crypto\evp\m_ripemd.c
+        $(CC) /Fo$(OBJ_D)\m_ripemd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\m_ripemd.c
+
+$(OBJ_D)\p_open.obj: $(SRC_D)\crypto\evp\p_open.c
+        $(CC) /Fo$(OBJ_D)\p_open.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_open.c
+
+$(OBJ_D)\p_seal.obj: $(SRC_D)\crypto\evp\p_seal.c
+        $(CC) /Fo$(OBJ_D)\p_seal.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_seal.c
+
+$(OBJ_D)\p_sign.obj: $(SRC_D)\crypto\evp\p_sign.c
+        $(CC) /Fo$(OBJ_D)\p_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_sign.c
+
+$(OBJ_D)\p_verify.obj: $(SRC_D)\crypto\evp\p_verify.c
+        $(CC) /Fo$(OBJ_D)\p_verify.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_verify.c
+
+$(OBJ_D)\p_lib.obj: $(SRC_D)\crypto\evp\p_lib.c
+        $(CC) /Fo$(OBJ_D)\p_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_lib.c
+
+$(OBJ_D)\p_enc.obj: $(SRC_D)\crypto\evp\p_enc.c
+        $(CC) /Fo$(OBJ_D)\p_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_enc.c
+
+$(OBJ_D)\p_dec.obj: $(SRC_D)\crypto\evp\p_dec.c
+        $(CC) /Fo$(OBJ_D)\p_dec.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\p_dec.c
+
+$(OBJ_D)\bio_md.obj: $(SRC_D)\crypto\evp\bio_md.c
+        $(CC) /Fo$(OBJ_D)\bio_md.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\bio_md.c
+
+$(OBJ_D)\bio_b64.obj: $(SRC_D)\crypto\evp\bio_b64.c
+        $(CC) /Fo$(OBJ_D)\bio_b64.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\bio_b64.c
+
+$(OBJ_D)\bio_enc.obj: $(SRC_D)\crypto\evp\bio_enc.c
+        $(CC) /Fo$(OBJ_D)\bio_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\bio_enc.c
+
+$(OBJ_D)\evp_err.obj: $(SRC_D)\crypto\evp\evp_err.c
+        $(CC) /Fo$(OBJ_D)\evp_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_err.c
+
+$(OBJ_D)\e_null.obj: $(SRC_D)\crypto\evp\e_null.c
+        $(CC) /Fo$(OBJ_D)\e_null.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\e_null.c
+
+$(OBJ_D)\c_all.obj: $(SRC_D)\crypto\evp\c_all.c
+        $(CC) /Fo$(OBJ_D)\c_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\c_all.c
+
+$(OBJ_D)\evp_lib.obj: $(SRC_D)\crypto\evp\evp_lib.c
+        $(CC) /Fo$(OBJ_D)\evp_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\evp\evp_lib.c
+
+$(OBJ_D)\pem_sign.obj: $(SRC_D)\crypto\pem\pem_sign.c
+        $(CC) /Fo$(OBJ_D)\pem_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_sign.c
+
+$(OBJ_D)\pem_seal.obj: $(SRC_D)\crypto\pem\pem_seal.c
+        $(CC) /Fo$(OBJ_D)\pem_seal.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_seal.c
+
+$(OBJ_D)\pem_info.obj: $(SRC_D)\crypto\pem\pem_info.c
+        $(CC) /Fo$(OBJ_D)\pem_info.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_info.c
+
+$(OBJ_D)\pem_lib.obj: $(SRC_D)\crypto\pem\pem_lib.c
+        $(CC) /Fo$(OBJ_D)\pem_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_lib.c
+
+$(OBJ_D)\pem_all.obj: $(SRC_D)\crypto\pem\pem_all.c
+        $(CC) /Fo$(OBJ_D)\pem_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_all.c
+
+$(OBJ_D)\pem_err.obj: $(SRC_D)\crypto\pem\pem_err.c
+        $(CC) /Fo$(OBJ_D)\pem_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pem\pem_err.c
+
+$(OBJ_D)\a_object.obj: $(SRC_D)\crypto\asn1\a_object.c
+        $(CC) /Fo$(OBJ_D)\a_object.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_object.c
+
+$(OBJ_D)\a_bitstr.obj: $(SRC_D)\crypto\asn1\a_bitstr.c
+        $(CC) /Fo$(OBJ_D)\a_bitstr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_bitstr.c
+
+$(OBJ_D)\a_utctm.obj: $(SRC_D)\crypto\asn1\a_utctm.c
+        $(CC) /Fo$(OBJ_D)\a_utctm.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_utctm.c
+
+$(OBJ_D)\a_int.obj: $(SRC_D)\crypto\asn1\a_int.c
+        $(CC) /Fo$(OBJ_D)\a_int.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_int.c
+
+$(OBJ_D)\a_octet.obj: $(SRC_D)\crypto\asn1\a_octet.c
+        $(CC) /Fo$(OBJ_D)\a_octet.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_octet.c
+
+$(OBJ_D)\a_print.obj: $(SRC_D)\crypto\asn1\a_print.c
+        $(CC) /Fo$(OBJ_D)\a_print.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_print.c
+
+$(OBJ_D)\a_type.obj: $(SRC_D)\crypto\asn1\a_type.c
+        $(CC) /Fo$(OBJ_D)\a_type.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_type.c
+
+$(OBJ_D)\a_set.obj: $(SRC_D)\crypto\asn1\a_set.c
+        $(CC) /Fo$(OBJ_D)\a_set.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_set.c
+
+$(OBJ_D)\a_dup.obj: $(SRC_D)\crypto\asn1\a_dup.c
+        $(CC) /Fo$(OBJ_D)\a_dup.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_dup.c
+
+$(OBJ_D)\a_d2i_fp.obj: $(SRC_D)\crypto\asn1\a_d2i_fp.c
+        $(CC) /Fo$(OBJ_D)\a_d2i_fp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_d2i_fp.c
+
+$(OBJ_D)\a_i2d_fp.obj: $(SRC_D)\crypto\asn1\a_i2d_fp.c
+        $(CC) /Fo$(OBJ_D)\a_i2d_fp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_i2d_fp.c
+
+$(OBJ_D)\a_sign.obj: $(SRC_D)\crypto\asn1\a_sign.c
+        $(CC) /Fo$(OBJ_D)\a_sign.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_sign.c
+
+$(OBJ_D)\a_digest.obj: $(SRC_D)\crypto\asn1\a_digest.c
+        $(CC) /Fo$(OBJ_D)\a_digest.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_digest.c
+
+$(OBJ_D)\a_verify.obj: $(SRC_D)\crypto\asn1\a_verify.c
+        $(CC) /Fo$(OBJ_D)\a_verify.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_verify.c
+
+$(OBJ_D)\x_algor.obj: $(SRC_D)\crypto\asn1\x_algor.c
+        $(CC) /Fo$(OBJ_D)\x_algor.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_algor.c
+
+$(OBJ_D)\x_val.obj: $(SRC_D)\crypto\asn1\x_val.c
+        $(CC) /Fo$(OBJ_D)\x_val.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_val.c
+
+$(OBJ_D)\x_pubkey.obj: $(SRC_D)\crypto\asn1\x_pubkey.c
+        $(CC) /Fo$(OBJ_D)\x_pubkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_pubkey.c
+
+$(OBJ_D)\x_sig.obj: $(SRC_D)\crypto\asn1\x_sig.c
+        $(CC) /Fo$(OBJ_D)\x_sig.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_sig.c
+
+$(OBJ_D)\x_req.obj: $(SRC_D)\crypto\asn1\x_req.c
+        $(CC) /Fo$(OBJ_D)\x_req.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_req.c
+
+$(OBJ_D)\x_attrib.obj: $(SRC_D)\crypto\asn1\x_attrib.c
+        $(CC) /Fo$(OBJ_D)\x_attrib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_attrib.c
+
+$(OBJ_D)\x_name.obj: $(SRC_D)\crypto\asn1\x_name.c
+        $(CC) /Fo$(OBJ_D)\x_name.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_name.c
+
+$(OBJ_D)\x_cinf.obj: $(SRC_D)\crypto\asn1\x_cinf.c
+        $(CC) /Fo$(OBJ_D)\x_cinf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_cinf.c
+
+$(OBJ_D)\x_x509.obj: $(SRC_D)\crypto\asn1\x_x509.c
+        $(CC) /Fo$(OBJ_D)\x_x509.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_x509.c
+
+$(OBJ_D)\x_crl.obj: $(SRC_D)\crypto\asn1\x_crl.c
+        $(CC) /Fo$(OBJ_D)\x_crl.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_crl.c
+
+$(OBJ_D)\x_info.obj: $(SRC_D)\crypto\asn1\x_info.c
+        $(CC) /Fo$(OBJ_D)\x_info.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_info.c
+
+$(OBJ_D)\x_spki.obj: $(SRC_D)\crypto\asn1\x_spki.c
+        $(CC) /Fo$(OBJ_D)\x_spki.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_spki.c
+
+$(OBJ_D)\d2i_r_pr.obj: $(SRC_D)\crypto\asn1\d2i_r_pr.c
+        $(CC) /Fo$(OBJ_D)\d2i_r_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_r_pr.c
+
+$(OBJ_D)\i2d_r_pr.obj: $(SRC_D)\crypto\asn1\i2d_r_pr.c
+        $(CC) /Fo$(OBJ_D)\i2d_r_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_r_pr.c
+
+$(OBJ_D)\d2i_r_pu.obj: $(SRC_D)\crypto\asn1\d2i_r_pu.c
+        $(CC) /Fo$(OBJ_D)\d2i_r_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_r_pu.c
+
+$(OBJ_D)\i2d_r_pu.obj: $(SRC_D)\crypto\asn1\i2d_r_pu.c
+        $(CC) /Fo$(OBJ_D)\i2d_r_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_r_pu.c
+
+$(OBJ_D)\d2i_s_pr.obj: $(SRC_D)\crypto\asn1\d2i_s_pr.c
+        $(CC) /Fo$(OBJ_D)\d2i_s_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_s_pr.c
+
+$(OBJ_D)\i2d_s_pr.obj: $(SRC_D)\crypto\asn1\i2d_s_pr.c
+        $(CC) /Fo$(OBJ_D)\i2d_s_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_s_pr.c
+
+$(OBJ_D)\d2i_s_pu.obj: $(SRC_D)\crypto\asn1\d2i_s_pu.c
+        $(CC) /Fo$(OBJ_D)\d2i_s_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_s_pu.c
+
+$(OBJ_D)\i2d_s_pu.obj: $(SRC_D)\crypto\asn1\i2d_s_pu.c
+        $(CC) /Fo$(OBJ_D)\i2d_s_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_s_pu.c
+
+$(OBJ_D)\d2i_pu.obj: $(SRC_D)\crypto\asn1\d2i_pu.c
+        $(CC) /Fo$(OBJ_D)\d2i_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_pu.c
+
+$(OBJ_D)\d2i_pr.obj: $(SRC_D)\crypto\asn1\d2i_pr.c
+        $(CC) /Fo$(OBJ_D)\d2i_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_pr.c
+
+$(OBJ_D)\i2d_pu.obj: $(SRC_D)\crypto\asn1\i2d_pu.c
+        $(CC) /Fo$(OBJ_D)\i2d_pu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_pu.c
+
+$(OBJ_D)\i2d_pr.obj: $(SRC_D)\crypto\asn1\i2d_pr.c
+        $(CC) /Fo$(OBJ_D)\i2d_pr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_pr.c
+
+$(OBJ_D)\t_req.obj: $(SRC_D)\crypto\asn1\t_req.c
+        $(CC) /Fo$(OBJ_D)\t_req.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\t_req.c
+
+$(OBJ_D)\t_x509.obj: $(SRC_D)\crypto\asn1\t_x509.c
+        $(CC) /Fo$(OBJ_D)\t_x509.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\t_x509.c
+
+$(OBJ_D)\t_pkey.obj: $(SRC_D)\crypto\asn1\t_pkey.c
+        $(CC) /Fo$(OBJ_D)\t_pkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\t_pkey.c
+
+$(OBJ_D)\p7_i_s.obj: $(SRC_D)\crypto\asn1\p7_i_s.c
+        $(CC) /Fo$(OBJ_D)\p7_i_s.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_i_s.c
+
+$(OBJ_D)\p7_signi.obj: $(SRC_D)\crypto\asn1\p7_signi.c
+        $(CC) /Fo$(OBJ_D)\p7_signi.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_signi.c
+
+$(OBJ_D)\p7_signd.obj: $(SRC_D)\crypto\asn1\p7_signd.c
+        $(CC) /Fo$(OBJ_D)\p7_signd.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_signd.c
+
+$(OBJ_D)\p7_recip.obj: $(SRC_D)\crypto\asn1\p7_recip.c
+        $(CC) /Fo$(OBJ_D)\p7_recip.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_recip.c
+
+$(OBJ_D)\p7_enc_c.obj: $(SRC_D)\crypto\asn1\p7_enc_c.c
+        $(CC) /Fo$(OBJ_D)\p7_enc_c.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_enc_c.c
+
+$(OBJ_D)\p7_evp.obj: $(SRC_D)\crypto\asn1\p7_evp.c
+        $(CC) /Fo$(OBJ_D)\p7_evp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_evp.c
+
+$(OBJ_D)\p7_dgst.obj: $(SRC_D)\crypto\asn1\p7_dgst.c
+        $(CC) /Fo$(OBJ_D)\p7_dgst.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_dgst.c
+
+$(OBJ_D)\p7_s_e.obj: $(SRC_D)\crypto\asn1\p7_s_e.c
+        $(CC) /Fo$(OBJ_D)\p7_s_e.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_s_e.c
+
+$(OBJ_D)\p7_enc.obj: $(SRC_D)\crypto\asn1\p7_enc.c
+        $(CC) /Fo$(OBJ_D)\p7_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_enc.c
+
+$(OBJ_D)\p7_lib.obj: $(SRC_D)\crypto\asn1\p7_lib.c
+        $(CC) /Fo$(OBJ_D)\p7_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\p7_lib.c
+
+$(OBJ_D)\f_int.obj: $(SRC_D)\crypto\asn1\f_int.c
+        $(CC) /Fo$(OBJ_D)\f_int.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\f_int.c
+
+$(OBJ_D)\f_string.obj: $(SRC_D)\crypto\asn1\f_string.c
+        $(CC) /Fo$(OBJ_D)\f_string.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\f_string.c
+
+$(OBJ_D)\i2d_dhp.obj: $(SRC_D)\crypto\asn1\i2d_dhp.c
+        $(CC) /Fo$(OBJ_D)\i2d_dhp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_dhp.c
+
+$(OBJ_D)\i2d_dsap.obj: $(SRC_D)\crypto\asn1\i2d_dsap.c
+        $(CC) /Fo$(OBJ_D)\i2d_dsap.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\i2d_dsap.c
+
+$(OBJ_D)\d2i_dhp.obj: $(SRC_D)\crypto\asn1\d2i_dhp.c
+        $(CC) /Fo$(OBJ_D)\d2i_dhp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_dhp.c
+
+$(OBJ_D)\d2i_dsap.obj: $(SRC_D)\crypto\asn1\d2i_dsap.c
+        $(CC) /Fo$(OBJ_D)\d2i_dsap.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\d2i_dsap.c
+
+$(OBJ_D)\n_pkey.obj: $(SRC_D)\crypto\asn1\n_pkey.c
+        $(CC) /Fo$(OBJ_D)\n_pkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\n_pkey.c
+
+$(OBJ_D)\a_hdr.obj: $(SRC_D)\crypto\asn1\a_hdr.c
+        $(CC) /Fo$(OBJ_D)\a_hdr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_hdr.c
+
+$(OBJ_D)\x_pkey.obj: $(SRC_D)\crypto\asn1\x_pkey.c
+        $(CC) /Fo$(OBJ_D)\x_pkey.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_pkey.c
+
+$(OBJ_D)\a_bool.obj: $(SRC_D)\crypto\asn1\a_bool.c
+        $(CC) /Fo$(OBJ_D)\a_bool.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_bool.c
+
+$(OBJ_D)\x_exten.obj: $(SRC_D)\crypto\asn1\x_exten.c
+        $(CC) /Fo$(OBJ_D)\x_exten.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\x_exten.c
+
+$(OBJ_D)\asn1_par.obj: $(SRC_D)\crypto\asn1\asn1_par.c
+        $(CC) /Fo$(OBJ_D)\asn1_par.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\asn1_par.c
+
+$(OBJ_D)\asn1_lib.obj: $(SRC_D)\crypto\asn1\asn1_lib.c
+        $(CC) /Fo$(OBJ_D)\asn1_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\asn1_lib.c
+
+$(OBJ_D)\asn1_err.obj: $(SRC_D)\crypto\asn1\asn1_err.c
+        $(CC) /Fo$(OBJ_D)\asn1_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\asn1_err.c
+
+$(OBJ_D)\a_meth.obj: $(SRC_D)\crypto\asn1\a_meth.c
+        $(CC) /Fo$(OBJ_D)\a_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_meth.c
+
+$(OBJ_D)\a_bytes.obj: $(SRC_D)\crypto\asn1\a_bytes.c
+        $(CC) /Fo$(OBJ_D)\a_bytes.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\a_bytes.c
+
+$(OBJ_D)\evp_asn1.obj: $(SRC_D)\crypto\asn1\evp_asn1.c
+        $(CC) /Fo$(OBJ_D)\evp_asn1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\asn1\evp_asn1.c
+
+$(OBJ_D)\x509_def.obj: $(SRC_D)\crypto\x509\x509_def.c
+        $(CC) /Fo$(OBJ_D)\x509_def.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_def.c
+
+$(OBJ_D)\x509_d2.obj: $(SRC_D)\crypto\x509\x509_d2.c
+        $(CC) /Fo$(OBJ_D)\x509_d2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_d2.c
+
+$(OBJ_D)\x509_r2x.obj: $(SRC_D)\crypto\x509\x509_r2x.c
+        $(CC) /Fo$(OBJ_D)\x509_r2x.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_r2x.c
+
+$(OBJ_D)\x509_cmp.obj: $(SRC_D)\crypto\x509\x509_cmp.c
+        $(CC) /Fo$(OBJ_D)\x509_cmp.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_cmp.c
+
+$(OBJ_D)\x509_obj.obj: $(SRC_D)\crypto\x509\x509_obj.c
+        $(CC) /Fo$(OBJ_D)\x509_obj.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_obj.c
+
+$(OBJ_D)\x509_req.obj: $(SRC_D)\crypto\x509\x509_req.c
+        $(CC) /Fo$(OBJ_D)\x509_req.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_req.c
+
+$(OBJ_D)\x509_vfy.obj: $(SRC_D)\crypto\x509\x509_vfy.c
+        $(CC) /Fo$(OBJ_D)\x509_vfy.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_vfy.c
+
+$(OBJ_D)\x509_set.obj: $(SRC_D)\crypto\x509\x509_set.c
+        $(CC) /Fo$(OBJ_D)\x509_set.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_set.c
+
+$(OBJ_D)\x509rset.obj: $(SRC_D)\crypto\x509\x509rset.c
+        $(CC) /Fo$(OBJ_D)\x509rset.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509rset.c
+
+$(OBJ_D)\x509_err.obj: $(SRC_D)\crypto\x509\x509_err.c
+        $(CC) /Fo$(OBJ_D)\x509_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_err.c
+
+$(OBJ_D)\x509name.obj: $(SRC_D)\crypto\x509\x509name.c
+        $(CC) /Fo$(OBJ_D)\x509name.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509name.c
+
+$(OBJ_D)\x509_v3.obj: $(SRC_D)\crypto\x509\x509_v3.c
+        $(CC) /Fo$(OBJ_D)\x509_v3.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_v3.c
+
+$(OBJ_D)\x509_ext.obj: $(SRC_D)\crypto\x509\x509_ext.c
+        $(CC) /Fo$(OBJ_D)\x509_ext.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_ext.c
+
+$(OBJ_D)\x509pack.obj: $(SRC_D)\crypto\x509\x509pack.c
+        $(CC) /Fo$(OBJ_D)\x509pack.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509pack.c
+
+$(OBJ_D)\x509type.obj: $(SRC_D)\crypto\x509\x509type.c
+        $(CC) /Fo$(OBJ_D)\x509type.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509type.c
+
+$(OBJ_D)\x509_lu.obj: $(SRC_D)\crypto\x509\x509_lu.c
+        $(CC) /Fo$(OBJ_D)\x509_lu.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_lu.c
+
+$(OBJ_D)\x_all.obj: $(SRC_D)\crypto\x509\x_all.c
+        $(CC) /Fo$(OBJ_D)\x_all.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x_all.c
+
+$(OBJ_D)\x509_txt.obj: $(SRC_D)\crypto\x509\x509_txt.c
+        $(CC) /Fo$(OBJ_D)\x509_txt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\x509_txt.c
+
+$(OBJ_D)\by_file.obj: $(SRC_D)\crypto\x509\by_file.c
+        $(CC) /Fo$(OBJ_D)\by_file.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\by_file.c
+
+$(OBJ_D)\by_dir.obj: $(SRC_D)\crypto\x509\by_dir.c
+        $(CC) /Fo$(OBJ_D)\by_dir.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\by_dir.c
+
+$(OBJ_D)\v3_net.obj: $(SRC_D)\crypto\x509\v3_net.c
+        $(CC) /Fo$(OBJ_D)\v3_net.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\v3_net.c
+
+$(OBJ_D)\v3_x509.obj: $(SRC_D)\crypto\x509\v3_x509.c
+        $(CC) /Fo$(OBJ_D)\v3_x509.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\x509\v3_x509.c
+
+$(OBJ_D)\conf.obj: $(SRC_D)\crypto\conf\conf.c
+        $(CC) /Fo$(OBJ_D)\conf.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\conf\conf.c
+
+$(OBJ_D)\conf_err.obj: $(SRC_D)\crypto\conf\conf_err.c
+        $(CC) /Fo$(OBJ_D)\conf_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\conf\conf_err.c
+
+$(OBJ_D)\txt_db.obj: $(SRC_D)\crypto\txt_db\txt_db.c
+        $(CC) /Fo$(OBJ_D)\txt_db.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\txt_db\txt_db.c
+
+$(OBJ_D)\pk7_lib.obj: $(SRC_D)\crypto\pkcs7\pk7_lib.c
+        $(CC) /Fo$(OBJ_D)\pk7_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pkcs7\pk7_lib.c
+
+$(OBJ_D)\pkcs7err.obj: $(SRC_D)\crypto\pkcs7\pkcs7err.c
+        $(CC) /Fo$(OBJ_D)\pkcs7err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pkcs7\pkcs7err.c
+
+$(OBJ_D)\pk7_doit.obj: $(SRC_D)\crypto\pkcs7\pk7_doit.c
+        $(CC) /Fo$(OBJ_D)\pk7_doit.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\crypto\pkcs7\pk7_doit.c
+
+$(OBJ_D)\s2_meth.obj: $(SRC_D)\ssl\s2_meth.c
+        $(CC) /Fo$(OBJ_D)\s2_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_meth.c
+
+$(OBJ_D)\s2_srvr.obj: $(SRC_D)\ssl\s2_srvr.c
+        $(CC) /Fo$(OBJ_D)\s2_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_srvr.c
+
+$(OBJ_D)\s2_clnt.obj: $(SRC_D)\ssl\s2_clnt.c
+        $(CC) /Fo$(OBJ_D)\s2_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_clnt.c
+
+$(OBJ_D)\s2_lib.obj: $(SRC_D)\ssl\s2_lib.c
+        $(CC) /Fo$(OBJ_D)\s2_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_lib.c
+
+$(OBJ_D)\s2_enc.obj: $(SRC_D)\ssl\s2_enc.c
+        $(CC) /Fo$(OBJ_D)\s2_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_enc.c
+
+$(OBJ_D)\s2_pkt.obj: $(SRC_D)\ssl\s2_pkt.c
+        $(CC) /Fo$(OBJ_D)\s2_pkt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s2_pkt.c
+
+$(OBJ_D)\s3_meth.obj: $(SRC_D)\ssl\s3_meth.c
+        $(CC) /Fo$(OBJ_D)\s3_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_meth.c
+
+$(OBJ_D)\s3_srvr.obj: $(SRC_D)\ssl\s3_srvr.c
+        $(CC) /Fo$(OBJ_D)\s3_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_srvr.c
+
+$(OBJ_D)\s3_clnt.obj: $(SRC_D)\ssl\s3_clnt.c
+        $(CC) /Fo$(OBJ_D)\s3_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_clnt.c
+
+$(OBJ_D)\s3_lib.obj: $(SRC_D)\ssl\s3_lib.c
+        $(CC) /Fo$(OBJ_D)\s3_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_lib.c
+
+$(OBJ_D)\s3_enc.obj: $(SRC_D)\ssl\s3_enc.c
+        $(CC) /Fo$(OBJ_D)\s3_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_enc.c
+
+$(OBJ_D)\s3_pkt.obj: $(SRC_D)\ssl\s3_pkt.c
+        $(CC) /Fo$(OBJ_D)\s3_pkt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_pkt.c
+
+$(OBJ_D)\s3_both.obj: $(SRC_D)\ssl\s3_both.c
+        $(CC) /Fo$(OBJ_D)\s3_both.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s3_both.c
+
+$(OBJ_D)\s23_meth.obj: $(SRC_D)\ssl\s23_meth.c
+        $(CC) /Fo$(OBJ_D)\s23_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_meth.c
+
+$(OBJ_D)\s23_srvr.obj: $(SRC_D)\ssl\s23_srvr.c
+        $(CC) /Fo$(OBJ_D)\s23_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_srvr.c
+
+$(OBJ_D)\s23_clnt.obj: $(SRC_D)\ssl\s23_clnt.c
+        $(CC) /Fo$(OBJ_D)\s23_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_clnt.c
+
+$(OBJ_D)\s23_lib.obj: $(SRC_D)\ssl\s23_lib.c
+        $(CC) /Fo$(OBJ_D)\s23_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_lib.c
+
+$(OBJ_D)\s23_pkt.obj: $(SRC_D)\ssl\s23_pkt.c
+        $(CC) /Fo$(OBJ_D)\s23_pkt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\s23_pkt.c
+
+$(OBJ_D)\t1_meth.obj: $(SRC_D)\ssl\t1_meth.c
+        $(CC) /Fo$(OBJ_D)\t1_meth.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_meth.c
+
+$(OBJ_D)\t1_srvr.obj: $(SRC_D)\ssl\t1_srvr.c
+        $(CC) /Fo$(OBJ_D)\t1_srvr.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_srvr.c
+
+$(OBJ_D)\t1_clnt.obj: $(SRC_D)\ssl\t1_clnt.c
+        $(CC) /Fo$(OBJ_D)\t1_clnt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_clnt.c
+
+$(OBJ_D)\t1_lib.obj: $(SRC_D)\ssl\t1_lib.c
+        $(CC) /Fo$(OBJ_D)\t1_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_lib.c
+
+$(OBJ_D)\t1_enc.obj: $(SRC_D)\ssl\t1_enc.c
+        $(CC) /Fo$(OBJ_D)\t1_enc.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\t1_enc.c
+
+$(OBJ_D)\ssl_lib.obj: $(SRC_D)\ssl\ssl_lib.c
+        $(CC) /Fo$(OBJ_D)\ssl_lib.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_lib.c
+
+$(OBJ_D)\ssl_err2.obj: $(SRC_D)\ssl\ssl_err2.c
+        $(CC) /Fo$(OBJ_D)\ssl_err2.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_err2.c
+
+$(OBJ_D)\ssl_cert.obj: $(SRC_D)\ssl\ssl_cert.c
+        $(CC) /Fo$(OBJ_D)\ssl_cert.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_cert.c
+
+$(OBJ_D)\ssl_sess.obj: $(SRC_D)\ssl\ssl_sess.c
+        $(CC) /Fo$(OBJ_D)\ssl_sess.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_sess.c
+
+$(OBJ_D)\ssl_ciph.obj: $(SRC_D)\ssl\ssl_ciph.c
+        $(CC) /Fo$(OBJ_D)\ssl_ciph.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_ciph.c
+
+$(OBJ_D)\ssl_stat.obj: $(SRC_D)\ssl\ssl_stat.c
+        $(CC) /Fo$(OBJ_D)\ssl_stat.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_stat.c
+
+$(OBJ_D)\ssl_rsa.obj: $(SRC_D)\ssl\ssl_rsa.c
+        $(CC) /Fo$(OBJ_D)\ssl_rsa.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_rsa.c
+
+$(OBJ_D)\ssl_asn1.obj: $(SRC_D)\ssl\ssl_asn1.c
+        $(CC) /Fo$(OBJ_D)\ssl_asn1.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_asn1.c
+
+$(OBJ_D)\ssl_txt.obj: $(SRC_D)\ssl\ssl_txt.c
+        $(CC) /Fo$(OBJ_D)\ssl_txt.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_txt.c
+
+$(OBJ_D)\ssl_algs.obj: $(SRC_D)\ssl\ssl_algs.c
+        $(CC) /Fo$(OBJ_D)\ssl_algs.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_algs.c
+
+$(OBJ_D)\bio_ssl.obj: $(SRC_D)\ssl\bio_ssl.c
+        $(CC) /Fo$(OBJ_D)\bio_ssl.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\bio_ssl.c
+
+$(OBJ_D)\ssl_err.obj: $(SRC_D)\ssl\ssl_err.c
+        $(CC) /Fo$(OBJ_D)\ssl_err.obj  $(SHLIB_CFLAGS) -c $(SRC_D)\ssl\ssl_err.c
+
+$(OBJ_D)\rsaref.obj: $(SRC_D)\rsaref\rsaref.c
+        $(CC) /Fo$(OBJ_D)\rsaref.obj  $(LIB_CFLAGS) -c $(SRC_D)\rsaref\rsaref.c
+
+$(OBJ_D)\rsar_err.obj: $(SRC_D)\rsaref\rsar_err.c
+        $(CC) /Fo$(OBJ_D)\rsar_err.obj  $(LIB_CFLAGS) -c $(SRC_D)\rsaref\rsar_err.c
+
+$(TEST_D)\md2test.exe: $(OBJ_D)\md2test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\md2test.obj
+  $(TEST_D)\md2test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\md5test.exe: $(OBJ_D)\md5test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\md5test.obj
+  $(TEST_D)\md5test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\shatest.exe: $(OBJ_D)\shatest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\shatest.obj
+  $(TEST_D)\shatest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\sha1test.exe: $(OBJ_D)\sha1test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\sha1test.obj
+  $(TEST_D)\sha1test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\mdc2test.exe: $(OBJ_D)\mdc2test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\mdc2test.obj
+  $(TEST_D)\mdc2test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\hmactest.exe: $(OBJ_D)\hmactest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\hmactest.obj
+  $(TEST_D)\hmactest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\rmdtest.exe: $(OBJ_D)\rmdtest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rmdtest.obj
+  $(TEST_D)\rmdtest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\destest.exe: $(OBJ_D)\destest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\destest.obj
+  $(TEST_D)\destest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\rc2test.exe: $(OBJ_D)\rc2test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rc2test.obj
+  $(TEST_D)\rc2test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\rc4test.exe: $(OBJ_D)\rc4test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rc4test.obj
+  $(TEST_D)\rc4test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\rc5test.exe: $(OBJ_D)\rc5test.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\rc5test.obj
+  $(TEST_D)\rc5test.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\ideatest.exe: $(OBJ_D)\ideatest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\ideatest.obj
+  $(TEST_D)\ideatest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\bftest.exe: $(OBJ_D)\bftest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\bftest.obj
+  $(TEST_D)\bftest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\casttest.exe: $(OBJ_D)\casttest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\casttest.obj
+  $(TEST_D)\casttest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\bntest.exe: $(OBJ_D)\bntest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\bntest.obj
+  $(TEST_D)\bntest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\exptest.exe: $(OBJ_D)\exptest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\exptest.obj
+  $(TEST_D)\exptest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\dsatest.exe: $(OBJ_D)\dsatest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\dsatest.obj
+  $(TEST_D)\dsatest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\dhtest.exe: $(OBJ_D)\dhtest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\dhtest.obj
+  $(TEST_D)\dhtest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\randtest.exe: $(OBJ_D)\randtest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\randtest.obj
+  $(TEST_D)\randtest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(TEST_D)\ssltest.exe: $(OBJ_D)\ssltest.obj $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) $(OBJ_D)\ssltest.obj
+  $(TEST_D)\ssltest.exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
+$(O_SSL): $(SSLOBJ)
+        $(LINK) $(MLFLAGS) @<<
+  $(SHLIB_EX_OBJ) +
+  $(OBJ_D)\bio_ssl.obj +
+  $(OBJ_D)\s23_clnt.obj +
+  $(OBJ_D)\s23_lib.obj +
+  $(OBJ_D)\s23_meth.obj +
+  $(OBJ_D)\s23_pkt.obj +
+  $(OBJ_D)\s23_srvr.obj +
+  $(OBJ_D)\s2_clnt.obj +
+  $(OBJ_D)\s2_enc.obj +
+  $(OBJ_D)\s2_lib.obj +
+  $(OBJ_D)\s2_meth.obj +
+  $(OBJ_D)\s2_pkt.obj +
+  $(OBJ_D)\s2_srvr.obj +
+  $(OBJ_D)\s3_both.obj +
+  $(OBJ_D)\s3_clnt.obj +
+  $(OBJ_D)\s3_enc.obj +
+  $(OBJ_D)\s3_lib.obj +
+  $(OBJ_D)\s3_meth.obj +
+  $(OBJ_D)\s3_pkt.obj +
+  $(OBJ_D)\s3_srvr.obj +
+  $(OBJ_D)\ssl_algs.obj +
+  $(OBJ_D)\ssl_asn1.obj +
+  $(OBJ_D)\ssl_cert.obj +
+  $(OBJ_D)\ssl_ciph.obj +
+  $(OBJ_D)\ssl_err.obj +
+  $(OBJ_D)\ssl_err2.obj +
+  $(OBJ_D)\ssl_lib.obj +
+  $(OBJ_D)\ssl_rsa.obj +
+  $(OBJ_D)\ssl_sess.obj +
+  $(OBJ_D)\ssl_stat.obj +
+  $(OBJ_D)\ssl_txt.obj +
+  $(OBJ_D)\t1_clnt.obj +
+  $(OBJ_D)\t1_enc.obj +
+  $(OBJ_D)\t1_lib.obj +
+  $(OBJ_D)\t1_meth.obj +
+  $(OBJ_D)\t1_srvr.obj +
+
+  $(O_SSL)
+
+  $(L_CRYPTO) winsock oldnames ldllcew libw
+ms\ssleay16.def;
+<<
+        implib /noignorecase /nowep $(L_SSL) $(O_SSL)
+
+$(O_RSAGLUE): $(RSAGLUEOBJ)
+        del $(O_RSAGLUE)
+        $(MKLIB) @<<
+$(O_RSAGLUE)
+y
++$(OBJ_D)\rsar_err.obj &
++$(OBJ_D)\rsaref.obj &
+
+
+<<
+
+$(O_CRYPTO): $(CRYPTOOBJ)
+        $(LINK) $(MLFLAGS) @<<
+  $(SHLIB_EX_OBJ) +
+  $(BN_MULW_OBJ) +
+  $(OBJ_D)\a_bitstr.obj +
+  $(OBJ_D)\a_bool.obj +
+  $(OBJ_D)\a_bytes.obj +
+  $(OBJ_D)\a_d2i_fp.obj +
+  $(OBJ_D)\a_digest.obj +
+  $(OBJ_D)\a_dup.obj +
+  $(OBJ_D)\a_hdr.obj +
+  $(OBJ_D)\a_i2d_fp.obj +
+  $(OBJ_D)\a_int.obj +
+  $(OBJ_D)\a_meth.obj +
+  $(OBJ_D)\a_object.obj +
+  $(OBJ_D)\a_octet.obj +
+  $(OBJ_D)\a_print.obj +
+  $(OBJ_D)\a_set.obj +
+  $(OBJ_D)\a_sign.obj +
+  $(OBJ_D)\a_type.obj +
+  $(OBJ_D)\a_utctm.obj +
+  $(OBJ_D)\a_verify.obj +
+  $(OBJ_D)\asn1_err.obj +
+  $(OBJ_D)\asn1_lib.obj +
+  $(OBJ_D)\asn1_par.obj +
+  $(OBJ_D)\b_dump.obj +
+  $(OBJ_D)\b_print.obj +
+  $(OBJ_D)\b_sock.obj +
+  $(OBJ_D)\bf_buff.obj +
+  $(OBJ_D)\bf_cfb64.obj +
+  $(OBJ_D)\bf_ecb.obj +
+  $(OBJ_D)\bf_enc.obj +
+  $(OBJ_D)\bf_nbio.obj +
+  $(OBJ_D)\bf_null.obj +
+  $(OBJ_D)\bf_ofb64.obj +
+  $(OBJ_D)\bf_skey.obj +
+  $(OBJ_D)\bio_b64.obj +
+  $(OBJ_D)\bio_cb.obj +
+  $(OBJ_D)\bio_enc.obj +
+  $(OBJ_D)\bio_err.obj +
+  $(OBJ_D)\bio_lib.obj +
+  $(OBJ_D)\bio_md.obj +
+  $(OBJ_D)\bn_add.obj +
+  $(OBJ_D)\bn_blind.obj +
+  $(OBJ_D)\bn_div.obj +
+  $(OBJ_D)\bn_err.obj +
+  $(OBJ_D)\bn_exp.obj +
+  $(OBJ_D)\bn_gcd.obj +
+  $(OBJ_D)\bn_lib.obj +
+  $(OBJ_D)\bn_mod.obj +
+  $(OBJ_D)\bn_mont.obj +
+  $(OBJ_D)\bn_mpi.obj +
+  $(OBJ_D)\bn_mul.obj +
+  $(OBJ_D)\bn_prime.obj +
+  $(OBJ_D)\bn_print.obj +
+  $(OBJ_D)\bn_rand.obj +
+  $(OBJ_D)\bn_recp.obj +
+  $(OBJ_D)\bn_shift.obj +
+  $(OBJ_D)\bn_sqr.obj +
+  $(OBJ_D)\bn_sub.obj +
+  $(OBJ_D)\bn_word.obj +
+  $(OBJ_D)\bss_acpt.obj +
+  $(OBJ_D)\bss_conn.obj +
+  $(OBJ_D)\bss_fd.obj +
+  $(OBJ_D)\bss_file.obj +
+  $(OBJ_D)\bss_mem.obj +
+  $(OBJ_D)\bss_null.obj +
+  $(OBJ_D)\bss_sock.obj +
+  $(OBJ_D)\buf_err.obj +
+  $(OBJ_D)\buffer.obj +
+  $(OBJ_D)\by_dir.obj +
+  $(OBJ_D)\by_file.obj +
+  $(OBJ_D)\c_all.obj +
+  $(OBJ_D)\c_cfb64.obj +
+  $(OBJ_D)\c_ecb.obj +
+  $(OBJ_D)\c_enc.obj +
+  $(OBJ_D)\c_ofb64.obj +
+  $(OBJ_D)\c_skey.obj +
+  $(OBJ_D)\cbc_cksm.obj +
+  $(OBJ_D)\cbc_enc.obj +
+  $(OBJ_D)\cfb64ede.obj +
+  $(OBJ_D)\cfb64enc.obj +
+  $(OBJ_D)\cfb_enc.obj +
+  $(OBJ_D)\conf.obj +
+  $(OBJ_D)\conf_err.obj +
+  $(OBJ_D)\cpt_err.obj +
+  $(OBJ_D)\cryptlib.obj +
+  $(OBJ_D)\cversion.obj +
+  $(OBJ_D)\d2i_dhp.obj +
+  $(OBJ_D)\d2i_dsap.obj +
+  $(OBJ_D)\d2i_pr.obj +
+  $(OBJ_D)\d2i_pu.obj +
+  $(OBJ_D)\d2i_r_pr.obj +
+  $(OBJ_D)\d2i_r_pu.obj +
+  $(OBJ_D)\d2i_s_pr.obj +
+  $(OBJ_D)\d2i_s_pu.obj +
+  $(OBJ_D)\des_enc.obj +
+  $(OBJ_D)\dh_check.obj +
+  $(OBJ_D)\dh_err.obj +
+  $(OBJ_D)\dh_gen.obj +
+  $(OBJ_D)\dh_key.obj +
+  $(OBJ_D)\dh_lib.obj +
+  $(OBJ_D)\digest.obj +
+  $(OBJ_D)\dsa_err.obj +
+  $(OBJ_D)\dsa_gen.obj +
+  $(OBJ_D)\dsa_key.obj +
+  $(OBJ_D)\dsa_lib.obj +
+  $(OBJ_D)\dsa_sign.obj +
+  $(OBJ_D)\dsa_vrf.obj +
+  $(OBJ_D)\e_cbc_3d.obj +
+  $(OBJ_D)\e_cbc_bf.obj +
+  $(OBJ_D)\e_cbc_c.obj +
+  $(OBJ_D)\e_cbc_d.obj +
+  $(OBJ_D)\e_cbc_i.obj +
+  $(OBJ_D)\e_cbc_r2.obj +
+  $(OBJ_D)\e_cbc_r5.obj +
+  $(OBJ_D)\e_cfb_3d.obj +
+  $(OBJ_D)\e_cfb_bf.obj +
+  $(OBJ_D)\e_cfb_c.obj +
+  $(OBJ_D)\e_cfb_d.obj +
+  $(OBJ_D)\e_cfb_i.obj +
+  $(OBJ_D)\e_cfb_r2.obj +
+  $(OBJ_D)\e_cfb_r5.obj +
+  $(OBJ_D)\e_ecb_3d.obj +
+  $(OBJ_D)\e_ecb_bf.obj +
+  $(OBJ_D)\e_ecb_c.obj +
+  $(OBJ_D)\e_ecb_d.obj +
+  $(OBJ_D)\e_ecb_i.obj +
+  $(OBJ_D)\e_ecb_r2.obj +
+  $(OBJ_D)\e_ecb_r5.obj +
+  $(OBJ_D)\e_null.obj +
+  $(OBJ_D)\e_ofb_3d.obj +
+  $(OBJ_D)\e_ofb_bf.obj +
+  $(OBJ_D)\e_ofb_c.obj +
+  $(OBJ_D)\e_ofb_d.obj +
+  $(OBJ_D)\e_ofb_i.obj +
+  $(OBJ_D)\e_ofb_r2.obj +
+  $(OBJ_D)\e_ofb_r5.obj +
+  $(OBJ_D)\e_rc4.obj +
+  $(OBJ_D)\e_xcbc_d.obj +
+  $(OBJ_D)\ecb3_enc.obj +
+  $(OBJ_D)\ecb_enc.obj +
+  $(OBJ_D)\enc_read.obj +
+  $(OBJ_D)\enc_writ.obj +
+  $(OBJ_D)\encode.obj +
+  $(OBJ_D)\err.obj +
+  $(OBJ_D)\err_all.obj +
+  $(OBJ_D)\err_prn.obj +
+  $(OBJ_D)\evp_asn1.obj +
+  $(OBJ_D)\evp_enc.obj +
+  $(OBJ_D)\evp_err.obj +
+  $(OBJ_D)\evp_key.obj +
+  $(OBJ_D)\evp_lib.obj +
+  $(OBJ_D)\ex_data.obj +
+  $(OBJ_D)\f_int.obj +
+  $(OBJ_D)\f_string.obj +
+  $(OBJ_D)\fcrypt.obj +
+  $(OBJ_D)\fcrypt_b.obj +
+  $(OBJ_D)\hmac.obj +
+  $(OBJ_D)\i2d_dhp.obj +
+  $(OBJ_D)\i2d_dsap.obj +
+  $(OBJ_D)\i2d_pr.obj +
+  $(OBJ_D)\i2d_pu.obj +
+  $(OBJ_D)\i2d_r_pr.obj +
+  $(OBJ_D)\i2d_r_pu.obj +
+  $(OBJ_D)\i2d_s_pr.obj +
+  $(OBJ_D)\i2d_s_pu.obj +
+  $(OBJ_D)\i_cbc.obj +
+  $(OBJ_D)\i_cfb64.obj +
+  $(OBJ_D)\i_ecb.obj +
+  $(OBJ_D)\i_ofb64.obj +
+  $(OBJ_D)\i_skey.obj +
+  $(OBJ_D)\lh_stats.obj +
+  $(OBJ_D)\lhash.obj +
+  $(OBJ_D)\m_dss.obj +
+  $(OBJ_D)\m_dss1.obj +
+  $(OBJ_D)\m_md2.obj +
+  $(OBJ_D)\m_md5.obj +
+  $(OBJ_D)\m_mdc2.obj +
+  $(OBJ_D)\m_null.obj +
+  $(OBJ_D)\m_ripemd.obj +
+  $(OBJ_D)\m_sha.obj +
+  $(OBJ_D)\m_sha1.obj +
+  $(OBJ_D)\md2_dgst.obj +
+  $(OBJ_D)\md2_one.obj +
+  $(OBJ_D)\md5_dgst.obj +
+  $(OBJ_D)\md5_one.obj +
+  $(OBJ_D)\md_rand.obj +
+  $(OBJ_D)\mdc2_one.obj +
+  $(OBJ_D)\mdc2dgst.obj +
+  $(OBJ_D)\mem.obj +
+  $(OBJ_D)\n_pkey.obj +
+  $(OBJ_D)\names.obj +
+  $(OBJ_D)\obj_dat.obj +
+  $(OBJ_D)\obj_err.obj +
+  $(OBJ_D)\obj_lib.obj +
+  $(OBJ_D)\ofb64ede.obj +
+  $(OBJ_D)\ofb64enc.obj +
+  $(OBJ_D)\ofb_enc.obj +
+  $(OBJ_D)\p7_dgst.obj +
+  $(OBJ_D)\p7_enc.obj +
+  $(OBJ_D)\p7_enc_c.obj +
+  $(OBJ_D)\p7_evp.obj +
+  $(OBJ_D)\p7_i_s.obj +
+  $(OBJ_D)\p7_lib.obj +
+  $(OBJ_D)\p7_recip.obj +
+  $(OBJ_D)\p7_s_e.obj +
+  $(OBJ_D)\p7_signd.obj +
+  $(OBJ_D)\p7_signi.obj +
+  $(OBJ_D)\p_dec.obj +
+  $(OBJ_D)\p_enc.obj +
+  $(OBJ_D)\p_lib.obj +
+  $(OBJ_D)\p_open.obj +
+  $(OBJ_D)\p_seal.obj +
+  $(OBJ_D)\p_sign.obj +
+  $(OBJ_D)\p_verify.obj +
+  $(OBJ_D)\pcbc_enc.obj +
+  $(OBJ_D)\pem_all.obj +
+  $(OBJ_D)\pem_err.obj +
+  $(OBJ_D)\pem_info.obj +
+  $(OBJ_D)\pem_lib.obj +
+  $(OBJ_D)\pem_seal.obj +
+  $(OBJ_D)\pem_sign.obj +
+  $(OBJ_D)\pk7_doit.obj +
+  $(OBJ_D)\pk7_lib.obj +
+  $(OBJ_D)\pkcs7err.obj +
+  $(OBJ_D)\qud_cksm.obj +
+  $(OBJ_D)\rand_key.obj +
+  $(OBJ_D)\randfile.obj +
+  $(OBJ_D)\rc2_cbc.obj +
+  $(OBJ_D)\rc2_ecb.obj +
+  $(OBJ_D)\rc2_skey.obj +
+  $(OBJ_D)\rc2cfb64.obj +
+  $(OBJ_D)\rc2ofb64.obj +
+  $(OBJ_D)\rc4_enc.obj +
+  $(OBJ_D)\rc4_skey.obj +
+  $(OBJ_D)\rc5_ecb.obj +
+  $(OBJ_D)\rc5_enc.obj +
+  $(OBJ_D)\rc5_skey.obj +
+  $(OBJ_D)\rc5cfb64.obj +
+  $(OBJ_D)\rc5ofb64.obj +
+  $(OBJ_D)\read2pwd.obj +
+  $(OBJ_D)\read_pwd.obj +
+  $(OBJ_D)\rmd_dgst.obj +
+  $(OBJ_D)\rmd_one.obj +
+  $(OBJ_D)\rpc_enc.obj +
+  $(OBJ_D)\rsa_eay.obj +
+  $(OBJ_D)\rsa_err.obj +
+  $(OBJ_D)\rsa_gen.obj +
+  $(OBJ_D)\rsa_lib.obj +
+  $(OBJ_D)\rsa_none.obj +
+  $(OBJ_D)\rsa_pk1.obj +
+  $(OBJ_D)\rsa_saos.obj +
+  $(OBJ_D)\rsa_sign.obj +
+  $(OBJ_D)\rsa_ssl.obj +
+  $(OBJ_D)\set_key.obj +
+  $(OBJ_D)\sha1_one.obj +
+  $(OBJ_D)\sha1dgst.obj +
+  $(OBJ_D)\sha_dgst.obj +
+  $(OBJ_D)\sha_one.obj +
+  $(OBJ_D)\stack.obj +
+  $(OBJ_D)\str2key.obj +
+  $(OBJ_D)\supp.obj +
+  $(OBJ_D)\t_pkey.obj +
+  $(OBJ_D)\t_req.obj +
+  $(OBJ_D)\t_x509.obj +
+  $(OBJ_D)\txt_db.obj +
+  $(OBJ_D)\v3_net.obj +
+  $(OBJ_D)\v3_x509.obj +
+  $(OBJ_D)\x509_cmp.obj +
+  $(OBJ_D)\x509_d2.obj +
+  $(OBJ_D)\x509_def.obj +
+  $(OBJ_D)\x509_err.obj +
+  $(OBJ_D)\x509_ext.obj +
+  $(OBJ_D)\x509_lu.obj +
+  $(OBJ_D)\x509_obj.obj +
+  $(OBJ_D)\x509_r2x.obj +
+  $(OBJ_D)\x509_req.obj +
+  $(OBJ_D)\x509_set.obj +
+  $(OBJ_D)\x509_txt.obj +
+  $(OBJ_D)\x509_v3.obj +
+  $(OBJ_D)\x509_vfy.obj +
+  $(OBJ_D)\x509name.obj +
+  $(OBJ_D)\x509pack.obj +
+  $(OBJ_D)\x509rset.obj +
+  $(OBJ_D)\x509type.obj +
+  $(OBJ_D)\x_algor.obj +
+  $(OBJ_D)\x_all.obj +
+  $(OBJ_D)\x_attrib.obj +
+  $(OBJ_D)\x_cinf.obj +
+  $(OBJ_D)\x_crl.obj +
+  $(OBJ_D)\x_exten.obj +
+  $(OBJ_D)\x_info.obj +
+  $(OBJ_D)\x_name.obj +
+  $(OBJ_D)\x_pkey.obj +
+  $(OBJ_D)\x_pubkey.obj +
+  $(OBJ_D)\x_req.obj +
+  $(OBJ_D)\x_sig.obj +
+  $(OBJ_D)\x_spki.obj +
+  $(OBJ_D)\x_val.obj +
+  $(OBJ_D)\x_x509.obj +
+  $(OBJ_D)\xcbc_enc.obj +
+
+  $(O_CRYPTO)
+
+   winsock oldnames ldllcew libw
+ms\libeay16.def;
+<<
+        implib /noignorecase /nowep $(L_CRYPTO) $(O_CRYPTO)
+
+$(BIN_D)\$(E_EXE).exe: $(E_OBJ) $(LIBS_DEP)
+  $(LINK) $(LFLAGS) @<<
+  $(APP_EX_OBJ) +
+  $(OBJ_D)\apps.obj +
+  $(OBJ_D)\asn1pars.obj +
+  $(OBJ_D)\ca.obj +
+  $(OBJ_D)\ciphers.obj +
+  $(OBJ_D)\crl.obj +
+  $(OBJ_D)\crl2p7.obj +
+  $(OBJ_D)\dgst.obj +
+  $(OBJ_D)\dh.obj +
+  $(OBJ_D)\dsa.obj +
+  $(OBJ_D)\dsaparam.obj +
+  $(OBJ_D)\enc.obj +
+  $(OBJ_D)\errstr.obj +
+  $(OBJ_D)\gendh.obj +
+  $(OBJ_D)\genrsa.obj +
+  $(OBJ_D)\pkcs7.obj +
+  $(OBJ_D)\req.obj +
+  $(OBJ_D)\rsa.obj +
+  $(OBJ_D)\s_cb.obj +
+  $(OBJ_D)\s_client.obj +
+  $(OBJ_D)\s_server.obj +
+  $(OBJ_D)\s_socket.obj +
+  $(OBJ_D)\s_time.obj +
+  $(OBJ_D)\sess_id.obj +
+  $(OBJ_D)\speed.obj +
+  $(OBJ_D)\ssleay.obj +
+  $(OBJ_D)\verify.obj +
+  $(OBJ_D)\version.obj +
+  $(OBJ_D)\x509.obj +
+
+  $(BIN_D)\$(E_EXE).exe
+
+  $(L_LIBS) $(EX_LIBS)
+
+<<
+
diff --git a/src/lib/libssl/src/mt/README b/src/lib/libssl/src/mt/README
new file mode 100644
index 0000000000..df6b26e146
--- /dev/null
+++ b/src/lib/libssl/src/mt/README
@@ -0,0 +1,14 @@
+Mutithreading testing area.
+
+Since this stuff is very very platorm specific, this is not part of the
+normal build.  Have a read of doc/threads.doc.
+
+mttest will do some testing and will currently build under Windows NT/95,
+Solaris and Linux.  The IRIX stuff is not finished.
+
+I have tested this program on a 12 CPU ultra sparc box (solaris 2.5.1)
+and things seem to work ok.
+
+The Linux pthreads package can be retrieved from 
+http://www.mit.edu:8001/people/proven/pthreads.html
+
diff --git a/src/lib/libssl/src/mt/mttest.c b/src/lib/libssl/src/mt/mttest.c
new file mode 100644
index 0000000000..8651a1131a
--- /dev/null
+++ b/src/lib/libssl/src/mt/mttest.c
@@ -0,0 +1,1115 @@
+/* mt/mttest.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#ifdef LINUX
+#include <typedefs.h>
+#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
+#ifdef SOLARIS
+#include <synch.h>
+#include <thread.h>
+#endif
+#ifdef IRIX
+#include <ulocks.h>
+#include <sys/prctl.h>
+#endif
+#include "lhash.h"
+#include "crypto.h"
+#include "buffer.h"
+#include "../e_os.h"
+#include "x509.h"
+#include "ssl.h"
+#include "err.h"
+
+#ifdef NO_FP_API
+#define APPS_WIN16
+#include "../crypto/buffer/bss_file.c"
+#endif
+
+#define TEST_SERVER_CERT "../apps/server.pem"
+#define TEST_CLIENT_CERT "../apps/client.pem"
+
+#define MAX_THREAD_NUMBER       100
+
+#ifndef NOPROTO
+int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth,
+        int error,char *arg);
+void thread_setup(void);
+void thread_cleanup(void);
+void do_threads(SSL_CTX *s_ctx,SSL_CTX *c_ctx);
+
+void irix_locking_callback(int mode,int type,char *file,int line);
+void solaris_locking_callback(int mode,int type,char *file,int line);
+void win32_locking_callback(int mode,int type,char *file,int line);
+void pthreads_locking_callback(int mode,int type,char *file,int line);
+
+unsigned long irix_thread_id(void );
+unsigned long solaris_thread_id(void );
+unsigned long pthreads_thread_id(void );
+
+#else
+int MS_CALLBACK verify_callback();
+void thread_setup();
+void thread_cleanup();
+void do_threads();
+
+void irix_locking_callback();
+void solaris_locking_callback();
+void win32_locking_callback();
+void pthreads_locking_callback();
+
+unsigned long irix_thread_id();
+unsigned long solaris_thread_id();
+unsigned long pthreads_thread_id();
+
+#endif
+
+BIO *bio_err=NULL;
+BIO *bio_stdout=NULL;
+
+static char *cipher=NULL;
+int verbose=0;
+#ifdef FIONBIO
+static int s_nbio=0;
+#endif
+
+int thread_number=10;
+int number_of_loops=10;
+int reconnect=0;
+int cache_stats=0;
+
+#ifndef  NOPROTO
+int doit(char *ctx[4]);
+#else
+int doit();
+#endif
+
+static void print_stats(fp,ctx)
+FILE *fp;
+SSL_CTX *ctx;
+{
+        fprintf(fp,"%4ld items in the session cache\n",
+                SSL_CTX_sess_number(ctx));
+        fprintf(fp,"%4d client connects (SSL_connect())\n",
+                SSL_CTX_sess_connect(ctx));
+        fprintf(fp,"%4d client connects that finished\n",
+                SSL_CTX_sess_connect_good(ctx));
+        fprintf(fp,"%4d server connects (SSL_accept())\n",
+                SSL_CTX_sess_accept(ctx));
+        fprintf(fp,"%4d server connects that finished\n",
+                SSL_CTX_sess_accept_good(ctx));
+        fprintf(fp,"%4d session cache hits\n",SSL_CTX_sess_hits(ctx));
+        fprintf(fp,"%4d session cache misses\n",SSL_CTX_sess_misses(ctx));
+        fprintf(fp,"%4d session cache timeouts\n",SSL_CTX_sess_timeouts(ctx));
+        }
+
+static void sv_usage()
+        {
+        fprintf(stderr,"usage: ssltest [args ...]\n");
+        fprintf(stderr,"\n");
+        fprintf(stderr," -server_auth  - check server certificate\n");
+        fprintf(stderr," -client_auth  - do client authentication\n");
+        fprintf(stderr," -v            - more output\n");
+        fprintf(stderr," -CApath arg   - PEM format directory of CA's\n");
+        fprintf(stderr," -CAfile arg   - PEM format file of CA's\n");
+        fprintf(stderr," -threads arg  - number of threads\n");
+        fprintf(stderr," -loops arg    - number of 'connections', per thread\n");
+        fprintf(stderr," -reconnect    - reuse session-id's\n");
+        fprintf(stderr," -stats        - server session-id cache stats\n");
+        fprintf(stderr," -cert arg     - server certificate/key\n");
+        fprintf(stderr," -ccert arg    - client certificate/key\n");
+        fprintf(stderr," -ssl3         - just SSLv3n\n");
+        }
+
+int main(argc, argv)
+int argc;
+char *argv[];
+        {
+        char *CApath=NULL,*CAfile=NULL;
+        int badop=0;
+        int ret=1;
+        int client_auth=0;
+        int server_auth=0;
+        SSL_CTX *s_ctx=NULL;
+        SSL_CTX *c_ctx=NULL;
+        char *scert=TEST_SERVER_CERT;
+        char *ccert=TEST_CLIENT_CERT;
+        SSL_METHOD *ssl_method=SSLv23_method();
+
+        if (bio_err == NULL)
+                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+        if (bio_stdout == NULL)
+                bio_stdout=BIO_new_fp(stdout,BIO_NOCLOSE);
+        argc--;
+        argv++;
+
+        while (argc >= 1)
+                {
+                if      (strcmp(*argv,"-server_auth") == 0)
+                        server_auth=1;
+                else if (strcmp(*argv,"-client_auth") == 0)
+                        client_auth=1;
+                else if (strcmp(*argv,"-reconnect") == 0)
+                        reconnect=1;
+                else if (strcmp(*argv,"-stats") == 0)
+                        cache_stats=1;
+                else if (strcmp(*argv,"-ssl3") == 0)
+                        ssl_method=SSLv3_method();
+                else if (strcmp(*argv,"-ssl2") == 0)
+                        ssl_method=SSLv2_method();
+                else if (strcmp(*argv,"-CApath") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        CApath= *(++argv);
+                        }
+                else if (strcmp(*argv,"-CAfile") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        CAfile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-cert") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        scert= *(++argv);
+                        }
+                else if (strcmp(*argv,"-ccert") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        ccert= *(++argv);
+                        }
+                else if (strcmp(*argv,"-threads") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        thread_number= atoi(*(++argv));
+                        if (thread_number == 0) thread_number=1;
+                        if (thread_number > MAX_THREAD_NUMBER)
+                                thread_number=MAX_THREAD_NUMBER;
+                        }
+                else if (strcmp(*argv,"-loops") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        number_of_loops= atoi(*(++argv));
+                        if (number_of_loops == 0) number_of_loops=1;
+                        }
+                else
+                        {
+                        fprintf(stderr,"unknown option %s\n",*argv);
+                        badop=1;
+                        break;
+                        }
+                argc--;
+                argv++;
+                }
+        if (badop)
+                {
+bad:
+                sv_usage();
+                goto end;
+                }
+
+        if (cipher == NULL) cipher=getenv("SSL_CIPHER");
+
+        SSL_load_error_strings();
+        SSLeay_add_ssl_algorithms();
+
+        c_ctx=SSL_CTX_new(ssl_method);
+        s_ctx=SSL_CTX_new(ssl_method);
+        if ((c_ctx == NULL) || (s_ctx == NULL))
+                {
+                ERR_print_errors(bio_err);
+                goto end;
+                }
+
+        SSL_CTX_set_session_cache_mode(s_ctx,
+                SSL_SESS_CACHE_NO_AUTO_CLEAR|SSL_SESS_CACHE_SERVER);
+        SSL_CTX_set_session_cache_mode(c_ctx,
+                SSL_SESS_CACHE_NO_AUTO_CLEAR|SSL_SESS_CACHE_SERVER);
+
+        SSL_CTX_use_certificate_file(s_ctx,scert,SSL_FILETYPE_PEM);
+        SSL_CTX_use_RSAPrivateKey_file(s_ctx,scert,SSL_FILETYPE_PEM);
+
+        if (client_auth)
+                {
+                SSL_CTX_use_certificate_file(c_ctx,ccert,
+                        SSL_FILETYPE_PEM);
+                SSL_CTX_use_RSAPrivateKey_file(c_ctx,ccert,
+                        SSL_FILETYPE_PEM);
+                }
+
+        if (    (!SSL_CTX_load_verify_locations(s_ctx,CAfile,CApath)) ||
+                (!SSL_CTX_set_default_verify_paths(s_ctx)) ||
+                (!SSL_CTX_load_verify_locations(c_ctx,CAfile,CApath)) ||
+                (!SSL_CTX_set_default_verify_paths(c_ctx)))
+                {
+                fprintf(stderr,"SSL_load_verify_locations\n");
+                ERR_print_errors(bio_err);
+                goto end;
+                }
+
+        if (client_auth)
+                {
+                fprintf(stderr,"client authentication\n");
+                SSL_CTX_set_verify(s_ctx,
+                        SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+                        verify_callback);
+                }
+        if (server_auth)
+                {
+                fprintf(stderr,"server authentication\n");
+                SSL_CTX_set_verify(c_ctx,SSL_VERIFY_PEER,
+                        verify_callback);
+                }
+
+        thread_setup();
+        do_threads(s_ctx,c_ctx);
+        thread_cleanup();
+end:
+        
+        if (c_ctx != NULL) 
+                {
+                fprintf(stderr,"Client SSL_CTX stats then free it\n");
+                print_stats(stderr,c_ctx);
+                SSL_CTX_free(c_ctx);
+                }
+        if (s_ctx != NULL)
+                {
+                fprintf(stderr,"Server SSL_CTX stats then free it\n");
+                print_stats(stderr,s_ctx);
+                if (cache_stats)
+                        {
+                        fprintf(stderr,"-----\n");
+                        lh_stats(SSL_CTX_sessions(s_ctx),stderr);
+                        fprintf(stderr,"-----\n");
+                /*      lh_node_stats(SSL_CTX_sessions(s_ctx),stderr);
+                        fprintf(stderr,"-----\n"); */
+                        lh_node_usage_stats(SSL_CTX_sessions(s_ctx),stderr);
+                        fprintf(stderr,"-----\n");
+                        }
+                SSL_CTX_free(s_ctx);
+                fprintf(stderr,"done free\n");
+                }
+        exit(ret);
+        return(0);
+        }
+
+#define W_READ  1
+#define W_WRITE 2
+#define C_DONE  1
+#define S_DONE  2
+
+int ndoit(ssl_ctx)
+SSL_CTX *ssl_ctx[2];
+        {
+        int i;
+        int ret;
+        char *ctx[4];
+
+        ctx[0]=(char *)ssl_ctx[0];
+        ctx[1]=(char *)ssl_ctx[1];
+
+        if (reconnect)
+                {
+                ctx[2]=(char *)SSL_new(ssl_ctx[0]);
+                ctx[3]=(char *)SSL_new(ssl_ctx[1]);
+                }
+        else
+                {
+                ctx[2]=NULL;
+                ctx[3]=NULL;
+                }
+
+        fprintf(stdout,"started thread %lu\n",CRYPTO_thread_id());
+        for (i=0; i<number_of_loops; i++)
+                {
+/*              fprintf(stderr,"%4d %2d ctx->ref (%3d,%3d)\n",
+                        CRYPTO_thread_id(),i,
+                        ssl_ctx[0]->references,
+                        ssl_ctx[1]->references); */
+        /*      pthread_delay_np(&tm);*/
+
+                ret=doit(ctx);
+                if (ret != 0)
+                        {
+                        fprintf(stdout,"error[%d] %lu - %d\n",
+                                i,CRYPTO_thread_id(),ret);
+                        return(ret);
+                        }
+                }
+        fprintf(stdout,"DONE %lu\n",CRYPTO_thread_id());
+        if (reconnect)
+                {
+                SSL_free((SSL *)ctx[2]);
+                SSL_free((SSL *)ctx[3]);
+                }
+        return(0);
+        }
+
+int doit(ctx)
+char *ctx[4];
+        {
+        SSL_CTX *s_ctx,*c_ctx;
+        static char cbuf[200],sbuf[200];
+        SSL *c_ssl=NULL;
+        SSL *s_ssl=NULL;
+        BIO *c_to_s=NULL;
+        BIO *s_to_c=NULL;
+        BIO *c_bio=NULL;
+        BIO *s_bio=NULL;
+        int c_r,c_w,s_r,s_w;
+        int c_want,s_want;
+        int i;
+        int done=0;
+        int c_write,s_write;
+        int do_server=0,do_client=0;
+
+        s_ctx=(SSL_CTX *)ctx[0];
+        c_ctx=(SSL_CTX *)ctx[1];
+
+        if (ctx[2] != NULL)
+                s_ssl=(SSL *)ctx[2];
+        else
+                s_ssl=SSL_new(s_ctx);
+
+        if (ctx[3] != NULL)
+                c_ssl=(SSL *)ctx[3];
+        else
+                c_ssl=SSL_new(c_ctx);
+
+        if ((s_ssl == NULL) || (c_ssl == NULL)) goto err;
+
+        c_to_s=BIO_new(BIO_s_mem());
+        s_to_c=BIO_new(BIO_s_mem());
+        if ((s_to_c == NULL) || (c_to_s == NULL)) goto err;
+
+        c_bio=BIO_new(BIO_f_ssl());
+        s_bio=BIO_new(BIO_f_ssl());
+        if ((c_bio == NULL) || (s_bio == NULL)) goto err;
+
+        SSL_set_connect_state(c_ssl);
+        SSL_set_bio(c_ssl,s_to_c,c_to_s);
+        BIO_set_ssl(c_bio,c_ssl,(ctx[2] == NULL)?BIO_CLOSE:BIO_NOCLOSE);
+
+        SSL_set_accept_state(s_ssl);
+        SSL_set_bio(s_ssl,c_to_s,s_to_c);
+        BIO_set_ssl(s_bio,s_ssl,(ctx[3] == NULL)?BIO_CLOSE:BIO_NOCLOSE);
+
+        c_r=0; s_r=1;
+        c_w=1; s_w=0;
+        c_want=W_WRITE;
+        s_want=0;
+        c_write=1,s_write=0;
+
+        /* We can always do writes */
+        for (;;)
+                {
+                do_server=0;
+                do_client=0;
+
+                i=(int)BIO_pending(s_bio);
+                if ((i && s_r) || s_w) do_server=1;
+
+                i=(int)BIO_pending(c_bio);
+                if ((i && c_r) || c_w) do_client=1;
+
+                if (do_server && verbose)
+                        {
+                        if (SSL_in_init(s_ssl))
+                                printf("server waiting in SSL_accept - %s\n",
+                                        SSL_state_string_long(s_ssl));
+                        else if (s_write)
+                                printf("server:SSL_write()\n");
+                        else 
+                                printf("server:SSL_read()\n");
+                        }
+
+                if (do_client && verbose)
+                        {
+                        if (SSL_in_init(c_ssl))
+                                printf("client waiting in SSL_connect - %s\n",
+                                        SSL_state_string_long(c_ssl));
+                        else if (c_write)
+                                printf("client:SSL_write()\n");
+                        else
+                                printf("client:SSL_read()\n");
+                        }
+
+                if (!do_client && !do_server)
+                        {
+                        fprintf(stdout,"ERROR IN STARTUP\n");
+                        break;
+                        }
+                if (do_client && !(done & C_DONE))
+                        {
+                        if (c_write)
+                                {
+                                i=BIO_write(c_bio,"hello from client\n",18);
+                                if (i < 0)
+                                        {
+                                        c_r=0;
+                                        c_w=0;
+                                        if (BIO_should_retry(c_bio))
+                                                {
+                                                if (BIO_should_read(c_bio))
+                                                        c_r=1;
+                                                if (BIO_should_write(c_bio))
+                                                        c_w=1;
+                                                }
+                                        else
+                                                {
+                                                fprintf(stderr,"ERROR in CLIENT\n");
+                                                return(1);
+                                                }
+                                        }
+                                else if (i == 0)
+                                        {
+                                        fprintf(stderr,"SSL CLIENT STARTUP FAILED\n");
+                                        return(1);
+                                        }
+                                else
+                                        {
+                                        /* ok */
+                                        c_write=0;
+                                        }
+                                }
+                        else
+                                {
+                                i=BIO_read(c_bio,cbuf,100);
+                                if (i < 0)
+                                        {
+                                        c_r=0;
+                                        c_w=0;
+                                        if (BIO_should_retry(c_bio))
+                                                {
+                                                if (BIO_should_read(c_bio))
+                                                        c_r=1;
+                                                if (BIO_should_write(c_bio))
+                                                        c_w=1;
+                                                }
+                                        else
+                                                {
+                                                fprintf(stderr,"ERROR in CLIENT\n");
+                                                return(1);
+                                                }
+                                        }
+                                else if (i == 0)
+                                        {
+                                        fprintf(stderr,"SSL CLIENT STARTUP FAILED\n");
+                                        return(1);
+                                        }
+                                else
+                                        {
+                                        done|=C_DONE;
+#ifdef undef
+                                        fprintf(stdout,"CLIENT:from server:");
+                                        fwrite(cbuf,1,i,stdout);
+                                        fflush(stdout);
+#endif
+                                        }
+                                }
+                        }
+
+                if (do_server && !(done & S_DONE))
+                        {
+                        if (!s_write)
+                                {
+                                i=BIO_read(s_bio,sbuf,100);
+                                if (i < 0)
+                                        {
+                                        s_r=0;
+                                        s_w=0;
+                                        if (BIO_should_retry(s_bio))
+                                                {
+                                                if (BIO_should_read(s_bio))
+                                                        s_r=1;
+                                                if (BIO_should_write(s_bio))
+                                                        s_w=1;
+                                                }
+                                        else
+                                                {
+                                                fprintf(stderr,"ERROR in SERVER\n");
+                                                ERR_print_errors_fp(stderr);
+                                                return(1);
+                                                }
+                                        }
+                                else if (i == 0)
+                                        {
+                                        fprintf(stderr,"SSL SERVER STARTUP FAILED\n");
+                                        return(1);
+                                        }
+                                else
+                                        {
+                                        s_write=1;
+                                        s_w=1;
+#ifdef undef
+                                        fprintf(stdout,"SERVER:from client:");
+                                        fwrite(sbuf,1,i,stdout);
+                                        fflush(stdout);
+#endif
+                                        }
+                                }
+                        else
+                                {
+                                i=BIO_write(s_bio,"hello from server\n",18);
+                                if (i < 0)
+                                        {
+                                        s_r=0;
+                                        s_w=0;
+                                        if (BIO_should_retry(s_bio))
+                                                {
+                                                if (BIO_should_read(s_bio))
+                                                        s_r=1;
+                                                if (BIO_should_write(s_bio))
+                                                        s_w=1;
+                                                }
+                                        else
+                                                {
+                                                fprintf(stderr,"ERROR in SERVER\n");
+                                                ERR_print_errors_fp(stderr);
+                                                return(1);
+                                                }
+                                        }
+                                else if (i == 0)
+                                        {
+                                        fprintf(stderr,"SSL SERVER STARTUP FAILED\n");
+                                        return(1);
+                                        }
+                                else
+                                        {
+                                        s_write=0;
+                                        s_r=1;
+                                        done|=S_DONE;
+                                        }
+                                }
+                        }
+
+                if ((done & S_DONE) && (done & C_DONE)) break;
+                }
+
+        SSL_set_shutdown(c_ssl,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+        SSL_set_shutdown(s_ssl,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+
+#ifdef undef
+        fprintf(stdout,"DONE\n");
+#endif
+err:
+        /* We have to set the BIO's to NULL otherwise they will be
+         * free()ed twice.  Once when th s_ssl is SSL_free()ed and
+         * again when c_ssl is SSL_free()ed.
+         * This is a hack required because s_ssl and c_ssl are sharing the same
+         * BIO structure and SSL_set_bio() and SSL_free() automatically
+         * BIO_free non NULL entries.
+         * You should not normally do this or be required to do this */
+
+        if (s_ssl != NULL)
+                {
+                s_ssl->rbio=NULL;
+                s_ssl->wbio=NULL;
+                }
+        if (c_ssl != NULL)
+                {
+                c_ssl->rbio=NULL;
+                c_ssl->wbio=NULL;
+                }
+
+        /* The SSL's are optionally freed in the following calls */
+        if (c_to_s != NULL) BIO_free(c_to_s);
+        if (s_to_c != NULL) BIO_free(s_to_c);
+
+        if (c_bio != NULL) BIO_free(c_bio);
+        if (s_bio != NULL) BIO_free(s_bio);
+        return(0);
+        }
+
+int MS_CALLBACK verify_callback(ok, xs, xi, depth, error, arg)
+int ok;
+X509 *xs;
+X509 *xi;
+int depth;
+int error;
+char *arg;
+        {
+        char buf[256];
+
+        if (verbose)
+                {
+                X509_NAME_oneline(X509_get_subject_name(xs),buf,256);
+                if (ok)
+                        fprintf(stderr,"depth=%d %s\n",depth,buf);
+                else
+                        fprintf(stderr,"depth=%d error=%d %s\n",depth,error,buf);
+                }
+        return(ok);
+        }
+
+#define THREAD_STACK_SIZE (16*1024)
+
+#ifdef WIN32
+
+static PRLOCK lock_cs[CRYPTO_NUM_LOCKS];
+
+void thread_setup()
+        {
+        int i;
+
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                lock_cs[i]=CreateMutex(NULL,FALSE,NULL);
+                }
+
+        CRYPTO_set_locking_callback((void (*)(int,int,char *,int))win32_locking_callback);
+        /* id callback defined */
+        }
+
+void thread_cleanup()
+        {
+        int i;
+
+        CRYPTO_set_locking_callback(NULL);
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                CloseHandle(lock_cs[i]);
+        }
+
+void win32_locking_callback(mode,type,file,line)
+int mode;
+int type;
+char *file;
+int line;
+        {
+        if (mode & CRYPTO_LOCK)
+                {
+                WaitForSingleObject(lock_cs[type],INFINITE);
+                }
+        else
+                {
+                ReleaseMutex(lock_cs[type]);
+                }
+        }
+
+void do_threads(s_ctx,c_ctx)
+SSL_CTX *s_ctx,*c_ctx;
+        {
+        double ret;
+        SSL_CTX *ssl_ctx[2];
+        DWORD thread_id[MAX_THREAD_NUMBER];
+        HANDLE thread_handle[MAX_THREAD_NUMBER];
+        int i;
+        SYSTEMTIME start,end;
+
+        ssl_ctx[0]=s_ctx;
+        ssl_ctx[1]=c_ctx;
+
+        GetSystemTime(&start);
+        for (i=0; i<thread_number; i++)
+                {
+                thread_handle[i]=CreateThread(NULL,
+                        THREAD_STACK_SIZE,
+                        (LPTHREAD_START_ROUTINE)ndoit,
+                        (void *)ssl_ctx,
+                        0L,
+                        &(thread_id[i]));
+                }
+
+        printf("reaping\n");
+        for (i=0; i<thread_number; i+=50)
+                {
+                int j;
+
+                j=(thread_number < (i+50))?(thread_number-i):50;
+
+                if (WaitForMultipleObjects(j,
+                        (CONST HANDLE *)&(thread_handle[i]),TRUE,INFINITE)
+                        == WAIT_FAILED)
+                        {
+                        fprintf(stderr,"WaitForMultipleObjects failed:%d\n",GetLastError());
+                        exit(1);
+                        }
+                }
+        GetSystemTime(&end);
+
+        if (start.wDayOfWeek > end.wDayOfWeek) end.wDayOfWeek+=7;
+        ret=(end.wDayOfWeek-start.wDayOfWeek)*24;
+
+        ret=(ret+end.wHour-start.wHour)*60;
+        ret=(ret+end.wMinute-start.wMinute)*60;
+        ret=(ret+end.wSecond-start.wSecond);
+        ret+=(end.wMilliseconds-start.wMilliseconds)/1000.0;
+
+        printf("win32 threads done - %.3f seconds\n",ret);
+        }
+
+#endif /* WIN32 */
+
+#ifdef SOLARIS
+
+static mutex_t lock_cs[CRYPTO_NUM_LOCKS];
+/*static rwlock_t lock_cs[CRYPTO_NUM_LOCKS]; */
+static long lock_count[CRYPTO_NUM_LOCKS];
+
+void thread_setup()
+        {
+        int i;
+
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                lock_count[i]=0;
+                /* rwlock_init(&(lock_cs[i]),USYNC_THREAD,NULL); */
+                mutex_init(&(lock_cs[i]),USYNC_THREAD,NULL);
+                }
+
+        CRYPTO_set_id_callback((unsigned long (*)())solaris_thread_id);
+        CRYPTO_set_locking_callback((void (*)())solaris_locking_callback);
+        }
+
+void thread_cleanup()
+        {
+        int i;
+
+        CRYPTO_set_locking_callback(NULL);
+fprintf(stderr,"cleanup\n");
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                /* rwlock_destroy(&(lock_cs[i])); */
+                mutex_destroy(&(lock_cs[i]));
+                fprintf(stderr,"%8ld:%s\n",lock_count[i],CRYPTO_get_lock_name(i));
+                }
+fprintf(stderr,"done cleanup\n");
+        }
+
+void solaris_locking_callback(mode,type,file,line)
+int mode;
+int type;
+char *file;
+int line;
+        {
+#ifdef undef
+fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
+        CRYPTO_thread_id(),
+        (mode&CRYPTO_LOCK)?"l":"u",
+        (type&CRYPTO_READ)?"r":"w",file,line);
+#endif
+
+/*
+if (CRYPTO_LOCK_SSL_CERT == type)
+        fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
+                CRYPTO_thread_id(),
+                mode,file,line);
+*/
+        if (mode & CRYPTO_LOCK)
+                {
+        /*      if (mode & CRYPTO_READ)
+                        rw_rdlock(&(lock_cs[type]));
+                else
+                        rw_wrlock(&(lock_cs[type])); */
+
+                mutex_lock(&(lock_cs[type]));
+                lock_count[type]++;
+                }
+        else
+                {
+/*              rw_unlock(&(lock_cs[type]));  */
+                mutex_unlock(&(lock_cs[type]));
+                }
+        }
+
+void do_threads(s_ctx,c_ctx)
+SSL_CTX *s_ctx,*c_ctx;
+        {
+        SSL_CTX *ssl_ctx[2];
+        thread_t thread_ctx[MAX_THREAD_NUMBER];
+        int i;
+
+        ssl_ctx[0]=s_ctx;
+        ssl_ctx[1]=c_ctx;
+
+        thr_setconcurrency(thread_number);
+        for (i=0; i<thread_number; i++)
+                {
+                thr_create(NULL, THREAD_STACK_SIZE,
+                        (void *(*)())ndoit,
+                        (void *)ssl_ctx,
+                        0L,
+                        &(thread_ctx[i]));
+                }
+
+        printf("reaping\n");
+        for (i=0; i<thread_number; i++)
+                {
+                thr_join(thread_ctx[i],NULL,NULL);
+                }
+
+        printf("solaris threads done (%d,%d)\n",
+                s_ctx->references,c_ctx->references);
+        }
+
+unsigned long solaris_thread_id()
+        {
+        unsigned long ret;
+
+        ret=(unsigned long)thr_self();
+        return(ret);
+        }
+#endif /* SOLARIS */
+
+#ifdef IRIX
+
+
+static usptr_t *arena;
+static usema_t *lock_cs[CRYPTO_NUM_LOCKS];
+
+void thread_setup()
+        {
+        int i;
+        char filename[20];
+
+        strcpy(filename,"/tmp/mttest.XXXXXX");
+        mktemp(filename);
+
+        usconfig(CONF_STHREADIOOFF);
+        usconfig(CONF_STHREADMALLOCOFF);
+        usconfig(CONF_INITUSERS,100);
+        usconfig(CONF_LOCKTYPE,US_DEBUGPLUS);
+        arena=usinit(filename);
+        unlink(filename);
+
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                lock_cs[i]=usnewsema(arena,1);
+                }
+
+        CRYPTO_set_id_callback((unsigned long (*)())irix_thread_id);
+        CRYPTO_set_locking_callback((void (*)())irix_locking_callback);
+        }
+
+void thread_cleanup()
+        {
+        int i;
+
+        CRYPTO_set_locking_callback(NULL);
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                char buf[10];
+
+                sprintf(buf,"%2d:",i);
+                usdumpsema(lock_cs[i],stdout,buf);
+                usfreesema(lock_cs[i],arena);
+                }
+        }
+
+void irix_locking_callback(mode,type,file,line)
+int mode;
+int type;
+char *file;
+int line;
+        {
+        if (mode & CRYPTO_LOCK)
+                {
+                printf("lock %d\n",type);
+                uspsema(lock_cs[type]);
+                }
+        else
+                {
+                printf("unlock %d\n",type);
+                usvsema(lock_cs[type]);
+                }
+        }
+
+void do_threads(s_ctx,c_ctx)
+SSL_CTX *s_ctx,*c_ctx;
+        {
+        SSL_CTX *ssl_ctx[2];
+        int thread_ctx[MAX_THREAD_NUMBER];
+        int i;
+
+        ssl_ctx[0]=s_ctx;
+        ssl_ctx[1]=c_ctx;
+
+        for (i=0; i<thread_number; i++)
+                {
+                thread_ctx[i]=sproc((void (*)())ndoit,
+                        PR_SADDR|PR_SFDS,(void *)ssl_ctx);
+                }
+
+        printf("reaping\n");
+        for (i=0; i<thread_number; i++)
+                {
+                wait(NULL);
+                }
+
+        printf("irix threads done (%d,%d)\n",
+                s_ctx->references,c_ctx->references);
+        }
+
+unsigned long irix_thread_id()
+        {
+        unsigned long ret;
+
+        ret=(unsigned long)getpid();
+        return(ret);
+        }
+#endif /* IRIX */
+
+#ifdef PTHREADS
+
+static pthread_mutex_t lock_cs[CRYPTO_NUM_LOCKS];
+static long lock_count[CRYPTO_NUM_LOCKS];
+
+void thread_setup()
+        {
+        int i;
+
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                lock_count[i]=0;
+                pthread_mutex_init(&(lock_cs[i]),NULL);
+                }
+
+        CRYPTO_set_id_callback((unsigned long (*)())pthreads_thread_id);
+        CRYPTO_set_locking_callback((void (*)())pthreads_locking_callback);
+        }
+
+void thread_cleanup()
+        {
+        int i;
+
+        CRYPTO_set_locking_callback(NULL);
+        fprintf(stderr,"cleanup\n");
+        for (i=0; i<CRYPTO_NUM_LOCKS; i++)
+                {
+                pthread_mutex_destroy(&(lock_cs[i]));
+                fprintf(stderr,"%8ld:%s\n",lock_count[i],
+                        CRYPTO_get_lock_name(i));
+                }
+        fprintf(stderr,"done cleanup\n");
+        }
+
+void pthreads_locking_callback(mode,type,file,line)
+int mode;
+int type;
+char *file;
+int line;
+      {
+#ifdef undef
+        fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
+                CRYPTO_thread_id(),
+                (mode&CRYPTO_LOCK)?"l":"u",
+                (type&CRYPTO_READ)?"r":"w",file,line);
+#endif
+/*
+        if (CRYPTO_LOCK_SSL_CERT == type)
+                fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
+                CRYPTO_thread_id(),
+                mode,file,line);
+*/
+        if (mode & CRYPTO_LOCK)
+                {
+                pthread_mutex_lock(&(lock_cs[type]));
+                lock_count[type]++;
+                }
+        else
+                {
+                pthread_mutex_unlock(&(lock_cs[type]));
+                }
+        }
+
+void do_threads(s_ctx,c_ctx)
+SSL_CTX *s_ctx,*c_ctx;
+        {
+        SSL_CTX *ssl_ctx[2];
+        pthread_t thread_ctx[MAX_THREAD_NUMBER];
+        int i;
+
+        ssl_ctx[0]=s_ctx;
+        ssl_ctx[1]=c_ctx;
+
+        /*
+        thr_setconcurrency(thread_number);
+        */
+        for (i=0; i<thread_number; i++)
+                {
+                pthread_create(&(thread_ctx[i]), NULL,
+                        (void *(*)())ndoit, (void *)ssl_ctx);
+                }
+
+        printf("reaping\n");
+        for (i=0; i<thread_number; i++)
+                {
+                pthread_join(thread_ctx[i],NULL);
+                }
+
+        printf("pthreads threads done (%d,%d)\n",
+        s_ctx->references,c_ctx->references);
+        }
+
+unsigned long pthreads_thread_id()
+        {
+        unsigned long ret;
+
+        ret=(unsigned long)pthread_self();
+        return(ret);
+        }
+
+#endif /* PTHREADS */
+
+
+
diff --git a/src/lib/libssl/src/mt/profile.sh b/src/lib/libssl/src/mt/profile.sh
new file mode 100644
index 0000000000..de5eb06708
--- /dev/null
+++ b/src/lib/libssl/src/mt/profile.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+/bin/rm -f mttest
+cc -p -DSOLARIS -I../include -g mttest.c -o mttest -L/usr/lib/libc -ldl -L.. -lthread  -lssl -lcrypto -lnsl -lsocket
+
diff --git a/src/lib/libssl/src/mt/ptest.bat b/src/lib/libssl/src/mt/ptest.bat
new file mode 100644
index 0000000000..ccaccae09d
--- /dev/null
+++ b/src/lib/libssl/src/mt/ptest.bat
@@ -0,0 +1,4 @@
+del mttest.exe
+
+purify cl /O2 -DWIN32 /MD -I..\out mttest.c /Femttest ..\out\ssl32.lib ..\out\crypt32.lib
+
diff --git a/src/lib/libssl/src/mt/pthread.sh b/src/lib/libssl/src/mt/pthread.sh
new file mode 100644
index 0000000000..7d0b6e55f5
--- /dev/null
+++ b/src/lib/libssl/src/mt/pthread.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# build using pthreads
+#
+# http://www.mit.edu:8001/people/proven/pthreads.html
+#
+/bin/rm -f mttest
+pgcc -DPTHREADS -I../include -g mttest.c -o mttest -L.. -lssl -lcrypto 
+
diff --git a/src/lib/libssl/src/mt/purify.sh b/src/lib/libssl/src/mt/purify.sh
new file mode 100644
index 0000000000..57c4017073
--- /dev/null
+++ b/src/lib/libssl/src/mt/purify.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+/bin/rm -f mttest
+purify cc -DSOLARIS -I../include -g mttest.c -o mttest -L.. -lthread  -lssl -lcrypto -lnsl -lsocket
+
diff --git a/src/lib/libssl/src/mt/solaris.sh b/src/lib/libssl/src/mt/solaris.sh
new file mode 100644
index 0000000000..f6a90b17ee
--- /dev/null
+++ b/src/lib/libssl/src/mt/solaris.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+/bin/rm -f mttest
+cc -DSOLARIS -I../include -g mttest.c -o mttest -L.. -lthread  -lssl -lcrypto -lnsl -lsocket
+
diff --git a/src/lib/libssl/src/mt/win32.bat b/src/lib/libssl/src/mt/win32.bat
new file mode 100644
index 0000000000..56089f69be
--- /dev/null
+++ b/src/lib/libssl/src/mt/win32.bat
@@ -0,0 +1,4 @@
+del mttest.exe
+
+cl /O2 -DWIN32 /MD -I..\out mttest.c /Femttest ..\out\ssleay32.lib ..\out\libeay32.lib
+
diff --git a/src/lib/libssl/src/perl/MANIFEST b/src/lib/libssl/src/perl/MANIFEST
new file mode 100644
index 0000000000..992db5ed4c
--- /dev/null
+++ b/src/lib/libssl/src/perl/MANIFEST
@@ -0,0 +1,17 @@
+MANIFEST
+Makefile.PL
+SSLeay.pm
+bio.xs
+bn.xs
+cipher.xs
+digest.xs
+err.xs
+ssl.xs
+x509.xs
+test.pl
+test2.pl
+test3.pl
+test9.pl
+testbn.pl
+testmd.pl
+typemap
diff --git a/src/lib/libssl/src/perl/Makefile.PL b/src/lib/libssl/src/perl/Makefile.PL
new file mode 100644
index 0000000000..f9998e0a61
--- /dev/null
+++ b/src/lib/libssl/src/perl/Makefile.PL
@@ -0,0 +1,25 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+        'OPTIMIZE'      => '-g',
+        'DISTNAME'      => 'SSLeay-perl5-0.8.5',
+        'NAME'          => 'SSLeay',
+        'VERSION_FROM'  => 'SSLeay.pm',
+        'LIBS'          => ['-L.. -lssl -lcrypto'],
+        'DEFINE'        => '',
+        'INC'           => '-I../include',
+        'C'             => ['callback.c'],
+        'H'             => ['p5SSLeay.h'],
+        'OBJECT'        => "    SSLeay.o bio.o bn.o cipher.o digest.o err.o 
+                                ssl.o x509.o",
+        'XS'            => {    'SSLeay.xs'     =>      'SSLeay.c',
+                                'bio.xs'        =>      'bio.c',
+                                'bn.xs'         =>      'bn.c',
+                                'cipher.xs'     =>      'cipher.c',
+                                'digest.xs'     =>      'digest.c',
+                                'err.xs'        =>      'err.c',
+                                'ssl.xs'        =>      'ssl.c',
+                                'x509.xs'       =>      'x509.c',
+                                }
+        );
diff --git a/src/lib/libssl/src/perl/SSLeay.pm b/src/lib/libssl/src/perl/SSLeay.pm
new file mode 100644
index 0000000000..f7710039d2
--- /dev/null
+++ b/src/lib/libssl/src/perl/SSLeay.pm
@@ -0,0 +1,78 @@
+package SSLeay;
+
+use Exporter;
+use DynaLoader;
+
+@ISA = qw(Exporter DynaLoader);
+@EXPORT = qw();
+
+$VERSION='0.82';
+$VERSION='0.82';
+bootstrap SSLeay;
+
+@SSLeay::BN::ISA=       qw(SSLeay::ERR);
+@SSLeay::MD::ISA=       qw(SSLeay::ERR);
+@SSLeay::Cipher::ISA=   qw(SSLeay::ERR);
+@SSLeay::SSL::CTX::ISA= qw(SSLeay::ERR);
+@SSLeay::BIO::ISA=      qw(SSLeay::ERR);
+@SSLeay::SSL::ISA=      qw(SSLeay::ERR);
+
+@BN::ISA=       qw(SSLeay::BN);
+@MD::ISA=       qw(SSLeay::MD);
+@Cipher::ISA=   qw(SSLeay::Cipher);
+@SSL::ISA=      qw(SSLeay::SSL);
+@SSL::CTX::ISA= qw(SSLeay::SSL::CTX);
+@BIO::ISA=      qw(SSLeay::BIO);
+
+
+@SSLeay::MD::names=qw(md2 md5 sha sha1 ripemd160 mdc2);
+
+@SSLeay::Cipher::names=qw(
+        des-ecb des-cfb des-ofb des-cbc
+        des-ede des-ede-cfb des-ede-ofb des-ede-cbc
+        des-ede3 des-ede3-cfb des-ede3-ofb des-ede3-cbc
+        desx-cbc rc4 rc4-40
+        idea-ecb idea-cfb idea-ofb idea-cbc
+        rc2-ecb rc2-cbc rc2-40-cbc rc2-cfb rc2-ofb
+        bf-ecb bf-cfb bf-ofb bf-cbc
+        cast5-ecb cast5-cfb cast5-ofb cast5-cbc
+        rc5-ecb rc5-cfb rc5-ofb rc5-cbc
+        );
+
+sub SSLeay::SSL::CTX::new_ssl { SSLeay::SSL::new($_[0]); }
+
+sub SSLeay::ERR::error
+        {
+        my($o)=@_;
+        my($s,$ret);
+
+        while (($s=$o->get_error()) != 0)
+                {
+                $ret.=$s."\n";
+                }
+        return($ret);
+        }
+
+@SSLeay::Cipher::aliases=qw(des desx des3 idea rc2 bf cast);
+
+package SSLeay::BN;
+
+sub bnfix { (ref($_[0]) ne "SSLeay::BN")?SSLeay::BN::dec2bn($_[0]):$_[0]; }
+use overload
+"="  => sub { dup($_[0]); },
+"+"  => sub { add($_[0],$_[1]); },
+"-"  => sub {   ($_[1],$_[0])=($_[0],$_[1]) if $_[2];
+                SSLeay::BN::sub($_[0],$_[1]); },
+"*"  => sub { mul($_[0],$_[1]); },
+"/"  => sub {  ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; (div($_[0],$_[1]))[0]; },
+"%"  => sub {  ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; mod($_[0],$_[1]); },
+"**" => sub { ($_[1],$_[0])=($_[0],$_[1]) if $_[2]; exp($_[0],$_[1]); },
+"<<" => sub { lshift($_[0],$_[1]); },
+">>" => sub { rshift($_[0],$_[1]); },
+"<=>" => sub { SSLeay::BN::cmp($_[0],$_[1]); },
+'""' => sub { bn2dec($_[0]); },
+'0+' => sub { dec2bn($_[0]); },
+"bool" => sub { ref($_[0]) eq "SSLeay::BN"; };
+
+sub SSLeay::BIO::do_accept { SSLeay::BIO::do_handshake(@_); }
+1;
diff --git a/src/lib/libssl/src/perl/SSLeay.xs b/src/lib/libssl/src/perl/SSLeay.xs
new file mode 100644
index 0000000000..582b5705aa
--- /dev/null
+++ b/src/lib/libssl/src/perl/SSLeay.xs
@@ -0,0 +1,63 @@
+#include "p5SSLeay.h"
+
+SV *new_ref(type,obj,mort)
+char *type;
+char *obj;
+        {
+        SV *ret;
+
+        if (mort)
+                ret=sv_newmortal();
+        else
+                ret=newSViv(0);
+        sv_setref_pv(ret,type,(void *)obj);
+        return(ret);
+        }
+
+int ex_new(obj,data,ad,idx,argl,argp)
+char *obj;
+SV *data;
+CRYPTO_EX_DATA *ad;
+int idx;
+long argl;
+char *argp;
+        {
+        SV *sv;
+
+fprintf(stderr,"ex_new %08X %s\n",obj,argp);
+        sv=sv_newmortal();
+        sv_setref_pv(sv,argp,(void *)obj);
+        CRYPTO_set_ex_data(ad,idx,(char *)sv);
+        return(1);
+        }
+
+void ex_cleanup(obj,data,ad,idx,argl,argp)
+char *obj;
+SV *data;
+CRYPTO_EX_DATA *ad;
+int idx;
+long argl;
+char *argp;
+        {
+        pr_name("ex_cleanup");
+fprintf(stderr,"ex_cleanup %08X %s\n",obj,argp);
+        if (data != NULL)
+                SvREFCNT_dec((SV *)data);
+        }
+
+MODULE =  SSLeay        PACKAGE = SSLeay
+
+BOOT:
+        boot_bio();
+        boot_cipher();
+        boot_digest();
+        boot_err();
+        boot_ssl();
+        boot_SSLeay__BN();
+        boot_SSLeay__BIO();
+        boot_SSLeay__Cipher();
+        boot_SSLeay__MD();
+        boot_SSLeay__ERR();
+        boot_SSLeay__SSL();
+        boot_SSLeay__X509();
+
diff --git a/src/lib/libssl/src/perl/b.pl b/src/lib/libssl/src/perl/b.pl
new file mode 100644
index 0000000000..e8b3fd0dd9
--- /dev/null
+++ b/src/lib/libssl/src/perl/b.pl
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$cmd=<<"EOF";
+
+EOF
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+print "X\n";
+$bio=BIO->new("connect");
+print "XX\n";
+$bio->set_callback(sub {print STDERR $_[0]->number_read."\n"; $_[$#_] });
+print "XXX\n";
+$bio->hostname($conn) || die $ssl->error();
+print "XXXX\n";
+
+#$ssl=BIO->new("ssl");
diff --git a/src/lib/libssl/src/perl/bio.pl b/src/lib/libssl/src/perl/bio.pl
new file mode 100644
index 0000000000..653322c2cc
--- /dev/null
+++ b/src/lib/libssl/src/perl/bio.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$cmd=<<"EOF";
+
+EOF
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+$bio=SSLeay::BIO::new("connect");
+$bio->set_callback(sub {print STDERR $_[0]->number_read."\n"; $_[$#_] });
+$bio->hostname($conn) || die $ssl->error();
+
+
+(($ret=$bio->do_handshake()) > 0) || die $bio->error();
+
+(($ret=$bio->syswrite($cmd)) > 0) || die $bio->error();
+
+while (1)
+        {
+        $ret=$bio->sysread($buf,10240);
+        last if ($ret <= 0);
+        print $buf;
+        }
+
diff --git a/src/lib/libssl/src/perl/bio.txt b/src/lib/libssl/src/perl/bio.txt
new file mode 100644
index 0000000000..5b46c9f5ee
--- /dev/null
+++ b/src/lib/libssl/src/perl/bio.txt
@@ -0,0 +1,36 @@
+BIO::new(type)
+        "connect"
+        "accept"
+        "ssl"
+        "buffer"
+
+"connect"
+        BIO::hostname(name)     host:port to connect to
+
+"accept"
+        BIO::set_accept_port(port)      port to connect too.
+
+"connect", "accept", "ssl"
+        BIO::do_andshake        do protocol
+
+"ssl"
+        BIO::set_ssl(ssl)
+        BIO::get_ssl()
+
+BIO::push(bio)
+BIO::pop;                       return BIO
+BIO::number_read()
+BIO::number_written()
+BIO::references()
+
+BIO::sysread(buf,len[,offset])
+BIO::syswrite(in[,len][,offset])
+BIO::getline()
+BIO::puts(in)
+BIO::flush()
+BIO::type()
+BIO::next_bio();
+BIO::set_callback(callback[, args])
+
+BIO::new_buffer_ssl_connect(SSL_CTX)
+BIO::new_ssl_connect(SSL_CTX)
diff --git a/src/lib/libssl/src/perl/bio.xs b/src/lib/libssl/src/perl/bio.xs
new file mode 100644
index 0000000000..3782d42062
--- /dev/null
+++ b/src/lib/libssl/src/perl/bio.xs
@@ -0,0 +1,448 @@
+#include "p5SSLeay.h"
+
+static int p5_bio_ex_bio_ptr=0;
+static int p5_bio_ex_bio_callback=0;
+static int p5_bio_ex_bio_callback_data=0;
+
+static long p5_bio_callback(bio,state,parg,cmd,larg,ret)
+BIO *bio;
+int state;
+char *parg;
+int cmd;
+long larg;
+int ret;
+        {
+        int i;
+        SV *me,*cb;
+
+        me=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
+        cb=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_callback);
+        if (cb != NULL)
+                {
+                dSP;
+
+                ENTER ;
+                SAVETMPS;
+
+                PUSHMARK(sp);
+                XPUSHs(me);
+                XPUSHs(sv_2mortal(newSViv(state)));
+                XPUSHs(sv_2mortal(newSViv(cmd)));
+                if ((state == BIO_CB_READ) || (state == BIO_CB_WRITE))
+                        {
+                        XPUSHs(sv_2mortal(newSVpv(parg,larg)));
+                        }
+                else
+                        XPUSHs(&sv_undef);
+                /* ptr one */
+                XPUSHs(sv_2mortal(newSViv(larg)));
+                XPUSHs(sv_2mortal(newSViv(ret)));
+                PUTBACK;
+
+                i=perl_call_sv(cb,G_SCALAR);
+
+                SPAGAIN;
+                if (i == 1)
+                        ret=POPi;
+                else
+                        ret=1;
+                PUTBACK;
+                FREETMPS;
+                LEAVE;
+                }
+        else
+                {
+                croak("Internal error in SSL p5_ssl_info_callback");
+                }
+        return(ret);
+        }
+
+int boot_bio()
+        {
+        p5_bio_ex_bio_ptr=
+                BIO_get_ex_new_index(0,"SSLeay::BIO",ex_new,NULL,ex_cleanup);
+        p5_bio_ex_bio_callback= 
+                BIO_get_ex_new_index(0,"bio_callback",NULL,NULL,
+                        ex_cleanup);
+        p5_bio_ex_bio_callback_data=
+                BIO_get_ex_new_index(0,"bio_callback_data",NULL,NULL,
+                        ex_cleanup);
+        return(1);
+        }
+
+MODULE =  SSLeay::BIO   PACKAGE = SSLeay::BIO PREFIX = p5_BIO_
+
+VERSIONCHECK: DISABLE
+
+void
+p5_BIO_new_buffer_ssl_connect(...)
+        PREINIT:
+                SSL_CTX *ctx;
+                BIO *bio;
+                SV *arg;
+        PPCODE:
+                if (items == 1)
+                        arg=ST(0);
+                else if (items == 2)
+                        arg=ST(1);
+                else
+                        arg=NULL;
+
+                if ((arg == NULL) || !(sv_derived_from(arg,"SSLeay::SSL::CTX")))
+                        croak("Usage: SSLeay::BIO::new_buffer_ssl_connect(SSL_CTX)");
+                else
+                        {
+                        IV tmp=SvIV((SV *)SvRV(arg));
+                        ctx=(SSL_CTX *)tmp;
+                        }
+                EXTEND(sp,1);
+                bio=BIO_new_buffer_ssl_connect(ctx);
+                arg=new_ref("SSLeay::BIO",(char *)bio,0);
+                PUSHs(arg);
+                BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+
+void
+p5_BIO_new_ssl_connect(...)
+        PREINIT:
+                SSL_CTX *ctx;
+                BIO *bio;
+                SV *arg;
+        PPCODE:
+                if (items == 1)
+                        arg=ST(0);
+                else if (items == 2)
+                        arg=ST(1);
+                else
+                        arg=NULL;
+
+                if ((arg == NULL) || !(sv_derived_from(arg,"SSLeay::SSL::CTX")))
+                        croak("Usage: SSLeay::BIO::new_ssl_connect(SSL_CTX)");
+                else
+                        {
+                        IV tmp=SvIV((SV *)SvRV(arg));
+                        ctx=(SSL_CTX *)tmp;
+                        }
+                EXTEND(sp,1);
+                bio=BIO_new_ssl_connect(ctx);
+                arg=new_ref("SSLeay::BIO",(char *)bio,0);
+                PUSHs(arg);
+                BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+
+void
+p5_BIO_new(...)
+        PREINIT:
+                BIO *bio;
+                char *type;
+                SV *arg;
+        PPCODE:
+                pr_name("p5_BIO_new");
+                if ((items == 1) && SvPOK(ST(0)))
+                        type=SvPV(ST(0),na);
+                else if ((items == 2) && SvPOK(ST(1)))
+                        type=SvPV(ST(1),na);
+                else
+                        croak("Usage: SSLeay::BIO::new(type)");
+
+                EXTEND(sp,1);
+                if (strcmp(type,"connect") == 0)
+                        bio=BIO_new(BIO_s_connect());
+                else if (strcmp(type,"accept") == 0)
+                        bio=BIO_new(BIO_s_accept());
+                else if (strcmp(type,"ssl") == 0)
+                        bio=BIO_new(BIO_f_ssl());
+                else if (strcmp(type,"buffer") == 0)
+                        bio=BIO_new(BIO_f_buffer());
+                else
+                        croak("unknown BIO type");
+                arg=new_ref("SSLeay::BIO",(char *)bio,0);
+                PUSHs(arg);
+                BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+
+int
+p5_BIO_hostname(bio,name)
+        BIO *bio;
+        char *name;
+        CODE:
+                RETVAL=BIO_set_hostname(bio,name);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BIO_set_accept_port(bio,str)
+        BIO *bio;
+        char *str;
+        CODE:
+                RETVAL=BIO_set_accept_port(bio,str);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BIO_do_handshake(bio)
+        BIO *bio;
+        CODE:
+                RETVAL=BIO_do_handshake(bio);
+        OUTPUT:
+                RETVAL
+
+BIO *
+p5_BIO_push(b,bio)
+        BIO *b;
+        BIO *bio;
+        CODE:
+                /* This reference will be reduced when the reference is
+                 * let go, and then when the BIO_free_all() is called
+                 * inside the SSLeay library by the BIO with this
+                 * pushed into */
+                bio->references++;
+                RETVAL=BIO_push(b,bio);
+        OUTPUT:
+                RETVAL
+
+void
+p5_BIO_pop(b)
+        BIO *b
+        PREINIT:
+                BIO *bio;
+                char *type;
+                SV *arg;
+        PPCODE:
+                bio=BIO_pop(b);
+                if (bio != NULL)
+                        {
+                        /* This BIO will either be one created in the
+                         * perl library, in which case it will have a perl
+                         * SV, otherwise it will have been created internally,
+                         * inside SSLeay.  For the 'pushed in', it needs
+                         * the reference count decememted. */
+                        arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
+                        if (arg == NULL)
+                                {
+                                arg=new_ref("SSLeay::BIO",(char *)bio,0);
+                                PUSHs(arg);
+                                BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+                                }
+                        else
+                                {
+                                /* it was pushed in */
+                                SvREFCNT_inc(arg);
+                                PUSHs(arg);
+                                if (bio->references < 1)
+                                        abort();
+                                /* decrement the reference count */
+                                BIO_free(bio);
+                                }
+                        }
+
+int
+p5_BIO_sysread(bio,in,num, ...)
+        BIO *bio;
+        SV *in;
+        int num;
+        PREINIT:
+                int i,n,olen;
+                int offset;
+                char *p;
+        CODE:
+                offset=0;
+                if (!SvPOK(in))
+                        sv_setpvn(in,"",0);
+                SvPV(in,olen);
+                if (items > 3)
+                        {
+                        offset=SvIV(ST(3));
+                        if (offset < 0)
+                                {
+                                if (-offset > olen)
+                                        croad("Offset outside string");
+                                offset+=olen;
+                                }
+                        }
+                if ((num+offset) > olen)
+                        {
+                        SvGROW(in,num+offset+1);
+                        p=SvPV(in,i);
+                        memset(&(p[olen]),0,(num+offset)-olen+1);
+                        }
+                p=SvPV(in,n);
+
+                i=BIO_read(bio,p+offset,num);
+                RETVAL=i;
+                if (i <= 0) i=0;
+                SvCUR_set(in,offset+i);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BIO_syswrite(bio,in, ...)
+        BIO *bio;
+        SV *in;
+        PREINIT:
+                char *ptr;
+                int len,in_len;
+                int offset=0;
+                int n;
+        CODE:
+                ptr=SvPV(in,in_len);
+                if (items > 2)
+                        {
+                        len=SvOK(ST(2))?SvIV(ST(2)):in_len;
+                        if (items > 3)
+                                {
+                                offset=SvIV(ST(3));
+                                if (offset < 0)
+                                        {
+                                        if (-offset > in_len)
+                                                croak("Offset outside string");
+                                        offset+=in_len;
+                                        }
+                                else if ((offset >= in_len) && (in_len > 0))
+                                        croak("Offset outside string");
+                                }
+                        if (len >= (in_len-offset))
+                                len=in_len-offset;
+                        }
+                else
+                        len=in_len;
+
+                RETVAL=BIO_write(bio,ptr+offset,len);
+        OUTPUT:
+                RETVAL
+
+void
+p5_BIO_getline(bio)
+        BIO *bio;
+        PREINIT:
+                int i;
+                char *p;
+        PPCODE:
+                pr_name("p5_BIO_gets");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                sv_setpvn(ST(0),"",0);
+                SvGROW(ST(0),1024);
+                p=SvPV(ST(0),na);
+                i=BIO_gets(bio,p,1024);
+                if (i < 0) i=0;
+                SvCUR_set(ST(0),i);
+
+int
+p5_BIO_flush(bio)
+        BIO *bio;
+        CODE:
+                RETVAL=BIO_flush(bio);
+        OUTPUT:
+                RETVAL
+
+char *
+p5_BIO_type(bio)
+        BIO *bio;
+        CODE:
+                RETVAL=bio->method->name;
+        OUTPUT:
+                RETVAL
+
+void
+p5_BIO_next_bio(b)
+        BIO *b
+        PREINIT:
+                BIO *bio;
+                char *type;
+                SV *arg;
+        PPCODE:
+                bio=b->next_bio;
+                if (bio != NULL)
+                        {
+                        arg=(SV *)BIO_get_ex_data(bio,p5_bio_ex_bio_ptr);
+                        if (arg == NULL)
+                                {
+                                arg=new_ref("SSLeay::BIO",(char *)bio,0);
+                                PUSHs(arg);
+                                BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,(char *)arg);
+                                }
+                        else
+                                {
+                                SvREFCNT_inc(arg);
+                                PUSHs(arg);
+                                }
+                        }
+
+int
+p5_BIO_puts(bio,in)
+        BIO *bio;
+        SV *in;
+        PREINIT:
+                char *ptr;
+        CODE:
+                ptr=SvPV(in,na);
+                RETVAL=BIO_puts(bio,ptr);
+        OUTPUT:
+                RETVAL
+
+void
+p5_BIO_set_callback(bio,cb,...)
+        BIO *bio;
+        SV *cb;
+        PREINIT:
+                SV *arg=NULL;
+                SV *arg2=NULL;
+        CODE:
+                if (items > 3)
+                        croak("Usage: SSLeay::BIO::set_callback(bio,callback[,arg]");
+                if (items == 3)
+                        {
+                        arg2=sv_mortalcopy(ST(2));
+                        SvREFCNT_inc(arg2);
+                        BIO_set_ex_data(bio,p5_bio_ex_bio_callback_data,
+                                (char *)arg2);
+                        }
+                arg=sv_mortalcopy(ST(1));
+                SvREFCNT_inc(arg);
+                BIO_set_ex_data(bio,p5_bio_ex_bio_callback,(char *)arg);
+                BIO_set_callback(bio,p5_bio_callback);
+
+void
+p5_BIO_DESTROY(bio)
+        BIO *bio
+        PREINIT:
+                SV *sv;
+        PPCODE:
+                pr_name_d("p5_BIO_DESTROY",bio->references);
+                printf("p5_BIO_DESTROY <%s> %d\n",bio->method->name,bio->references);
+                BIO_set_ex_data(bio,p5_bio_ex_bio_ptr,NULL);
+                BIO_free_all(bio);
+
+int
+p5_BIO_set_ssl(bio,ssl)
+        BIO *bio;
+        SSL *ssl;
+        CODE:
+                pr_name("p5_BIO_set_ssl");
+                ssl->references++;
+                RETVAL=BIO_set_ssl(bio,ssl,BIO_CLOSE);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BIO_number_read(bio)
+        BIO *bio;
+        CODE:
+                RETVAL=BIO_number_read(bio);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BIO_number_written(bio)
+        BIO *bio;
+        CODE:
+                RETVAL=BIO_number_written(bio);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BIO_references(bio)
+        BIO *bio;
+        CODE:
+                RETVAL=bio->references; 
+        OUTPUT:
+                RETVAL
+
diff --git a/src/lib/libssl/src/perl/bn.pl b/src/lib/libssl/src/perl/bn.pl
new file mode 100644
index 0000000000..5314ca46e1
--- /dev/null
+++ b/src/lib/libssl/src/perl/bn.pl
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+use ExtUtils::testlib;
+use SSLeay;
+
+$message=SSLeay::BN::new();
+$e=SSLeay::BN::new();
+$mod=SSLeay::BN::new();
+
+$mod=SSLeay::BN::dec2bn("114381625757888867669235779976146612010218296721242362562561842935706935245733897830597123563958705058989075147599290026879543541");
+$e=5;
+$d=SSLeay::BN::dec2bn("45752650303155547067694311990458644804087318688496945025024737159778909096647814932594914301288138204957467016445183857236173773");
+
+$message=SSLeay::BN::bin2bn("The magic words are squeamish ossifrage");
+
+
+        $cipher_text=   $message->mod_exp($e,$mod);
+print $mod."\n";
+print $mod->num_bits()."\n";
+for (1 .. 1000)
+        {
+        $clear=         $cipher_text->mod_exp($d,$mod);
+        }
+print $clear->bn2bin()."\n";
diff --git a/src/lib/libssl/src/perl/bn.txt b/src/lib/libssl/src/perl/bn.txt
new file mode 100644
index 0000000000..784e761558
--- /dev/null
+++ b/src/lib/libssl/src/perl/bn.txt
@@ -0,0 +1,38 @@
+BN->new()
+BN->dup(a)
+BN->rand(bits[,top][,bottom])
+
+BN->hex2bn(a)
+BN->bn2hex(a)
+BN->dec2bn(a)
+BN->bn2dec(a)
+BN->bin2bn(a)
+BN->bn2bin(a)
+BN->mpi2bn(a)
+BN->bn2mpi(a)
+
+BN->add(a,b)
+BN->sub(a,b)
+BN->mul(a,b)
+(div,mod)=BN->div(a,b)
+BN->mod(a,b)
+BN->exp(a,p)
+BN->mod_mul(a,b,c)
+BN->mod_exp(a,b,c)
+
+BN->is_prime(p,num)
+BN->generate_prime(bits,strong,callback)
+
+BN->num_bits(a)
+BN->cmp(a,b)
+BN->ucmp(a,b)
+BN->is_bit_set(a,pos)
+BN->set_bit(a,pos)
+BN->clear_bit(a,pos)
+BN->lshift(a,num)
+BN->rshift(a,num)
+BN->mask_bits(a,pos)
+BN->clear(a)
+BN->gcd(a,b)
+BN->mod_inverse(a,mod)
+
diff --git a/src/lib/libssl/src/perl/bn.xs b/src/lib/libssl/src/perl/bn.xs
new file mode 100644
index 0000000000..c15be3729a
--- /dev/null
+++ b/src/lib/libssl/src/perl/bn.xs
@@ -0,0 +1,589 @@
+#include "p5SSLeay.h"
+
+int sv_to_BIGNUM(var,arg,name)
+BIGNUM **var;
+SV *arg;
+char *name;
+        {
+        int ret=1;
+
+        if (sv_derived_from(arg,"SSLeay::BN"))
+                {
+                IV tmp = SvIV((SV*)SvRV(arg));
+                *var = (BIGNUM *) tmp;
+                }
+        else if (SvIOK(arg)) {
+                SV *tmp=sv_newmortal();
+                *var=BN_new();
+                BN_set_word(*var,SvIV(arg));
+                sv_setref_pv(tmp,"SSLeay::BN",(void*)*var);
+                }
+        else if (SvPOK(arg)) {
+                char *ptr;
+                STRLEN len;
+                SV *tmp=sv_newmortal();
+                *var=BN_new();
+                sv_setref_pv(tmp,"SSLeay::BN", (void*)*var);
+                ptr=SvPV(arg,len);
+                SvGROW(arg,len+1);
+                ptr[len]='\0';
+                BN_dec2bn(var,ptr);
+                }
+        else
+                {
+                croak(name);
+                ret=0;
+                }
+        return(ret);
+        }
+
+typedef struct gpc_args_st {
+        SV *cb;
+        SV *arg;
+        } GPC_ARGS;
+
+static void generate_prime_callback(pos,num,arg)
+int pos;
+int num;
+char *arg;
+        {
+        dSP ;
+        int i;
+        GPC_ARGS *a=(GPC_ARGS *)arg;
+
+        ENTER ;
+        SAVETMPS ;
+
+        PUSHMARK(sp);
+        XPUSHs(sv_2mortal(newSViv(pos)));
+        XPUSHs(sv_2mortal(newSViv(num)));
+        XPUSHs(sv_2mortal(newSVsv(a->arg)));
+        PUTBACK;
+
+        i=perl_call_sv(a->cb,G_DISCARD);
+
+        SPAGAIN;
+
+        PUTBACK;
+        FREETMPS;
+        LEAVE;
+        }
+
+MODULE =  SSLeay::BN    PACKAGE = SSLeay::BN    PREFIX = p5_BN_
+
+VERSIONCHECK: DISABLE
+
+void
+p5_BN_new(...)
+        PREINIT:
+                BIGNUM *bn;
+                SV *arg;
+        PPCODE:
+                pr_name("p5_BN_new");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                bn=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)bn);
+
+void
+p5_BN_dup(a)
+        BIGNUM *a;
+        PREINIT:
+                BIGNUM *bn;
+        PPCODE:
+                pr_name("p5_BN_dup");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                bn=BN_dup(a);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)bn);
+
+void
+p5_BN_rand(bits,...)
+        int bits;
+        PREINIT:
+                int top=1;
+                int bottom=0;
+                BIGNUM *ret;
+        PPCODE: 
+                pr_name("p5_BN_rand");
+                if ((items < 1) || (items > 3))
+                        croak("Usage: SSLeay::BN::rand(bits[,top_bit][,bottombit]");
+                if (items >= 2) top=(int)SvIV(ST(0));
+                if (items >= 3) bottom=(int)SvIV(ST(1));
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                BN_rand(ret,bits,top,bottom);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+
+void
+p5_BN_bin2bn(a)
+        datum a;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_bin2bn");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_bin2bn(a.dptr,a.dsize,NULL);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+
+void
+p5_BN_bn2bin(a)
+        BIGNUM *a;
+        PREINIT:
+                int i;
+        PPCODE:
+                pr_name("p5_BN_bn2bin");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                i=BN_num_bytes(a)+2;
+                sv_setpvn(ST(0),"",1);
+                SvGROW(ST(0),i+1);
+                SvCUR_set(ST(0),BN_bn2bin(a,SvPV(ST(0),na)));
+
+void
+p5_BN_mpi2bn(a)
+        datum a;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_mpi2bn");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_mpi2bn(a.dptr,a.dsize,NULL);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+
+void
+p5_BN_bn2mpi(a)
+        BIGNUM *a;
+        PREINIT:
+                int i;
+        PPCODE:
+                pr_name("p5_BN_bn2mpi");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                i=BN_bn2mpi(a,NULL);
+                sv_setpvn(ST(0),"",1);
+                SvGROW(ST(0),i+1);
+                SvCUR_set(ST(0),BN_bn2mpi(a,SvPV(ST(0),na)));
+
+void
+p5_BN_hex2bn(a)
+        datum a;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_hex2bn");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_hex2bn(&ret,a.dptr);
+
+void
+p5_BN_dec2bn(a)
+        datum a;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_dec2bn");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_dec2bn(&ret,a.dptr);
+
+SV *
+p5_BN_bn2hex(a)
+        BIGNUM *a;
+        PREINIT:
+                char *ptr;
+                int i;
+        CODE:
+                pr_name("p5_BN_bn2hex");
+                ptr=BN_bn2hex(a);
+                RETVAL=newSVpv("",0);
+                i=strlen(ptr);
+                SvGROW(RETVAL,i+1);
+                memcpy(SvPV(RETVAL,na),ptr,i+1);
+                SvCUR_set(RETVAL,i);
+                Free(ptr);
+        OUTPUT:
+                RETVAL
+
+SV *
+p5_BN_bn2dec(a)
+        BIGNUM *a;
+        PREINIT:
+                char *ptr;
+                int i;
+        CODE:
+                pr_name("p5_BN_bn2dec");
+                ptr=BN_bn2dec(a);
+                RETVAL=newSVpv("",0);
+                i=strlen(ptr);
+                SvGROW(RETVAL,i+1);
+                memcpy(SvPV(RETVAL,na),ptr,i+1);
+                SvCUR_set(RETVAL,i);
+                Free(ptr);
+        OUTPUT:
+                RETVAL
+
+void
+p5_BN_add(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_add");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_add(ret,a,b);
+
+void
+p5_BN_sub(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_sub");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_sub(ret,a,b);
+
+void
+p5_BN_mul(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_mul");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_mul(ret,a,b);
+
+void
+p5_BN_div(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        PREINIT:
+                static BN_CTX *ctx=NULL;
+                BIGNUM *div,*mod;
+        PPCODE:
+                pr_name("p5_BN_div");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                EXTEND(sp,2);
+                PUSHs(sv_newmortal());
+                PUSHs(sv_newmortal());
+                div=BN_new();
+                mod=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)div);
+                sv_setref_pv(ST(1), "SSLeay::BN", (void*)mod);
+                BN_div(div,mod,a,b,ctx);
+
+void
+p5_BN_mod(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        PREINIT:
+                static BN_CTX *ctx=NULL;
+                BIGNUM *rem;
+        PPCODE:
+                pr_name("p5_BN_mod");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                rem=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)rem);
+                BN_mod(rem,a,b,ctx);
+
+void
+p5_BN_exp(a,p)
+        BIGNUM *a;
+        BIGNUM *p;
+        PREINIT:
+                BIGNUM *ret;
+                static BN_CTX *ctx=NULL;
+        PPCODE:
+                pr_name("p5_BN_exp");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_exp(ret,a,p,ctx);
+
+void
+p5_BN_mod_mul(a,b,c)
+        BIGNUM *a;
+        BIGNUM *b;
+        BIGNUM *c;
+        PREINIT:
+                static BN_CTX *ctx=NULL;
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_mod_mul");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_mod_mul(ret,a,b,c,ctx);
+
+void
+p5_BN_mod_exp(a,b,c)
+        BIGNUM *a;
+        BIGNUM *b;
+        BIGNUM *c;
+        PREINIT:
+                static BN_CTX *ctx=NULL;
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_mod_exp");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_mod_exp(ret,a,b,c,ctx);
+
+void
+p5_BN_generate_prime(...)
+        PREINIT:
+                int bits=512;
+                int strong=0;
+                BIGNUM *ret=NULL;
+                SV *callback=NULL;
+                SV *cb_arg=NULL;
+                GPC_ARGS arg;
+                dSP;
+
+        PPCODE:
+                pr_name("p5_BN_generate_prime");
+                if ((items < 0) || (items > 4))
+                        croak("Usage: SSLeay::BN::generate_prime(a[,strong][,callback][,cb_arg]");
+                if (items >= 1) bits=(int)SvIV(ST(0));
+                if (items >= 2) strong=(int)SvIV(ST(1));
+                if (items >= 3) callback=ST(2);
+                if (items == 4) cb_arg=ST(3);
+
+                if (callback == NULL)
+                        ret=BN_generate_prime(bits,strong,NULL,NULL,NULL,NULL);
+                else
+                        {
+                        arg.cb=callback;
+                        arg.arg=cb_arg;
+
+                        ret=BN_generate_prime(bits,strong,NULL,NULL,
+                                generate_prime_callback,(char *)&arg);
+                        }
+
+                SPAGAIN;
+                sp-=items; /* a bit evil that I do this */
+
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+
+void
+p5_BN_is_prime(p,...)
+        BIGNUM *p;
+        PREINIT:
+        int nchecks=5,ret;
+        SV *callback=NULL;
+        SV *cb_arg=NULL;
+        GPC_ARGS arg;
+        dSP;
+        static BN_CTX *ctx=NULL;
+        PPCODE:
+                pr_name("p5_BN_is_prime");
+                if ((items < 1) || (items > 4))
+                        croak("Usage: SSLeay::BN::is_prime(a[,ncheck][,callback][,callback_arg]");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                if (items >= 2) nchecks=(int)SvIV(ST(1));
+                if (items >= 3) callback=ST(2);
+                if (items >= 4) cb_arg=ST(3);
+                arg.arg=cb_arg; 
+                if (callback == NULL)
+                        ret=BN_is_prime(p,nchecks,NULL,ctx,NULL);
+                else
+                        {
+                        arg.cb=callback;
+                        arg.arg=cb_arg;
+                        ret=BN_is_prime(p,nchecks,generate_prime_callback,
+                                ctx,(char *)&arg);
+                        }
+                SPAGAIN;
+                sp-=items; /* a bit evil */
+                PUSHs(sv_2mortal(newSViv(ret)));
+
+int
+p5_BN_num_bits(a)
+        BIGNUM *a;
+        CODE:
+                pr_name("p5_BN_num_bits");
+                RETVAL=BN_num_bits(a);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BN_cmp(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        CODE:
+                pr_name("p5_BN_cmp");
+                RETVAL=BN_cmp(a,b);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BN_ucmp(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        CODE:
+                pr_name("p5_BN_ucmp");
+                RETVAL=BN_ucmp(a,b);
+        OUTPUT:
+                RETVAL
+
+int
+p5_BN_is_bit_set(a,b)
+        BIGNUM *a;
+        int b;
+        CODE:
+                pr_name("p5_BN_is_bit_set");
+                RETVAL=BN_is_bit_set(a,b);
+        OUTPUT:
+                RETVAL
+
+void
+p5_BN_set_bit(a,b)
+        BIGNUM *a;
+        int b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_set_bit");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_dup(a);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_set_bit(ret,b);
+
+void
+p5_BN_clear_bit(a,b)
+        BIGNUM *a;
+        int b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_clear_bit");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_dup(a);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_clear_bit(ret,b);
+
+void
+p5_BN_lshift(a,b)
+        BIGNUM *a;
+        int b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_lshift");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                if (b == 1)
+                        BN_lshift1(ret,a);
+                else
+                        BN_lshift(ret,a,b);
+
+void
+p5_BN_rshift(a,b)
+        BIGNUM *a;
+        int b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_rshift");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                if (b == 1)
+                        BN_rshift1(ret,a);
+                else
+                        BN_rshift(ret,a,b);
+
+void
+p5_BN_mask_bits(a,b)
+        BIGNUM *a;
+        int b;
+        PREINIT:
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_mask_bits");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_dup(a);
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_mask_bits(ret,b);
+
+void
+p5_BN_clear(a)
+        BIGNUM *a;
+        PPCODE:
+                pr_name("p5_BN_clear");
+                BN_clear(a);
+
+void
+p5_BN_gcd(a,b)
+        BIGNUM *a;
+        BIGNUM *b;
+        PREINIT:
+                static BN_CTX *ctx=NULL;
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_gcd");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ret=BN_new();
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+                BN_gcd(ret,a,b,ctx);
+
+void
+p5_BN_mod_inverse(a,mod)
+        BIGNUM *a;
+        BIGNUM *mod;
+        PREINIT:
+                static BN_CTX *ctx=NULL;
+                BIGNUM *ret;
+        PPCODE:
+                pr_name("p5_BN_mod_inverse");
+                if (ctx == NULL) ctx=BN_CTX_new();
+                ret=BN_mod_inverse(a,mod,ctx);
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                sv_setref_pv(ST(0), "SSLeay::BN", (void*)ret);
+
+void
+p5_BN_DESTROY(bn)
+        BIGNUM *bn
+        CODE:
+        pr_name("p5_BN_DESTROY");
+        BN_free(bn);
+
diff --git a/src/lib/libssl/src/perl/callback.c b/src/lib/libssl/src/perl/callback.c
new file mode 100644
index 0000000000..01840abc85
--- /dev/null
+++ b/src/lib/libssl/src/perl/callback.c
@@ -0,0 +1,103 @@
+/* perl/callback.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.]
+ */
+
+SV *new_ref(type,obj,mort)
+char *type;
+char *obj;
+        {
+        SV *ret;
+
+        if (mort)
+                ret=sv_newmortal();
+        else
+                ret=newSViv(0);
+        sv_setref_pv(ret,type,(void *)obj);
+        return(ret);
+        }
+
+int ex_new(obj,data,ad,idx,argl,argp)
+char *obj;
+SV *data;
+CRYPTO_EX_DATA *ad;
+int idx;
+long argl;
+char *argp;
+        {
+        SV *sv;
+
+fprintf(stderr,"ex_new %08X %s\n",obj,argp);
+        sv=sv_newmortal();
+        sv_setref_pv(sv,argp,(void *)obj);
+        CRYPTO_set_ex_data(ad,idx,(char *)sv);
+        return(1);
+        }
+
+void ex_cleanup(obj,data,ad,idx,argl,argp)
+char *obj;
+SV *data;
+CRYPTO_EX_DATA *ad;
+int idx;
+long argl;
+char *argp;
+        {
+        pr_name("ex_cleanup");
+fprintf(stderr,"ex_cleanup %08X %s\n",obj,argp);
+        if (data != NULL)
+                SvREFCNT_dec((SV *)data);
+        }
+
diff --git a/src/lib/libssl/src/perl/cipher.pl b/src/lib/libssl/src/perl/cipher.pl
new file mode 100644
index 0000000000..e774bceed2
--- /dev/null
+++ b/src/lib/libssl/src/perl/cipher.pl
@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$md=SSLeay::MD::new("md5");
+
+foreach (@SSLeay::Cipher::names)
+        {
+        ($c=SSLeay::Cipher::new($_)) ||
+                die "'$_' is an unknown cipher algorithm\n";
+
+
+        $data="012345678abcdefghijklmnopqrstuvwxyz";
+        $c->init("01234567abcdefghABCDEFGH","zyxwvut",1);
+
+        $in =$c->update(substr($data, 0, 5));
+        $in.=$c->update(substr($data, 5,10));
+        $in.=$c->update(substr($data,15,1));
+        $in.=$c->update(substr($data,16));
+
+        $in.=$c->final();
+
+        $c->init("01234567abcdefghABCDEFGH","zyxwvut",0);
+        $out=$c->update($in);
+        $out.=$c->final();
+
+        ($out eq $data) || die "decrypt for $_ failed:$!\n";
+
+        $md->init();
+        $md->update($in);
+        $digest=$md->final();
+
+        print unpack("H*",$digest);
+        printf " %2d %2d %2d %s\n", $c->key_length(), $c->iv_length(),
+                $c->block_size(), $c->name();
+        }
+
diff --git a/src/lib/libssl/src/perl/cipher.txt b/src/lib/libssl/src/perl/cipher.txt
new file mode 100644
index 0000000000..c47952b5c9
--- /dev/null
+++ b/src/lib/libssl/src/perl/cipher.txt
@@ -0,0 +1,10 @@
+Cipher::new(name) "des-cbc" etc
+Cipher::name()
+Cipher::key_length()
+Cipher::iv_length()
+Cipher::block_size()
+
+Cipher::init(key,iv,enc)
+Cipher::update(in)
+Cipher::final()
+Cipher::cipher(in)
diff --git a/src/lib/libssl/src/perl/cipher.xs b/src/lib/libssl/src/perl/cipher.xs
new file mode 100644
index 0000000000..1044d7a4ef
--- /dev/null
+++ b/src/lib/libssl/src/perl/cipher.xs
@@ -0,0 +1,152 @@
+#include "p5SSLeay.h"
+
+int boot_cipher()
+        {
+        SSLeay_add_all_ciphers();
+        return(1);
+        }
+
+MODULE =  SSLeay::Cipher        PACKAGE = SSLeay::Cipher PREFIX = p5_EVP_C_
+
+VERSIONCHECK: DISABLE
+
+void
+p5_EVP_C_new(...)
+        PREINIT:
+                EVP_CIPHER_CTX *ctx;
+                EVP_CIPHER *c;
+                char *name;
+        PPCODE:
+                if ((items == 1) && SvPOK(ST(0)))
+                        name=SvPV(ST(0),na);
+                else if ((items == 2) && SvPOK(ST(1)))
+                        name=SvPV(ST(1),na);
+                else
+                        croak("Usage: SSLeay::Cipher::new(type)");
+                PUSHs(sv_newmortal());
+                c=EVP_get_cipherbyname(name);
+                if (c != NULL)
+                        {
+                        ctx=malloc(sizeof(EVP_CIPHER_CTX));
+                        EVP_EncryptInit(ctx,c,NULL,NULL);
+                        sv_setref_pv(ST(0), "SSLeay::Cipher", (void*)ctx);
+                        }
+
+datum
+p5_EVP_C_name(ctx)
+        EVP_CIPHER_CTX *ctx
+        CODE:
+                RETVAL.dptr=OBJ_nid2ln(EVP_CIPHER_CTX_nid(ctx));
+                RETVAL.dsize=strlen(RETVAL.dptr);
+        OUTPUT:
+                RETVAL
+
+int
+p5_EVP_C_key_length(ctx)
+        EVP_CIPHER_CTX *ctx
+        CODE:
+                RETVAL=EVP_CIPHER_CTX_key_length(ctx);
+        OUTPUT:
+                RETVAL
+
+int
+p5_EVP_C_iv_length(ctx)
+        EVP_CIPHER_CTX *ctx
+        CODE:
+                RETVAL=EVP_CIPHER_CTX_iv_length(ctx);
+        OUTPUT:
+                RETVAL
+        
+int
+p5_EVP_C_block_size(ctx)
+        EVP_CIPHER_CTX *ctx
+        CODE:
+                RETVAL=EVP_CIPHER_CTX_block_size(ctx);
+        OUTPUT:
+                RETVAL
+        
+void
+p5_EVP_C_init(ctx,key,iv,enc)
+        EVP_CIPHER_CTX *ctx
+        datum key
+        datum iv
+        int enc
+        PREINIT:
+                char loc_iv[EVP_MAX_IV_LENGTH];
+                char loc_key[EVP_MAX_KEY_LENGTH];
+                char *ip=loc_iv,*kp=loc_key;
+                int i;
+                memset(loc_iv,0,EVP_MAX_IV_LENGTH);
+                memset(loc_key,0,EVP_MAX_KEY_LENGTH);
+        CODE:
+                i=key.dsize;
+                if (key.dsize > EVP_CIPHER_CTX_key_length(ctx))
+                        i=EVP_CIPHER_CTX_key_length(ctx);
+                if (i > 0)
+                        {
+                        memset(kp,0,EVP_MAX_KEY_LENGTH);
+                        memcpy(kp,key.dptr,i);
+                        }
+                else
+                        kp=NULL;
+                i=iv.dsize;
+                if (iv.dsize > EVP_CIPHER_CTX_iv_length(ctx))
+                        i=EVP_CIPHER_CTX_iv_length(ctx);
+                if (i > 0)
+                        {
+                        memcpy(ip,iv.dptr,i);
+                        memset(ip,0,EVP_MAX_IV_LENGTH);
+                        }
+                else
+                        ip=NULL;
+                EVP_CipherInit(ctx,EVP_CIPHER_CTX_cipher(ctx),kp,ip,enc);
+                memset(loc_key,0,sizeof(loc_key));
+                memset(loc_iv,0,sizeof(loc_iv));
+
+SV *
+p5_EVP_C_cipher(ctx,in)
+        EVP_CIPHER_CTX *ctx;
+        datum in;
+        CODE:
+                RETVAL=newSVpv("",0);
+                SvGROW(RETVAL,in.dsize+EVP_CIPHER_CTX_block_size(ctx)+1);
+                EVP_Cipher(ctx,SvPV(RETVAL,na),in.dptr,in.dsize);
+                SvCUR_set(RETVAL,in.dsize);
+        OUTPUT:
+                RETVAL
+
+SV *
+p5_EVP_C_update(ctx, in)
+        EVP_CIPHER_CTX *ctx
+        datum in
+        PREINIT:
+        int i;
+        CODE:
+                RETVAL=newSVpv("",0);
+                SvGROW(RETVAL,in.dsize+EVP_CIPHER_CTX_block_size(ctx)+1);
+                EVP_CipherUpdate(ctx,SvPV(RETVAL,na),&i,in.dptr,in.dsize);
+                SvCUR_set(RETVAL,i);
+        OUTPUT:
+                RETVAL
+
+SV *
+p5_EVP_C_final(ctx)
+        EVP_CIPHER_CTX *ctx
+        PREINIT:
+        int i;
+        CODE:
+                RETVAL=newSVpv("",0);
+                SvGROW(RETVAL,EVP_CIPHER_CTX_block_size(ctx)+1);
+                if (!EVP_CipherFinal(ctx,SvPV(RETVAL,na),&i))
+                        sv_setpv(RETVAL,"BAD DECODE");
+                else
+                        SvCUR_set(RETVAL,i);
+        OUTPUT:
+                RETVAL
+
+void
+p5_EVP_C_DESTROY(ctx)
+        EVP_CIPHER_CTX *ctx
+        CODE:
+        free((char *)ctx);
+
diff --git a/src/lib/libssl/src/perl/dh.pl b/src/lib/libssl/src/perl/dh.pl
new file mode 100644
index 0000000000..73decc241a
--- /dev/null
+++ b/src/lib/libssl/src/perl/dh.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$g=SSLeay::BN::hex2bn("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002"); 
+$p=SSLeay::BN::hex2bn("ffffffffffffffffc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc74020bbea63b139b22514a08798e3404ddef9519b3cd3a431b302b0a6df25f14374fe1356d6d51c245e485b576625e7ec6f44c42e9a63a3620ffffffffffffffff");
+$pub=SSLeay::BN::hex2bn("521b5b72d0a23f5f908eff62741b9c43ac65c47ad264a4f8d62d73dfab4938a6e019f81c28d64efd9b47c1b8188566c6184b6064cc42fac2778bd732678148c6cc7601bfe0ed18da76dd7bb976cd2ff0afc7b20f3f81171e2ea6534de061f929");
+$priv=SSLeay::BN::hex2bn("6e15c752af3f4cf6d7425164c451eeba760ec0651d12dc3b0ee5002a95af6191268ca47c0fbb3d836136eee795ae4af3a1adad5e04d0dbb04378cae0406ece23ca3b86839c0fd60064c1019c7d18be4dc0ec4be6c1e9ff6b0f5bd76373585503");
+$his=SSLeay::BN::hex2bn("d0fb51cd44a8578f55eb0822ede90f07504f4720d7367ff4bf76c27fedbce79d9204421ff7e86bd1dd02031bce4ceccd1d3e7c62679b6eb5fda8238fd4fe07bff573d552795f0d46f25753c688300fb9ed396792b59a49fdf89c8429124b668e");
+$sh=SSLeay::BN::hex2bn("66ec34b09bddf86147f6c6efd5ee4e6691e690eb0e90aceda16a742cad0abe531cb61d057aff362001ca19013215140ca2a1dd8966c78105bacbf2161f9cfbd58d351ff87923de77f9c56851037223d48272565416ee769e65a621cefb90b403");
+
+$g2=SSLeay::BN::hex2bn("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002");
+$p2=SSLeay::BN::hex2bn("ffffffffffffffffc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc74020bbea63b139b22514a08798e3404ddef9519b3cd3a431b302b0a6df25f14374fe1356d6d51c245e485b576625e7ec6f44c42e9a63a3620ffffffffffffffff");
+$pub2=SSLeay::BN::hex2bn("d0fb51cd44a8578f55eb0822ede90f07504f4720d7367ff4bf76c27fedbce79d9204421ff7e86bd1dd02031bce4ceccd1d3e7c62679b6eb5fda8238fd4fe07bff573d552795f0d46f25753c688300fb9ed396792b59a49fdf89c8429124b668e");
+$priv2=SSLeay::BN::hex2bn("b81d54f52b687669fc8bd8087ac319accc2f94a2feafe09779f4a81e8e01f77290f5bbe84a08003afc4448145be427fad0b9d047889cf361c9dd378b15c1ebd5bda33e051fbd9eba8bf063e2bd836467cddb61f1db5c4b06bea5c9a77fb87b24");
+$his2=SSLeay::BN::hex2bn("521b5b72d0a23f5f908eff62741b9c43ac65c47ad264a4f8d62d73dfab4938a6e019f81c28d64efd9b47c1b8188566c6184b6064cc42fac2778bd732678148c6cc7601bfe0ed18da76dd7bb976cd2ff0afc7b20f3f81171e2ea6534de061f929");
+$sh2=SSLeay::BN::hex2bn("791faba7a6b592cb68a963945229483dc30f80f5cb295b2b5a59ef618a262d22de0845948a34db83d8bde260b940967ff85593a609e53ee6510aea09b776b4704d5e916917f384458d4790b6e0befcb1cb2f112b850e9ed410a091db80e1db2e");
+
+print "g=".$g->bn2hex."\n";
+print "p=".$p->bn2hex."\n";
+print "pub=".$pub->bn2hex."\n";
+print "priv=".$priv->bn2hex."\n";
+print "sh=".$sh->bn2hex."\n";
+
+print "new p - p2 = ".($p-$p2)."\n";
+
+$tmp=$g->mod_exp($priv,$p);
+print "XXXXXXXXXXXXXXXX\n";
+print "new pub - pub = ".($tmp-$pub)."\n";
+$tmp2=$g2->mod_exp($priv2,$p2);
+print "XXXXXXXXXXXXXXXX\n";
+
+print $p." pub\n";
+print $tmp2." calc pub\n";
+print $pub2." txt pub\n";
+
+
+
diff --git a/src/lib/libssl/src/perl/digest.txt b/src/lib/libssl/src/perl/digest.txt
new file mode 100644
index 0000000000..6cb3ffedb0
--- /dev/null
+++ b/src/lib/libssl/src/perl/digest.txt
@@ -0,0 +1,7 @@
+MD::new(name) "md2", "md5" etc
+MD::name()
+MD::init()
+MD::update(in)
+MD::final()
+
+
diff --git a/src/lib/libssl/src/perl/digest.xs b/src/lib/libssl/src/perl/digest.xs
new file mode 100644
index 0000000000..5738b09e48
--- /dev/null
+++ b/src/lib/libssl/src/perl/digest.xs
@@ -0,0 +1,83 @@
+#include "p5SSLeay.h"
+
+int boot_digest()
+        {
+        SSLeay_add_all_digests();
+        return(1);
+        }
+
+MODULE =  SSLeay::MD    PACKAGE = SSLeay::MD    PREFIX = p5_EVP_MD_
+
+PROTOTYPES: ENABLE
+VERSIONCHECK: DISABLE
+
+# SSLeay::MD::new(name) name= md2, md5, sha, sha1, or mdc2
+#       md->name() - returns the name
+#       md->init() - reinitalises the digest
+#       md->update(data) - adds more data to digest
+#       digest=md->final() - returns digest
+#
+
+void
+p5_EVP_MD_new(...)
+        PREINIT:
+                EVP_MD_CTX *ctx;
+                EVP_MD *md;
+                char *name;
+        PPCODE:
+                if ((items == 1) && SvPOK(ST(0)))
+                        name=SvPV(ST(0),na);
+                else if ((items == 2) && SvPOK(ST(1)))
+                        name=SvPV(ST(1),na);
+                else
+                        croak("Usage: SSLeay::MD::new(type)");
+                PUSHs(sv_newmortal());
+                md=EVP_get_digestbyname(name);
+                if (md != NULL)
+                        {
+                        ctx=malloc(sizeof(EVP_MD_CTX));
+                        EVP_DigestInit(ctx,md);
+                        sv_setref_pv(ST(0), "SSLeay::MD", (void*)ctx);
+                        }
+
+datum
+p5_EVP_MD_name(ctx)
+        EVP_MD_CTX *ctx
+        CODE:
+                RETVAL.dptr=OBJ_nid2ln(EVP_MD_type(EVP_MD_CTX_type(ctx)));
+                RETVAL.dsize=strlen(RETVAL.dptr);
+        OUTPUT:
+                RETVAL
+        
+void
+p5_EVP_MD_init(ctx)
+        EVP_MD_CTX *ctx
+        CODE:
+                EVP_DigestInit(ctx,EVP_MD_CTX_type(ctx));
+
+void
+p5_EVP_MD_update(ctx, in)
+        EVP_MD_CTX *ctx
+        datum in
+        CODE:
+                EVP_DigestUpdate(ctx,in.dptr,in.dsize);
+
+datum
+p5_EVP_MD_final(ctx)
+        EVP_MD_CTX *ctx
+        PREINIT:
+                char md[EVP_MAX_MD_SIZE];
+                int len;
+        CODE:
+                EVP_DigestFinal(ctx,md,&len);
+                RETVAL.dptr=md;
+                RETVAL.dsize=len;
+        OUTPUT:
+                RETVAL
+
+void
+p5_EVP_MD_DESTROY(ctx)
+        EVP_MD_CTX *ctx
+        CODE:
+        free((char *)ctx);
+
diff --git a/src/lib/libssl/src/perl/err.txt b/src/lib/libssl/src/perl/err.txt
new file mode 100644
index 0000000000..5e6cdaecdc
--- /dev/null
+++ b/src/lib/libssl/src/perl/err.txt
@@ -0,0 +1,2 @@
+ERR::get_error()
+ERR::peek_error()
diff --git a/src/lib/libssl/src/perl/err.xs b/src/lib/libssl/src/perl/err.xs
new file mode 100644
index 0000000000..6d1aec3ea1
--- /dev/null
+++ b/src/lib/libssl/src/perl/err.xs
@@ -0,0 +1,46 @@
+#include "p5SSLeay.h"
+
+int boot_err()
+        {
+        SSL_load_error_strings();
+        return(1);
+        }
+
+MODULE =  SSLeay::ERR   PACKAGE = SSLeay::ERR   PREFIX = p5_ERR_
+
+PROTOTYPES: ENABLE
+VERSIONCHECK: DISABLE
+
+#       md->error() - returns the last error in text or numeric context
+
+void
+p5_ERR_get_error(...)
+        PPCODE:
+                char buf[512];
+                unsigned long l;
+
+                pr_name("p5_ERR_get_code");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                l=ERR_get_error();
+                ERR_error_string(l,buf);
+                sv_setiv(ST(0),l);
+                sv_setpv(ST(0),buf);
+                SvIOK_on(ST(0));
+
+void
+p5_ERR_peek_error(...)
+        PPCODE:
+                char buf[512];
+                unsigned long l;
+
+                pr_name("p5_ERR_get_code");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                l=ERR_peek_error();
+                ERR_error_string(l,buf);
+                sv_setiv(ST(0),l);
+                sv_setpv(ST(0),buf);
+                SvIOK_on(ST(0));
+
+
diff --git a/src/lib/libssl/src/perl/f.pl b/src/lib/libssl/src/perl/f.pl
new file mode 100644
index 0000000000..a255931864
--- /dev/null
+++ b/src/lib/libssl/src/perl/f.pl
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$data=<>;
+
+#$b=SSLeay::BN::hex2bn($a);
+#$data=$b->bn2bin;
+
+#substr($data,0,8)="";
+#print $data;
+
+$md=SSLeay::MD::new("md5");
+$md->init();
+$md->update("test");
+$key=$md->final();
+
+$rc4=SSLeay::Cipher::new("rc4");
+$rc4->init($key,"",1);
+$out=$rc4->cipher($data);
+
+print $out;
+
diff --git a/src/lib/libssl/src/perl/g.pl b/src/lib/libssl/src/perl/g.pl
new file mode 100644
index 0000000000..ffbe694b05
--- /dev/null
+++ b/src/lib/libssl/src/perl/g.pl
@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+use ExtUtils::testlib;
+use SSLeay;
+
+$num=SSLeay::BN::new();
+$shift=SSLeay::BN::new();
+
+print "0\n";
+$num=SSLeay::BN::hex2bn("1234329378209857309429670349760347603497603496398");
+print "1\n";
+$s=SSLeay::BN::hex2bn("59");
+print "a\n";
+$r=$num->lshift(59);
+print "b";
+
+print $num->bn2hex."\n";
+print $s->bn2hex."\n";
+print $r->bn2hex."\n";
diff --git a/src/lib/libssl/src/perl/gen_rsa.pl b/src/lib/libssl/src/perl/gen_rsa.pl
new file mode 100644
index 0000000000..ed8c71aa9e
--- /dev/null
+++ b/src/lib/libssl/src/perl/gen_rsa.pl
@@ -0,0 +1,49 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$bits=512;
+$bits=$ARGV[0] if $#ARGV >= 0;
+
+$p=SSLeay::BN::generate_prime($bits/2,0,sub {print STDERR $_[0]?"+":"."});
+print "\n";
+$q=SSLeay::BN::generate_prime($bits/2,0,sub {print STDERR $_[0]?"+":"."});
+print "\n";
+
+$e=SSLeay::BN::hex2bn("10001");
+
+$t1=$p-1;
+$t2=$q-1;
+
+($t1->gcd($e) == 1) || die "p failed the gcd test\n";
+($t2->gcd($e) == 1) || die "q failed the gcd test\n";
+
+($q,$p)=($p,$q) if ($p < $q);
+$n=$p*$q;
+$t=($p-1)*($q-1);
+($t->gcd($e) == 1) || die "t failed the gcd test\n";
+
+$d=$e->mod_inverse($t);
+
+$dmp1=$d%($p-1);
+$dmq1=$d%($q-1);
+$iqmp=$q->mod_inverse($p);
+
+print "n   =$n\n";
+print "e   =$e\n";
+print "d   =$d\n";
+print "dmp1=$dmp1\n";
+print "dmq1=$dmq1\n";
+print "iqmp=$iqmp\n";
+
+$a=SSLeay::BN::bin2bn("This is an RSA test");
+print "Test with\n'".$a->bn2bin."' or\n$a\n";
+
+$t1=$a->mod_exp($e,$n);
+print "$t1\n";
+$t2=$t1->mod_exp($d,$n);
+print "'".$t2->bn2bin."'\n";
+
+
diff --git a/src/lib/libssl/src/perl/mul.pl b/src/lib/libssl/src/perl/mul.pl
new file mode 100644
index 0000000000..611a760625
--- /dev/null
+++ b/src/lib/libssl/src/perl/mul.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+
+sub mul
+        {
+        my($ab,$cd,$num)=@_;
+
+        if ($num <= 4096)
+                {
+                return($ab*$cd);
+                }
+        else
+                {
+                my($a,$b,$c,$d,$n,$ac,$bd,$m,$t1,$t2);
+
+                $n=$num/2;
+
+                $a=$ab->mask_bits($n);
+                $b=$ab->rshift($n);
+                $c=$cd->mask_bits($n);
+                $d=$cd->rshift($n);
+
+                $t1=($b-$a);
+                $t2=($c-$d);
+                $m= &mul($t1,$t2,$n);
+                $ac=&mul($a,$c,$n);
+                $bd=&mul($b,$d,$n);
+                $m=$m+$ac+$bd;
+                $m=$m->lshift($n);
+                $bd=$bd->lshift($num);
+
+                $r=$ac+$m+$bd;
+                return($r);
+                }
+        }
+
+$num=4096*32;
+$a=SSLeay::BN::rand($num);
+$b=SSLeay::BN::rand($num);
+
+#for (1 .. 10)
+        {
+        $r=&mul($a,$b,$num);
+        }
+
+#for (1 .. 10)
+        {
+        $rr=$a*$b;
+        }
+
+$res=$rr-$r;
+print $res->bn2hex()."\n";
diff --git a/src/lib/libssl/src/perl/p5SSLeay.h b/src/lib/libssl/src/perl/p5SSLeay.h
new file mode 100644
index 0000000000..bcccda7d5f
--- /dev/null
+++ b/src/lib/libssl/src/perl/p5SSLeay.h
@@ -0,0 +1,96 @@
+/* perl/p5SSLeay.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.]
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+#ifdef __cplusplus
+}
+#endif
+
+typedef struct datum_st
+        {
+        char *dptr;
+        int dsize;
+        } datum;
+
+#include "crypto.h"
+#include "buffer.h"
+#include "bio.h"
+#include "evp.h"
+#include "err.h"
+#include "x509.h"
+#include "ssl.h"
+
+#if 0
+#define pr_name(name)           printf("%s\n",name)
+#define pr_name_d(name,p2)      printf("%s %d\n",name,p2)
+#define pr_name_dd(name,p2,p3)  printf("%s %d %d\n",name,p2,p3)
+#else
+#define pr_name(name)
+#define pr_name_d(name,p2)
+#define pr_name_dd(name,p2,p3)
+#endif
+
+SV *new_ref(char *type, char *obj, int mort);
+int ex_new(char *obj,SV *data,CRYPTO_EX_DATA *ad,int idx,long argl,char *argp);
+void ex_cleanup(char *obj,SV *data,CRYPTO_EX_DATA *ad,int idx,
+        long argl,char *argp);
+
diff --git a/src/lib/libssl/src/perl/r.pl b/src/lib/libssl/src/perl/r.pl
new file mode 100644
index 0000000000..abcc331c78
--- /dev/null
+++ b/src/lib/libssl/src/perl/r.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$bits=512;
+$bits=$ARGV[0] if $#ARGV >= 0;
+
+$q=SSLeay::BN::dec2bn("334533373942443239443435463034324139443635374634423531423146313742443038394230324138363038393539303745363034393946353346323345374537463935433635374238353245344341444241344138413244373443323338334431414134363244443532423243423133433537");
+
+$p=SSLeay::BN::dec2bn("3338413942343132463534373734353742343636444439363131313131353843334536434330363934313646414132453044434138413630434631334134443046313735313632344131433437443642434436423642453234383046393732383538444139393131314339303743393939363744443235443332393332394543384630304634323646333735");
+$pp=SSLeay::BN::generate_prime($bits/2,0,sub {print STDERR $_[0]?"+":"."});
+
+printf $pp->is_prime."\n";
+printf $p->is_prime."\n";
+printf $q->is_prime."\n";
+printf "p->length=%d\n",$p->num_bits;
+printf "q->length=%d\n",$q->num_bits;
+$bits=$p->num_bits+$q->num_bits;
+$e=SSLeay::BN::hex2bn("10001");
+
+$t1=$p-1;
+$t2=$q-1;
+
+($t1->gcd($e) == 1) || die "p failed the gcd test\n";
+($t2->gcd($e) == 1) || die "q failed the gcd test\n";
+
+($q,$p)=($p,$q) if ($p < $q);
+$n=$p*$q;
+$t=($p-1)*($q-1);
+($t->gcd($e) == 1) || die "t failed the gcd test\n";
+
+$d=$e->mod_inverse($t);
+
+$dmp1=$d%($p-1);
+$dmq1=$d%($q-1);
+$iqmp=$q->mod_inverse($p);
+
+print "n   =$n\n";
+print "e   =$e\n";
+print "d   =$d\n";
+print "dmp1=$dmp1\n";
+print "dmq1=$dmq1\n";
+print "iqmp=$iqmp\n";
+
+$a=SSLeay::BN::bin2bn("This is an RSA test");
+print "Test with\n'".$a->bn2bin."' or\n$a\n";
+
+print "<$a>\n";
+$t1=$a->mod_exp($e,$n);
+print ">$t1>\n";
+$t2=$t1->mod_exp($d,$n);
+print "<$t2>\n";
+
+
diff --git a/src/lib/libssl/src/perl/s.pl b/src/lib/libssl/src/perl/s.pl
new file mode 100644
index 0000000000..1d438a6765
--- /dev/null
+++ b/src/lib/libssl/src/perl/s.pl
@@ -0,0 +1,72 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$ssl_ctx=SSL::CTX->new("SSLv3_client");
+
+$ssl_ctx->set_options("-info_callback" =>
+        sub     {
+                print STDERR $_[0]->state()."\n";
+                }
+        );
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+$cbio=BIO->new("connect");
+$cbio->hostname($conn) || die $ssl->error();
+
+$bbio=BIO->new("buffer");
+
+$sbio=BIO->new("ssl");
+$ssl=$ssl_ctx->new_ssl;
+$ssl->set_options(-connect_state);
+$sbio->set_ssl($ssl);
+
+$sbio->push($cbio);
+$bbio->push($sbio);
+$bio=$bbio;
+
+#$bio->set_callback(
+#       sub     {
+#               my($bio,$state,$cmd,$buf,$lart,$ret)=@_;
+#               print STDERR "$state:$cmd\n";
+#               return($ret);
+#               }
+#       );
+
+$b=$bio;
+do      {
+        print STDERR $b->type."\n";
+        } while ($b=$b->next_bio);
+
+(($ret=$bio->syswrite("GET / HTTP/1.0\r\n\r\n")) > 0) || die $bio->error();
+$bio->flush;
+
+$data="";
+while (1)
+        {
+        $ret=$bio->getline;
+        $ret =~ s/[\r\n]//g;
+        print STDERR "$ret\n";
+        last if $ret eq "";
+        $server=$1 if $ret=~ /^Server: (.*)/;
+        }
+
+
+print "server is $server\n";
+$x509=$ssl->get_peer_certificate();
+print "version     :".$x509->get_version()."\n";
+print "serialNumber:".$x509->get_serialNumber()->bn2hex."\n";
+print "subject     :".$x509->get_subject_name()."\n";
+print "issuer      :". $x509->get_issuer_name()."\n";
+
+$c=$ssl->get_current_cipher;
+($i,$a)=$c->get_bits;
+$v=$c->get_version;
+$n=$c->get_name;
+
+print "protocol=".$ssl->get_version."\n";
+print "bits=$i($a) cipher type=$v cipher=$n\n";
+
diff --git a/src/lib/libssl/src/perl/s2.pl b/src/lib/libssl/src/perl/s2.pl
new file mode 100644
index 0000000000..d39b4b8e25
--- /dev/null
+++ b/src/lib/libssl/src/perl/s2.pl
@@ -0,0 +1,49 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$ssl_ctx=SSL::CTX->new("SSLv3");
+
+$ssl_ctx->set_options("-info_callback" =>
+        sub     {
+                print STDERR $_[0]->state()."\n";
+                }
+        );
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+$cbio=BIO->new("connect");
+$cbio->hostname($conn) || die $ssl->error();
+
+$ssl=$ssl_ctx->new_ssl;
+$sbio=BIO->new("ssl");
+$sbio->set_ssl($ssl);
+$ssl->set_options("-connect_state");
+
+$bio=BIO->new("buffer");
+
+$sbio->push($cbio);
+$bio->push($sbio);
+
+($bio->do_handshake() > 0) || die $bio->error();
+
+(($ret=$bio->syswrite("GET / HTTP/1.0\r\n\r\n")) > 0) || die $ssl->error();
+$bio->flush() || die $bio->error();
+
+$data="";
+while ($_=$bio->getline())
+        {
+        if (/^Server:/)
+                {
+                print;
+                last;
+                }
+        }
+
+if ($bio->peek_error())
+        {
+        print "There was an error:".$ssl->error();
+        }
+print "exit\n";
diff --git a/src/lib/libssl/src/perl/server.pem b/src/lib/libssl/src/perl/server.pem
new file mode 100644
index 0000000000..eabb927036
--- /dev/null
+++ b/src/lib/libssl/src/perl/server.pem
@@ -0,0 +1,369 @@
+issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
+subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Server test cert (512 bit)
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAVICAQAwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
+BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
+VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNOTcwNjA5MTM1NzQ2WhcNOTgwNjA5
+MTM1NzQ2WjBjMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
+A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxIzAhBgNVBAMTGlNlcnZlciB0ZXN0IGNl
+cnQgKDUxMiBiaXQpMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ+zw4Qnlf8SMVIP
+Fe9GEcStgOY2Ww/dgNdhjeD8ckUJNP5VZkVDTGiXav6ooKXfX3j/7tdkuD8Ey2//
+Kv7+ue0CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB4TMR2CvacKE9wAsu9jyCX8YiW
+mgCM+YoP6kt4Zkj2z5IRfm7WrycKsnpnOR+tGeqAjkCeZ6/36o9l91RvPnN1VJ/i
+xQv2df0KFeMr00IkDdTNAdIWqFkSsZTAY2QAdgenb7MB1joejquYzO2DQIO7+wpH
+irObpESxAZLySCmPPg==
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIBPAIBAAJBAJ+zw4Qnlf8SMVIPFe9GEcStgOY2Ww/dgNdhjeD8ckUJNP5VZkVD
+TGiXav6ooKXfX3j/7tdkuD8Ey2//Kv7+ue0CAwEAAQJAN6W31vDEP2DjdqhzCDDu
+OA4NACqoiFqyblo7yc2tM4h4xMbC3Yx5UKMN9ZkCtX0gzrz6DyF47bdKcWBzNWCj
+gQIhANEoojVt7hq+SQ6MCN6FTAysGgQf56Q3TYoJMoWvdiXVAiEAw3e3rc+VJpOz
+rHuDo6bgpjUAAXM+v3fcpsfZSNO6V7kCIQCtbVjanpUwvZkMI9by02oUk9taki3b
+PzPfAfNPYAbCJQIhAJXNQDWyqwn/lGmR11cqY2y9nZ1+5w3yHGatLrcDnQHxAiEA
+vnlEGo8K85u+KwIOimM48ZG8oTk7iFdkqLJR1utT3aU=
+-----END RSA PRIVATE KEY-----
+subject=/C=US/O=AT&T Bell Laboratories/OU=Prototype Research CA
+issuer= /C=US/O=AT&T Bell Laboratories/OU=Prototype Research CA
+notBefore=950413210656Z
+notAfter =970412210656Z
+-----BEGIN X509 CERTIFICATE-----
+
+MIICCDCCAXECAQAwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoUFkFUJlQgQmVsbCBMYWJvcmF0b3JpZXMxHjAcBgNVBAsUFVByb3RvdHlwZSBS
+ZXNlYXJjaCBDQTAeFw05NTA0MTMyMTA2NTZaFw05NzA0MTIyMTA2NTZaME4xCzAJ
+BgNVBAYTAlVTMR8wHQYDVQQKFBZBVCZUIEJlbGwgTGFib3JhdG9yaWVzMR4wHAYD
+VQQLFBVQcm90b3R5cGUgUmVzZWFyY2ggQ0EwgZwwDQYJKoZIhvcNAQEBBQADgYoA
+MIGGAoGAebOmgtSCl+wCYZc86UGYeTLY8cjmW2P0FN8ToT/u2pECCoFdrlycX0OR
+3wt0ZhpFXLVNeDnHwEE9veNUih7pCL2ZBFqoIoQkB1lZmXRiVtjGonz8BLm/qrFM
+YHb0lme/Ol+s118mwKVxnn6bSAeI/OXKhLaVdYZWk+aEaxEDkVkCAQ8wDQYJKoZI
+hvcNAQEEBQADgYEAAZMG14lZmZ8bahkaHaTV9dQf4p2FZiQTFwHP9ZyGsXPC+LT5
+dG5iTaRmyjNIJdPWohZDl97kAci79aBndvuEvRKOjLHs3WRGBIwERnAcnY9Mz8u/
+zIHK23PjYVxGGaZd669OJwD0CYyqH22HH9nFUGaoJdsv39ChW0NRdLE9+y8=
+-----END X509 CERTIFICATE-----
+issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
+subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
+-----BEGIN CERTIFICATE-----
+MIICJjCCAY8CAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
+BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
+VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTc0M1oXDTAxMDYw
+OTEzNTc0M1owWzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
+BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYDVQQDExJUZXN0IENBICgxMDI0
+IGJpdCkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKO7o8t116VP6cgybTsZ
+DCZhr95nYlZuya3aCi1IKoztqwWnjbmDFIriOqGFPrZQ+moMETC9D59iRW/dFXSv
+1F65ka/XY2hLh9exCCo7XuUcDs53Qp3bI3AmMqHjgzE8oO3ajyJAzJkTTOUecQU2
+mw/gI4tMM0LqWMQS7luTy4+xAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAM7achv3v
+hLQJcv/65eGEpBXM40ZDVoFQFFJWaY5p883HTqLB1x4FdzsXHH0QKBTcKpWwqyu4
+YDm3fb8oDugw72bCzfyZK/zVZPR/hVlqI/fvU109Qoc+7oPvIXWky71HfcK6ZBCA
+q30KIqGM/uoM60INq97qjDmCJapagcNBGQs=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCju6PLddelT+nIMm07GQwmYa/eZ2JWbsmt2gotSCqM7asFp425
+gxSK4jqhhT62UPpqDBEwvQ+fYkVv3RV0r9ReuZGv12NoS4fXsQgqO17lHA7Od0Kd
+2yNwJjKh44MxPKDt2o8iQMyZE0zlHnEFNpsP4COLTDNC6ljEEu5bk8uPsQIDAQAB
+AoGAVZmpFZsDZfr0l2S9tLLwpjRWNOlKATQkno6q2WesT0eGLQufTciY+c8ypfU6
+hyio8r5iUl/VhhdjhAtKx1mRpiotftHo/eYf8rtsrnprOnWG0bWjLjtIoMbcxGn2
+J3bN6LJmbJMjDs0eJ3KnTu646F3nDUw2oGAwmpzKXA1KAP0CQQDRvQhxk2D3Pehs
+HvG665u2pB5ipYQngEFlZO7RHJZzJOZEWSLuuMqaF/7pTfA5jiBvWqCgJeCRRInL
+21ru4dlPAkEAx9jj7BgKn5TYnMoBSSe0afjsV9oApVpN1Nacb1YDtCwy+scp3++s
+nFxlv98wxIlSdpwMUn+AUWfjiWR7Tu/G/wJBAJ/KjwZIrFVxewP0x2ILYsTRYLzz
+MS4PDsO7FB+I0i7DbBOifXS2oNSpd3I0CNMwrxFnUHzynpbOStVfN3ZL5w0CQQCa
+pwFahxBRhkJKsxhjoFJBX9yl75JoY4Wvm5Tbo9ih6UJaRx3kqfkN14L2BKYcsZgb
+KY9vmDOYy6iNfjDeWTfJAkBkfPUb8oTJ/nSP5zN6sqGxSY4krc4xLxpRmxoJ8HL2
+XfhqXkTzbU13RX9JJ/NZ8vQN9Vm2NhxRGJocQkmcdVtJ
+-----END RSA PRIVATE KEY-----
+-----BEGIN X509 CERTIFICATE-----
+MIICYDCCAiACAgEoMAkGBSsOAwINBQAwfDELMAkGA1UEBhMCVVMxNjA0BgNVBAoT
+LU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEZ
+MBcGA1UECxMQVGVzdCBFbnZpcm9ubWVudDEaMBgGA1UECxMRRFNTLU5BU0EtUGls
+b3QtQ0EwHhcNOTYwMjI2MTYzMjQ1WhcNOTcwMjI1MTYzMjQ1WjB8MQswCQYDVQQG
+EwJVUzE2MDQGA1UEChMtTmF0aW9uYWwgQWVyb25hdXRpY3MgYW5kIFNwYWNlIEFk
+bWluaXN0cmF0aW9uMRkwFwYDVQQLExBUZXN0IEVudmlyb25tZW50MRowGAYDVQQL
+ExFEU1MtTkFTQS1QaWxvdC1DQTCB8jAJBgUrDgMCDAUAA4HkADCB4AJBAMA/ssKb
+hPNUG7ZlASfVwEJU21O5OyF/iyBzgHI1O8eOhJGUYO8cc8wDMjR508Mr9cp6Uhl/
+ZB7FV5GkLNEnRHYCQQDUEaSg45P2qrDwixTRhFhmWz5Nvc4lRFQ/42XPcchiJBLb
+bn3QK74T2IxY1yY+kCNq8XrIqf5fJJzIH0J/xUP3AhUAsg2wsQHfDGYk/BOSulX3
+fVd0geUCQQCzCFUQAh+ZkEmp5804cs6ZWBhrUAfnra8lJItYo9xPcXgdIfLfibcX
+R71UsyO77MRD7B0+Ag2tq794IleCVcEEMAkGBSsOAwINBQADLwAwLAIUUayDfreR
+Yh2WeU86/pHNdkUC1IgCFEfxe1f0oMpxJyrJ5XIxTi7vGdoK
+-----END X509 CERTIFICATE-----
+-----BEGIN X509 CERTIFICATE-----
+
+MIICGTCCAdgCAwCqTDAJBgUrDgMCDQUAMHwxCzAJBgNVBAYTAlVTMTYwNAYDVQQK
+Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x
+GTAXBgNVBAsTEFRlc3QgRW52aXJvbm1lbnQxGjAYBgNVBAsTEURTUy1OQVNBLVBp
+bG90LUNBMB4XDTk2MDUxNDE3MDE0MVoXDTk3MDUxNDE3MDE0MVowMzELMAkGA1UE
+BhMCQVUxDzANBgNVBAoTBk1pbmNvbTETMBEGA1UEAxMKRXJpYyBZb3VuZzCB8jAJ
+BgUrDgMCDAUAA4HkADCB4AJBAKbfHz6vE6pXXMTpswtGUec2tvnfLJUsoxE9qs4+
+ObZX7LmLvragNPUeiTJx7UOWZ5DfBj6bXLc8eYne0lP1g3ACQQDUEaSg45P2qrDw
+ixTRhFhmWz5Nvc4lRFQ/42XPcchiJBLbbn3QK74T2IxY1yY+kCNq8XrIqf5fJJzI
+H0J/xUP3AhUAsg2wsQHfDGYk/BOSulX3fVd0geUCQQCzCFUQAh+ZkEmp5804cs6Z
+WBhrUAfnra8lJItYo9xPcXgdIfLfibcXR71UsyO77MRD7B0+Ag2tq794IleCVcEE
+MAkGBSsOAwINBQADMAAwLQIUWsuuJRE3VT4ueWkWMAJMJaZjj1ECFQCYY0zX4bzM
+LC7obsrHD8XAHG+ZRG==
+-----END X509 CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICTTCCAbagAwIBAgIBADANBgkqhkiG9w0BAQQFADBMMQswCQYDVQQGEwJHQjEM
+MAoGA1UEChMDVUNMMRgwFgYDVQQLEw9JQ0UtVEVMIFByb2plY3QxFTATBgNVBAMT
+DFRydXN0RmFjdG9yeTAeFw05NzA0MjIxNDM5MTRaFw05ODA0MjIxNDM5MTRaMEwx
+CzAJBgNVBAYTAkdCMQwwCgYDVQQKEwNVQ0wxGDAWBgNVBAsTD0lDRS1URUwgUHJv
+amVjdDEVMBMGA1UEAxMMVHJ1c3RGYWN0b3J5MIGcMAoGBFUIAQECAgQAA4GNADCB
+iQKBgQCEieR8NcXkUW1f0G6aC6u0i8q/98JqS6RxK5YmHIGKCkuTWAUjzLfUa4dt
+U9igGCjTuxaDqlzEim+t/02pmiBZT9HaX++35MjQPUWmsChcYU5WyzGErXi+rQaw
+zlwS73zM8qiPj/97lXYycWhgL0VaiDSPxRXEUdWoaGruom4mNQIDAQABo0IwQDAd
+BgNVHQ4EFgQUHal1LZr7oVg5z6lYzrhTgZRCmcUwDgYDVR0PAQH/BAQDAgH2MA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAfaggfl6FZoioecjv0dq8
+/DXo/u11iMZvXn08gjX/zl2b4wtPbShOSY5FhkSm8GeySasz+/Nwb/uzfnIhokWi
+lfPZHtlCWtXbIy/TN51eJyq04ceDCQDWvLC2enVg9KB+GJ34b5c5VaPRzq8MBxsA
+S7ELuYGtmYgYm9NZOIr7yU0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIB6jCCAZQCAgEtMA0GCSqGSIb3DQEBBAUAMIGAMQswCQYDVQQGEwJVUzE2MDQG
+A1UEChMtTmF0aW9uYWwgQWVyb25hdXRpY3MgYW5kIFNwYWNlIEFkbWluaXN0cmF0
+aW9uMRkwFwYDVQQLExBUZXN0IEVudmlyb25tZW50MR4wHAYDVQQLExVNRDUtUlNB
+LU5BU0EtUGlsb3QtQ0EwHhcNOTYwNDMwMjIwNTAwWhcNOTcwNDMwMjIwNTAwWjCB
+gDELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu
+ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEZMBcGA1UECxMQVGVzdCBFbnZpcm9ubWVu
+dDEeMBwGA1UECxMVTUQ1LVJTQS1OQVNBLVBpbG90LUNBMFkwCgYEVQgBAQICAgAD
+SwAwSAJBALmmX5+GqAvcrWK13rfDrNX9UfeA7f+ijyBgeFQjYUoDpFqapw4nzQBL
+bAXug8pKkRwa2Zh8YODhXsRWu2F/UckCAwEAATANBgkqhkiG9w0BAQQFAANBAH9a
+OBA+QCsjxXgnSqHx04gcU8S49DVUb1f2XVoLnHlIb8RnX0k5O6mpHT5eti9bLkiW
+GJNMJ4L0AJ/ac+SmHZc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICajCCAdMCBDGA0QUwDQYJKoZIhvcNAQEEBQAwfTELMAkGA1UEBhMCQ2ExDzAN
+BgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmlsaXR5IEFjY2VwdGVkMR8w
+HQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRwwGgYDVQQDExNFbnRydXN0
+IERlbW8gV2ViIENBMB4XDTk2MDQyNjEzMzUwMVoXDTA2MDQyNjEzMzUwMVowfTEL
+MAkGA1UEBhMCQ2ExDzANBgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmls
+aXR5IEFjY2VwdGVkMR8wHQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRww
+GgYDVQQDExNFbnRydXN0IERlbW8gV2ViIENBMIGdMA0GCSqGSIb3DQEBAQUAA4GL
+ADCBhwKBgQCaroS7O1DA0hm4IefNYU1cx/nqOmzEnk291d1XqznDeF4wEgakbkCc
+zTKxK791yNpXG5RmngqH7cygDRTHZJ6mfCRn0wGC+AI00F2vYTGqPGRQL1N3lZT0
+YDKFC0SQeMMjFIZ1aeQigroFQnHo0VB3zWIMpNkka8PY9lxHZAmWwQIBAzANBgkq
+hkiG9w0BAQQFAAOBgQBAx0UMVA1s54lMQyXjMX5kj99FJN5itb8bK1Rk+cegPQPF
+cWO9SEWyEjjBjIkjjzAwBkaEszFsNGxemxtXvwjIm1xEUMTVlPEWTs2qnDvAUA9W
+YqhWbhH0toGT36236QAsqCZ76rbTRVSSX2BHyJwJMG2tCRv7kRJ//NIgxj3H4w==
+-----END CERTIFICATE-----
+
+issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
+subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
+-----BEGIN CERTIFICATE-----
+MIICJzCCAZACAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
+BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
+VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTczN1oXDTAxMDYw
+OTEzNTczN1owXDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
+BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYDVQQDExNUZXN0IFBDQSAoMTAy
+NCBiaXQpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdoWk/3+WcMlfjIrkg
+40ketmnQaEogQe1LLcuOJV6rKfUSAsPgwgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp
+22Jp85PmemiDzyUIStwk72qhp1imbANZvlmlCFKiQrjUyuDfu4TABmn+kkt3vR1Y
+BEOGt+IFye1UBVSATVdRJ2UVhwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABNA1u/S
+Cg/LJZWb7GliiKJsvuhxlE4E5JxQF2zMub/CSNbF97//tYSyj96sxeFQxZXbcjm9
+xt6mr/xNLA4szNQMJ4P+L7b5e/jC5DSqlwS+CUYJgaFs/SP+qJoCSu1bR3IM9XWO
+cRBpDmcBbYLkSyB92WURvsZ1LtjEcn+cdQVI
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCdoWk/3+WcMlfjIrkg40ketmnQaEogQe1LLcuOJV6rKfUSAsPg
+wgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp22Jp85PmemiDzyUIStwk72qhp1imbANZ
+vlmlCFKiQrjUyuDfu4TABmn+kkt3vR1YBEOGt+IFye1UBVSATVdRJ2UVhwIDAQAB
+AoGAba4fTtuap5l7/8ZsbE7Z1O32KJY4ZcOZukLOLUUhXxXduT+FTgGWujc0/rgc
+z9qYCLlNZHOouMYTgtSfYvuMuLZ11VIt0GYH+nRioLShE59Yy+zCRyC+gPigS1kz
+xvo14AsOIPYV14Tk/SsHyq6E0eTk7VzaIE197giiINUERPECQQDSKmtPTh/lRKw7
+HSZSM0I1mFWn/1zqrAbontRQY5w98QWIOe5qmzYyFbPXYT3d9BzlsMyhgiRNoBbD
+yvohSHXJAkEAwAHx6ezAZeWWzD5yXD36nyjpkVCw7Tk7TSmOceLJMWt1QcrCfqlS
+xA5jjpQ6Z8suU5DdtWAryM2sAir1WisYzwJAd6Zcx56jvAQ3xcPXsE6scBTVFzrj
+7FqZ6E+cclPzfLQ+QQsyOBE7bpI6e/FJppY26XGZXo3YGzV8IGXrt40oOQJALETG
+h86EFXo3qGOFbmsDy4pdP5nBERCu8X1xUCSfintiD4c2DInxgS5oGclnJeMcjTvL
+QjQoJCX3UJCi/OUO1QJBAKgcDHWjMvt+l1pjJBsSEZ0HX9AAIIVx0RQmbFGS+F2Q
+hhu5l77WnnZOQ9vvhV5u7NPCUF9nhU3jh60qWWO8mkc=
+-----END RSA PRIVATE KEY-----
+subject=/C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
+issuer= /C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
+notBefore=941104185834Z
+notAfter =991103185834Z
+-----BEGIN X509 CERTIFICATE-----
+
+MIICIzCCAZACBQJBAAAWMA0GCSqGSIb3DQEBAgUAMFwxCzAJBgNVBAYTAlVTMSAw
+HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVy
+Y2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDQxODU4MzRaFw05
+OTExMDMxODU4MzRaMFwxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0YSBT
+ZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVyY2lhbCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCk+4Fie84QJ93o
+975sbsZwmdu41QUDaSiCnHJ/lj+O7Kwpkj+KFPhCdr69XQO5kNTQvAayUTNfxMK/
+touPmbZiImDd298ggrTKoi8tUO2UMt7gVY3UaOLgTNLNBRYulWZcYVI4HlGogqHE
+7yXpCuaLK44xZtn42f29O2nZ6wIDAQABMA0GCSqGSIb3DQEBAgUAA34AdrW2EP4j
+9/dZYkuwX5zBaLxJu7NJbyFHXSudVMQAKD+YufKKg5tgf+tQx6sFEC097TgCwaVI
+0v5loMC86qYjFmZsGySp8+x5NRhPJsjjr1BKx6cxa9B8GJ1Qv6km+iYrRpwUqbtb
+MJhCKLVLU7tDCZJAuqiqWqTGtotXTcU=
+-----END X509 CERTIFICATE-----
+subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
+issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
+notBefore=941109235417Z
+notAfter =991231235417Z
+-----BEGIN X509 CERTIFICATE-----
+
+MIICKTCCAZYCBQJBAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw
+HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl
+IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDkyMzU0MTda
+Fw05OTEyMzEyMzU0MTdaMF8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0
+YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJlIFNlcnZlciBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCSznrB
+roM+WqqJg1esJQF2DK2ujiw3zus1eGRUA+WEQFHJv48I4oqCCNIWhjdV6bEhAq12
+aIGaBaJLyUslZiJWbIgHj/eBWW2EB2VwE3F2Ppt3TONQiVaYSLkdpykaEy5KEVmc
+HhXVSVQsczppgrGXOZxtcGdI5d0t1sgeewIDAQABMA0GCSqGSIb3DQEBAgUAA34A
+iNHReSHO4ovo+MF9NFM/YYPZtgs4F7boviGNjwC4i1N+RGceIr2XJ+CchcxK9oU7
+suK+ktPlDemvXA4MRpX/oRxePug2WHpzpgr4IhFrwwk4fia7c+8AvQKk8xQNMD9h
+cHsg/jKjn7P0Z1LctO6EjJY2IN6BCINxIYoPnqk=
+-----END X509 CERTIFICATE-----
+subject=/C=ZA/SP=Western Cape/L=Cape Town/O=Thawte Consulting cc
+        /OU=Certification Services Division/CN=Thawte Server CA
+        /Email=server-certs@thawte.com
+issuer= /C=ZA/SP=Western Cape/L=Cape Town/O=Thawte Consulting cc
+        /OU=Certification Services Division/CN=Thawte Server CA
+        /Email=server-certs@thawte.com
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAmICAQAwDQYJKoZIhvcNAQEEBQAwgcQxCzAJBgNVBAYTAlpBMRUwEwYD
+VQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
+VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
+dmljZXMgRGl2aXNpb24xGTAXBgNVBAMTEFRoYXd0ZSBTZXJ2ZXIgQ0ExJjAkBgkq
+hkiG9w0BCQEWF3NlcnZlci1jZXJ0c0B0aGF3dGUuY29tMB4XDTk2MDcyNzE4MDc1
+N1oXDTk4MDcyNzE4MDc1N1owgcQxCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0
+ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENv
+bnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
+aXNpb24xGTAXBgNVBAMTEFRoYXd0ZSBTZXJ2ZXIgQ0ExJjAkBgkqhkiG9w0BCQEW
+F3NlcnZlci1jZXJ0c0B0aGF3dGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQDTpFBuyP9Wa+bPXbbqDGh1R6KqwtqEJfyo9EdR2oW1IHSUhh4PdcnpCGH1
+Bm0wbhUZAulSwGLbTZme4moMRDjN/r7jZAlwxf6xaym2L0nIO9QnBCUQly/nkG3A
+KEKZ10xD3sP1IW1Un13DWOHA5NlbsLjctHvfNjrCtWYiEtaHDQIDAQABMA0GCSqG
+SIb3DQEBBAUAA4GBAIsvn7ifX3RUIrvYXtpI4DOfARkTogwm6o7OwVdl93yFhDcX
+7h5t0XZ11MUAMziKdde3rmTvzUYIUCYoY5b032IwGMTvdiclK+STN6NP2m5nvFAM
+qJT5gC5O+j/jBuZRQ4i0AMYQr5F4lT8oBJnhgafw6PL8aDY2vMHGSPl9+7uf
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDDTCCAnYCAQAwDQYJKoZIhvcNAQEEBQAwgc4xCzAJBgNVBAYTAlpBMRUwEwYD
+VQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
+VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
+dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBD
+QTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTAeFw05
+NjA3MjcxODA3MTRaFw05ODA3MjcxODA3MTRaMIHOMQswCQYDVQQGEwJaQTEVMBMG
+A1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xHTAbBgNVBAoT
+FFRoYXd0ZSBDb25zdWx0aW5nIGNjMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzIERpdmlzaW9uMSEwHwYDVQQDExhUaGF3dGUgUHJlbWl1bSBTZXJ2ZXIg
+Q0ExKDAmBgkqhkiG9w0BCQEWGXByZW1pdW0tc2VydmVyQHRoYXd0ZS5jb20wgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANI2NmqL18JbntqBQWKPOO5JBFXW0O8c
+G5UWR+8YSDU6UvQragaPOy/qVuOvho2eF/eetGV1Ak3vywmiIVHYm9Bn0LoNkgYU
+c9STy5cqAJxcTgy8+hVS/PJEbtoRSm4Iny8t4/mqOoZztkZTWMiJBb2DEbhzP6oH
+jfRCTedAnRw3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAutFIgTRZVYerIZfL9lvR
+w9Eifvvo5KTZ3h+Bj+VzNnyw4Qc/IyXkPOu6SIiH9LQ3sCmWBdxpe+qr4l77rLj2
+GYuMtESFfn1XVALzkYgC7JcPuTOjMfIiMByt+uFf8AV8x0IW/Qkuv+hEQcyM9vxK
+3VZdLbCVIhNoEsysrxCpxcI=
+-----END CERTIFICATE-----
+Tims test GCI CA
+
+-----BEGIN CERTIFICATE-----
+MIIB8DCCAZoCAQAwDQYJKoZIhvcNAQEEBQAwgYIxCzAJBgNVBAYTAkFVMRMwEQYD
+VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
+cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2RldmVsb3BtZW50MRkwFwYDVQQDExBD
+cnlwdFNvZnQgRGV2IENBMB4XDTk3MDMyMjEzMzQwNFoXDTk4MDMyMjEzMzQwNFow
+gYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC
+cmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2Rl
+dmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQgRGV2IENBMFwwDQYJKoZIhvcN
+AQEBBQADSwAwSAJBAOAOAqogG5QwAmLhzyO4CoRnx/wVy4NZP4dxJy83O1EnL0rw
+OdsamJKvPOLHgSXo3gDu9uVyvCf/QJmZAmC5ml8CAwEAATANBgkqhkiG9w0BAQQF
+AANBADRRS/GVdd7rAqRW6SdmgLJduOU2yq3avBu99kRqbp9A/dLu6r6jU+eP4oOA
+TfdbFZtAAD2Hx9jUtY3tfdrJOb8= 
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICVjCCAgACAQAwDQYJKoZIhvcNAQEEBQAwgbUxCzAJBgNVBAYTAkFVMRMwEQYD
+VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
+cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsTI1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9O
+IEFVVEhPUklUSUVTMTQwMgYDVQQDEytaRVJPIFZBTFVFIENBIC0gREVNT05TVFJB
+VElPTiBQVVJQT1NFUyBPTkxZMB4XDTk3MDQwMzEzMjI1NFoXDTk4MDQwMzEzMjI1
+NFowgbUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
+EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsT
+I1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9OIEFVVEhPUklUSUVTMTQwMgYDVQQDEyta
+RVJPIFZBTFVFIENBIC0gREVNT05TVFJBVElPTiBQVVJQT1NFUyBPTkxZMFwwDQYJ
+KoZIhvcNAQEBBQADSwAwSAJBAOZ7T7yqP/tyspcko3yPY1y0Cm2EmwNvzW4QgVXR
+Fjs3HmJ4xtSpXdo6mwcGezL3Abt/aQXaxv9PU8xt+Jr0OFUCAwEAATANBgkqhkiG
+9w0BAQQFAANBAOQpYmGgyCqCy1OljgJhCqQOu627oVlHzK1L+t9vBaMfn40AVUR4
+WzQVWO31KTgi5vTK1U+3h46fgUWqQ0h+6rU=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIAwgKADAgECAgEAMA0GCSqGSIb3DQEBBAUAMGIxETAPBgNVBAcTCEludGVybmV0
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xh
+c3MgMSBDQSAtIEluZGl2aWR1YWwgU3Vic2NyaWJlcjAeFw05NjA0MDgxMDIwMjda
+Fw05NzA0MDgxMDIwMjdaMGIxETAPBgNVBAcTCEludGVybmV0MRcwFQYDVQQKEw5W
+ZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xhc3MgMSBDQSAtIElu
+ZGl2aWR1YWwgU3Vic2NyaWJlcjCAMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2
+FKbPTdAFDdjKI9BvqrQpkmOOLPhvltcunXZLEbE2jVfJw/0cxrr+Hgi6M8qV6r7j
+W80GqLd5HUQq7XPysVKDaBBwZJHXPmv5912dFEObbpdFmIFH0S3L3bty10w/cari
+QPJUObwW7s987LrbP2wqsxaxhhKdrpM01bjV0Pc+qQIDAQABAAAAADANBgkqhkiG
+9w0BAQQFAAOBgQA+1nJryNt8VBRjRr07ArDAV/3jAH7GjDc9jsrxZS68ost9v06C
+TvTNKGL+LISNmFLXl+JXhgGB0JZ9fvyYzNgHQ46HBUng1H6voalfJgS2KdEo50wW
+8EFZYMDkT1k4uynwJqkVN2QJK/2q4/A/VCov5h6SlM8Affg2W+1TLqvqkwAA
+-----END CERTIFICATE-----
+
+ subject=/L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
+ issuer= /L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
+
+-----BEGIN CERTIFICATE-----
+MIIEkzCCA/ygAwIBAgIRANDTUpSRL3nTFeMrMayFSPAwDQYJKoZIhvcNAQECBQAw
+YjERMA8GA1UEBxMISW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQw
+MgYDVQQLEytWZXJpU2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3Jp
+YmVyMB4XDTk2MDYwNDAwMDAwMFoXDTk4MDYwNDIzNTk1OVowYjERMA8GA1UEBxMI
+SW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQwMgYDVQQLEytWZXJp
+U2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQC6A+2czKGRcYMfm8gdnk+0de99TDDzsqo0v5nb
+RsbUmMcdRQ7nsMbRWe0SAb/9QoLTZ/cJ0iOBqdrkz7UpqqKarVoTSdlSMVM92tWp
+3bJncZHQD1t4xd6lQVdI1/T6R+5J0T1ukOdsI9Jmf+F28S6g3R3L1SFwiHKeZKZv
+z+793wIDAQABo4ICRzCCAkMwggIpBgNVHQMBAf8EggIdMIICGTCCAhUwggIRBgtg
+hkgBhvhFAQcBATCCAgAWggGrVGhpcyBjZXJ0aWZpY2F0ZSBpbmNvcnBvcmF0ZXMg
+YnkgcmVmZXJlbmNlLCBhbmQgaXRzIHVzZSBpcyBzdHJpY3RseSBzdWJqZWN0IHRv
+LCB0aGUgVmVyaVNpZ24gQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQg
+KENQUyksIGF2YWlsYWJsZSBhdDogaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL0NQ
+Uy0xLjA7IGJ5IEUtbWFpbCBhdCBDUFMtcmVxdWVzdHNAdmVyaXNpZ24uY29tOyBv
+ciBieSBtYWlsIGF0IFZlcmlTaWduLCBJbmMuLCAyNTkzIENvYXN0IEF2ZS4sIE1v
+dW50YWluIFZpZXcsIENBIDk0MDQzIFVTQSBUZWwuICsxICg0MTUpIDk2MS04ODMw
+IENvcHlyaWdodCAoYykgMTk5NiBWZXJpU2lnbiwgSW5jLiAgQWxsIFJpZ2h0cyBS
+ZXNlcnZlZC4gQ0VSVEFJTiBXQVJSQU5USUVTIERJU0NMQUlNRUQgYW5kIExJQUJJ
+TElUWSBMSU1JVEVELqAOBgxghkgBhvhFAQcBAQGhDgYMYIZIAYb4RQEHAQECMC8w
+LRYraHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvQ1BTLTEuMDAU
+BglghkgBhvhCAQEBAf8EBAMCAgQwDQYJKoZIhvcNAQECBQADgYEApRJRkNBqLLgs
+53IR/d18ODdLOWMTZ+QOOxBrq460iBEdUwgF8vmPRX1ku7UiDeNzaLlurE6eFqHq
+2zPyK5j60zfTLVJMWKcQWwTJLjHtXrW8pxhNtFc6Fdvy5ZkHnC/9NIl7/t4U6WqB
+p4y+p7SdMIkEwIZfds0VbnQyX5MRUJY=
+-----END CERTIFICATE-----
+
+ subject=/C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
+ issuer= /C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZoCBQKhAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
+Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
+biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyVxZ
+nvIbigEUtBDfBEDb41evakVAj4QMC9Ez2dkRz+4CWB8l9yqoRAWq7AMfeH+ek7ma
+AKojfdashaJjRcdyJ8z0TMZ1cdI5709C8HXfCpDGjiBvmA/4rCNfcCk2pMmG57Ga
+IMtTpYXnPb59mv4kRTPcdhXtD6JxZExlLoFoRacCAwEAATANBgkqhkiG9w0BAQIF
+AAOBgQB1Zmw+0c2B27X4LzZRtvdCvM1Cr9wO+hVs+GeTVzrrtpLotgHKjLeOQ7RJ
+Zfk+7r11Ri7J/CVdqMcvi5uPaM+0nJcYwE3vH9mvgrPmZLiEXIqaB1JDYft0nls6
+NvxMsvwaPxUupVs8G5DsiCnkWRb5zget7Ond2tIxik/W2O8XjQ==
+-----END CERTIFICATE-----
+ subject=/C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
+ issuer= /C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZoCBQKmAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
+Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
+biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0LJ1
+9njQrlpQ9OlQqZ+M1++RlHDo0iSQdomF1t+s5gEXMoDwnZNHvJplnR+Xrr/phnVj
+IIm9gFidBAydqMEk6QvlMXi9/C0MN2qeeIDpRnX57aP7E3vIwUzSo+/1PLBij0pd
+O92VZ48TucE81qcmm+zDO3rZTbxtm+gVAePwR6kCAwEAATANBgkqhkiG9w0BAQIF
+AAOBgQBT3dPwnCR+QKri/AAa19oM/DJhuBUNlvP6Vxt/M3yv6ZiaYch6s7f/sdyZ
+g9ysEvxwyR84Qu1E9oAuW2szaayc01znX1oYx7EteQSWQZGZQbE8DbqEOcY7l/Am
+yY7uvcxClf8exwI/VAx49byqYHwCaejcrOICdmHEPgPq0ook0Q==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/perl/ss.pl b/src/lib/libssl/src/perl/ss.pl
new file mode 100644
index 0000000000..f243a3af50
--- /dev/null
+++ b/src/lib/libssl/src/perl/ss.pl
@@ -0,0 +1,64 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$ssl_ctx=SSL::CTX->new("SSLv3_client");
+
+#$ssl_ctx->set_options("-info_callback" =>
+#       sub     {
+#               print STDERR $_[0]->state()."\n";
+#               }
+#       );
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+
+print $ssl_ctx."\n";
+$bio=BIO->new_buffer_ssl_connect($ssl_ctx);
+$bio->hostname($conn) || die $bio->error();
+
+#$bio->set_callback(
+#       sub     {
+#               my($bio,$state,$cmd,$buf,$lart,$ret)=@_;
+#               print STDERR "$state:$cmd\n";
+#               return($ret);
+#               }
+#       );
+
+#$b=$bio;
+#do     {
+#       print STDERR $b->type."\n";
+#       } while ($b=$b->next_bio);
+
+(($ret=$bio->syswrite("GET / HTTP/1.0\r\n\r\n")) > 0) || die $bio->error();
+$bio->flush;
+
+$data="";
+while (1)
+        {
+        $ret=$bio->getline;
+        $ret =~ s/[\r\n]//g;
+        print STDERR "$ret\n";
+        last if $ret eq "";
+        $server=$1 if $ret=~ /^Server: (.*)/;
+        }
+
+
+print "server is $server\n";
+$x509=$ssl->get_peer_certificate();
+print "version     :".$x509->get_version()."\n";
+print "serialNumber:".$x509->get_serialNumber()->bn2hex."\n";
+print "subject     :".$x509->get_subject_name()."\n";
+print "issuer      :". $x509->get_issuer_name()."\n";
+
+$c=$ssl->get_current_cipher;
+($i,$a)=$c->get_bits;
+$v=$c->get_version;
+$n=$c->get_name;
+
+$ssl=$bio->get_ssl();
+print "protocol=".$ssl->get_version."\n";
+print "bits=$i($a) cipher type=$v cipher=$n\n";
+
diff --git a/src/lib/libssl/src/perl/ssl.pl b/src/lib/libssl/src/perl/ssl.pl
new file mode 100644
index 0000000000..f9e983ed87
--- /dev/null
+++ b/src/lib/libssl/src/perl/ssl.pl
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$ssl_ctx=SSL::CTX->new("SSLv3");
+
+$ssl_ctx->set_options("-info_callback" =>
+        sub     {
+                print STDERR $_[0]->state()."\n";
+                }
+        );
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+$bio=BIO->new("connect");
+$bio->hostname($conn) || die $ssl->error();
+
+#$bbio=BIO->new("buffer");
+#$bbio->push($cbio);
+#$bio=$bbio;
+
+#$bio->set_callback(
+#       sub     {
+#               my($bio,$state,$cmd,$buf,$lart,$ret)=@_;
+#               print STDERR "$state:$cmd\n";
+#               return($ret);
+#               }
+#       );
+
+print STDERR "-1 ABCD\n";
+$ssl=$ssl_ctx->new_ssl;
+print STDERR "000 ABCD\n";
+$ssl->set_bio($bio);
+
+print STDERR "00 ABCD\n";
+(($ret=$ssl->connect()) > 0) || die $ssl->error();
+
+print STDERR "0 ABCD\n";
+
+(($ret=$ssl->syswrite("GET / HTTP/1.0\r\n\r\n")) > 0) || die $ssl->error();
+
+print STDERR "1 ABCD\n";
+$data="";
+while (1)
+        {
+print STDERR "2 ABCD\n";
+        $ret=$ssl->sysread($buf,1024);
+print STDERR "3 ABCD\n";
+        last if $ret <= 0;
+        $data.=$buf;
+        }
+
+print STDERR "4 ABCD\n";
+@a=split(/[\r]\n/,$data);
+($server)=grep(/^Server:/,@a);
+
+print "$server\n";
+$x509=$ssl->get_peer_certificate();
+print "subject:".$x509->get_subject_name()."\n";
+print "issuer:". $x509->get_issuer_name()."\n";
+
+$c=$ssl->get_current_cipher;
+($i,$a)=$c->get_bits;
+$v=$c->get_version;
+$n=$c->get_name;
+
+print "protocol=".$ssl->get_version."\n";
+print "bits=$i($a) cipher type=$v cipher=$n\n";
+
diff --git a/src/lib/libssl/src/perl/ssl.txt b/src/lib/libssl/src/perl/ssl.txt
new file mode 100644
index 0000000000..63c52a0e1d
--- /dev/null
+++ b/src/lib/libssl/src/perl/ssl.txt
@@ -0,0 +1,43 @@
+SSL_CTX::new(method)
+        SSLv3
+        SSLv3_client
+        SSLv3_server
+        SSLv23
+        SSLv23_client
+        SSLv23_server
+        SSLv2
+        SSLv2_client
+        SSLv2_server
+
+SSL_CTX::use_PrivateKey_file(file[,type])
+        type eq "der" or "pem".  Default == 'pem'.
+
+SSL_CTX::set_options(...)
+        -info_callback  function
+
+SSL::new(SSL_CTX)
+
+SSL::connect(); returns 0, -1 or 1
+SSL::accept(); return 0, -1 or 1
+SSL::sysread(); as per sysread
+SSL::syswrite(); as per syswrite
+SSL::set_bio(bio);
+
+SSL::set_options(...)
+        -info_callback function
+        -connect_state
+        -accept_state
+
+SSL::state(); the state in numeric and text form.
+SSL::references(); debug stuff
+SSL::get_peer_certificate()
+SSL::do_handshake()
+SSL::renegotiate()
+SSL::shutdown()
+SSL::get_version()
+
+SSL::get_current_cipher();
+
+(key,alg)=SSL_CIPHER::get_bits();
+SSL_CIPHER::get_version();
+SSL_CIPHER::get_name();
diff --git a/src/lib/libssl/src/perl/ssl.xs b/src/lib/libssl/src/perl/ssl.xs
new file mode 100644
index 0000000000..6777cf7ada
--- /dev/null
+++ b/src/lib/libssl/src/perl/ssl.xs
@@ -0,0 +1,474 @@
+#include "p5SSLeay.h"
+
+static int p5_ssl_ex_ssl_ptr=0;
+static int p5_ssl_ex_ssl_info_callback=0;
+static int p5_ssl_ex_ssl_ctx_ptr=0;
+static int p5_ssl_ctx_ex_ssl_info_callback=0;
+
+typedef struct ssl_ic_args_st {
+        SV *cb;
+        SV *arg;
+        } SSL_IC_ARGS;
+
+static void p5_ssl_info_callback(ssl,mode,ret)
+SSL *ssl;
+int mode;
+int ret;
+        {
+        int i;
+        SV *me,*cb;
+
+        me=(SV *)SSL_get_ex_data(ssl,p5_ssl_ex_ssl_ptr);
+        cb=(SV *)SSL_get_ex_data(ssl,p5_ssl_ex_ssl_info_callback);
+        if (cb == NULL)
+                cb=(SV *)SSL_CTX_get_ex_data(
+                        SSL_get_SSL_CTX(ssl),p5_ssl_ctx_ex_ssl_info_callback);
+        if (cb != NULL)
+                {
+                dSP;
+
+                PUSHMARK(sp);
+                XPUSHs(me);
+                XPUSHs(sv_2mortal(newSViv(mode)));
+                XPUSHs(sv_2mortal(newSViv(ret)));
+                PUTBACK;
+
+                i=perl_call_sv(cb,G_DISCARD);
+                }
+        else
+                {
+                croak("Internal error in SSL p5_ssl_info_callback");
+                }
+        }
+
+int boot_ssl()
+        {
+        p5_ssl_ex_ssl_ptr=              
+                SSL_get_ex_new_index(0,"SSLeay::SSL",ex_new,NULL,ex_cleanup);
+        p5_ssl_ex_ssl_info_callback=
+                SSL_get_ex_new_index(0,"ssl_info_callback",NULL,NULL,
+                        ex_cleanup);
+        p5_ssl_ex_ssl_ctx_ptr=
+                SSL_get_ex_new_index(0,"ssl_ctx_ptr",NULL,NULL,
+                        ex_cleanup);
+        p5_ssl_ctx_ex_ssl_info_callback=
+                SSL_CTX_get_ex_new_index(0,"ssl_ctx_info_callback",NULL,NULL,
+                        ex_cleanup);
+        return(1);
+        }
+
+MODULE =  SSLeay::SSL   PACKAGE = SSLeay::SSL::CTX PREFIX = p5_SSL_CTX_
+
+VERSIONCHECK: DISABLE
+
+void
+p5_SSL_CTX_new(...)
+        PREINIT:
+                SSL_METHOD *meth;
+                SSL_CTX *ctx;
+                char *method;
+        PPCODE:
+                pr_name("p5_SSL_CTX_new");
+                if ((items == 1) && SvPOK(ST(0)))
+                        method=SvPV(ST(0),na);
+                else if ((items == 2) && SvPOK(ST(1)))
+                        method=SvPV(ST(1),na);
+                else
+                        croak("Usage: SSLeay::SSL_CTX::new(type)");
+                        
+                if (strcmp(method,"SSLv3") == 0)
+                        meth=SSLv3_method();
+                else if (strcmp(method,"SSLv3_client") == 0)
+                        meth=SSLv3_client_method();
+                else if (strcmp(method,"SSLv3_server") == 0)
+                        meth=SSLv3_server_method();
+                else if (strcmp(method,"SSLv23") == 0)
+                        meth=SSLv23_method();
+                else if (strcmp(method,"SSLv23_client") == 0)
+                        meth=SSLv23_client_method();
+                else if (strcmp(method,"SSLv23_server") == 0)
+                        meth=SSLv23_server_method();
+                else if (strcmp(method,"SSLv2") == 0)
+                        meth=SSLv2_method();
+                else if (strcmp(method,"SSLv2_client") == 0)
+                        meth=SSLv2_client_method();
+                else if (strcmp(method,"SSLv2_server") == 0)
+                        meth=SSLv2_server_method();
+                else
+                        {
+                        croak("Not passed a valid SSL method name, should be 'SSLv[23] [client|server]'");
+                        }
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ctx=SSL_CTX_new(meth);
+                sv_setref_pv(ST(0), "SSLeay::SSL::CTX", (void*)ctx);
+
+int
+p5_SSL_CTX_use_PrivateKey_file(ctx,file,...)
+        SSL_CTX *ctx;
+        char *file;
+        PREINIT:
+                int i=SSL_FILETYPE_PEM;
+                char *ptr;
+        CODE:
+                pr_name("p5_SSL_CTX_use_PrivateKey_file");
+                if (items > 3)
+                        croak("SSLeay::SSL::CTX::use_PrivateKey_file(ssl_ctx,file[,type])");
+                if (items == 3)
+                        {
+                        ptr=SvPV(ST(2),na);
+                        if (strcmp(ptr,"der") == 0)
+                                i=SSL_FILETYPE_ASN1;
+                        else
+                                i=SSL_FILETYPE_PEM;
+                        }
+                RETVAL=SSL_CTX_use_RSAPrivateKey_file(ctx,file,i);
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_CTX_set_options(ctx,...)
+        SSL_CTX *ctx;
+        PREINIT:
+                int i;
+                char *ptr;
+                SV *sv;
+        CODE:
+                pr_name("p5_SSL_CTX_set_options");
+
+                for (i=1; i<items; i++)
+                        {
+                        if (!SvPOK(ST(i)))
+                                croak("Usage: SSLeay::SSL_CTX::set_options(ssl_ctx[,option,value]+)");
+                        ptr=SvPV(ST(i),na);
+                        if (strcmp(ptr,"-info_callback") == 0)
+                                {
+                                SSL_CTX_set_info_callback(ctx,
+                                        p5_ssl_info_callback);
+                                sv=sv_mortalcopy(ST(i+1));
+                                SvREFCNT_inc(sv);
+                                SSL_CTX_set_ex_data(ctx,
+                                        p5_ssl_ctx_ex_ssl_info_callback,
+                                                (char *)sv);
+                                i++;
+                                }
+                        else
+                                {
+                                croak("SSLeay::SSL_CTX::set_options(): unknown option");
+                                }
+                        }
+
+void
+p5_SSL_CTX_DESTROY(ctx)
+        SSL_CTX *ctx
+        PREINIT:
+                SV *sv;
+        PPCODE:
+                pr_name_d("p5_SSL_CTX_DESTROY",ctx->references);
+                SSL_CTX_free(ctx);
+
+MODULE =  SSLeay::SSL   PACKAGE = SSLeay::SSL PREFIX = p5_SSL_
+
+void
+p5_SSL_new(...)
+        PREINIT:
+                SV *sv_ctx;
+                SSL_CTX *ctx;
+                SSL *ssl;
+                int i;
+                SV *arg;
+        PPCODE:
+                pr_name("p5_SSL_new");
+                if ((items != 1) && (items != 2))
+                        croak("Usage: SSLeay::SSL::new(ssl_ctx)");
+                if (sv_derived_from(ST(items-1),"SSLeay::SSL::CTX"))
+                        {
+                        IV tmp = SvIV((SV*)SvRV(ST(items-1)));
+                        ctx=(SSL_CTX *)tmp;
+                        sv_ctx=ST(items-1);
+                        }
+                else
+                        croak("ssl_ctx is not of type SSLeay::SSL::CTX");
+
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                ssl=SSL_new(ctx);
+                sv_setref_pv(ST(0), "SSLeay::SSL", (void*)ssl);
+
+                /* Now this is being a little hairy, we keep a pointer to
+                 * our perl reference.  We need to do a different one
+                 * to the one we return because it will have it's reference
+                 * count droped to 0 apon return and if we up its reference
+                 * count, it will never be DESTROYED */
+                arg=newSVsv(ST(0));
+                SSL_set_ex_data(ssl,p5_ssl_ex_ssl_ptr,(char *)arg);
+                SvREFCNT_inc(sv_ctx);
+                SSL_set_ex_data(ssl,p5_ssl_ex_ssl_ctx_ptr,(char *)sv_ctx);
+
+int
+p5_SSL_connect(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_connect(ssl);
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_accept(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_connect(ssl);
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_sysread(ssl,in,num, ...)
+        SSL *ssl;
+        SV *in;
+        int num;
+        PREINIT:
+                int i,n,olen;
+                int offset;
+                char *p;
+        CODE:
+                offset=0;
+                if (!SvPOK(in))
+                        sv_setpvn(in,"",0);
+                SvPV(in,olen);
+                if (items > 3)
+                        {
+                        offset=SvIV(ST(3));
+                        if (offset < 0)
+                                {
+                                if (-offset > olen)
+                                        croad("Offset outside string");
+                                offset+=olen;
+                                }
+                        }
+                if ((num+offset) > olen)
+                        {
+                        SvGROW(in,num+offset+1);
+                        p=SvPV(in,i);
+                        memset(&(p[olen]),0,(num+offset)-olen+1);
+                        }
+                p=SvPV(in,n);
+
+                i=SSL_read(ssl,p+offset,num);
+                RETVAL=i;
+                if (i <= 0) i=0;
+                SvCUR_set(in,offset+i);
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_syswrite(ssl,in, ...)
+        SSL *ssl;
+        SV *in;
+        PREINIT:
+                char *ptr;
+                int len,in_len;
+                int offset=0;
+                int n;
+        CODE:
+                ptr=SvPV(in,in_len);
+                if (items > 2)
+                        {
+                        len=SvOK(ST(2))?SvIV(ST(2)):in_len;
+                        if (items > 3)
+                                {
+                                offset=SvIV(ST(3));
+                                if (offset < 0)
+                                        {
+                                        if (-offset > in_len)
+                                                croak("Offset outside string");
+                                        offset+=in_len;
+                                        }
+                                else if ((offset >= in_len) && (in_len > 0))
+                                        croak("Offset outside string");
+                                }
+                        if (len >= (in_len-offset))
+                                len=in_len-offset;
+                        }
+                else
+                        len=in_len;
+
+                RETVAL=SSL_write(ssl,ptr+offset,len);
+        OUTPUT:
+                RETVAL
+
+void
+p5_SSL_set_bio(ssl,bio)
+        SSL *ssl;
+        BIO *bio;
+        CODE:
+                bio->references++;
+                SSL_set_bio(ssl,bio,bio);
+
+int
+p5_SSL_set_options(ssl,...)
+        SSL *ssl;
+        PREINIT:
+                int i;
+                char *ptr;
+                SV *sv;
+        CODE:
+                pr_name("p5_SSL_set_options");
+
+                for (i=1; i<items; i++)
+                        {
+                        if (!SvPOK(ST(i)))
+                                croak("Usage: SSLeay::SSL::set_options(ssl[,option,value]+)");
+                        ptr=SvPV(ST(i),na);
+                        if (strcmp(ptr,"-info_callback") == 0)
+                                {
+                                SSL_set_info_callback(ssl,
+                                        p5_ssl_info_callback);
+                                sv=sv_mortalcopy(ST(i+1));
+                                SvREFCNT_inc(sv);
+                                SSL_set_ex_data(ssl,
+                                        p5_ssl_ex_ssl_info_callback,(char *)sv);
+                                i++;
+                                }
+                        else if (strcmp(ptr,"-connect_state") == 0)
+                                {
+                                SSL_set_connect_state(ssl);
+                                }
+                        else if (strcmp(ptr,"-accept_state") == 0)
+                                {
+                                SSL_set_accept_state(ssl);
+                                }
+                        else
+                                {
+                                croak("SSLeay::SSL::set_options(): unknown option");
+                                }
+                        }
+
+void
+p5_SSL_state(ssl)
+        SSL *ssl;
+        PREINIT:
+                int state;
+        PPCODE:
+                pr_name("p5_SSL_state");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                state=SSL_state(ssl);
+                sv_setpv(ST(0),SSL_state_string_long(ssl));
+                sv_setiv(ST(0),state);
+                SvPOK_on(ST(0));
+
+void
+p5_SSL_DESTROY(ssl)
+        SSL *ssl;
+        CODE:
+        pr_name_dd("p5_SSL_DESTROY",ssl->references,ssl->ctx->references);
+        fprintf(stderr,"SSL_DESTROY %d\n",ssl->references);
+        SSL_free(ssl);
+
+int
+p5_SSL_references(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=ssl->references;
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_do_handshake(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_do_handshake(ssl);
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_renegotiate(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_renegotiate(ssl);
+        OUTPUT:
+                RETVAL
+
+int
+p5_SSL_shutdown(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_shutdown(ssl);
+        OUTPUT:
+                RETVAL
+
+char *
+p5_SSL_get_version(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_get_version(ssl);
+        OUTPUT:
+                RETVAL
+
+SSL_CIPHER *
+p5_SSL_get_current_cipher(ssl)
+        SSL *ssl;
+        CODE:
+                RETVAL=SSL_get_current_cipher(ssl);
+        OUTPUT:
+                RETVAL
+
+X509 *
+p5_SSL_get_peer_certificate(ssl)
+        SSL *ssl
+        CODE:
+                RETVAL=SSL_get_peer_certificate(ssl);
+        OUTPUT:
+                RETVAL
+
+MODULE =  SSLeay::SSL   PACKAGE = SSLeay::SSL::CIPHER PREFIX = p5_SSL_CIPHER_
+
+int
+p5_SSL_CIPHER_get_bits(sc)
+        SSL_CIPHER *sc
+        PREINIT:
+                int i,ret;
+        PPCODE:
+                EXTEND(sp,2);
+                PUSHs(sv_newmortal());
+                PUSHs(sv_newmortal());
+                ret=SSL_CIPHER_get_bits(sc,&i);
+                sv_setiv(ST(0),(IV)ret);
+                sv_setiv(ST(1),(IV)i);
+
+char *
+p5_SSL_CIPHER_get_version(sc)
+        SSL_CIPHER *sc
+        CODE:
+                RETVAL=SSL_CIPHER_get_version(sc);
+        OUTPUT:
+                RETVAL
+
+char *
+p5_SSL_CIPHER_get_name(sc)
+        SSL_CIPHER *sc
+        CODE:
+                RETVAL=SSL_CIPHER_get_name(sc);
+        OUTPUT:
+                RETVAL
+
+MODULE =  SSLeay::SSL   PACKAGE = SSLeay::BIO PREFIX = p5_BIO_
+
+void
+p5_BIO_get_ssl(bio)
+        BIO *bio;
+        PREINIT:
+                SSL *ssl;
+                SV *ret;
+                int i;
+        PPCODE:
+                if ((i=BIO_get_ssl(bio,&ssl)) > 0)
+                        {
+                        ret=(SV *)SSL_get_ex_data(ssl,p5_ssl_ex_ssl_ptr);
+                        ret=sv_mortalcopy(ret);
+                        }
+                else
+                        ret= &sv_undef;
+                EXTEND(sp,1);
+                PUSHs(ret);
+
diff --git a/src/lib/libssl/src/perl/ssl_srvr.pl b/src/lib/libssl/src/perl/ssl_srvr.pl
new file mode 100644
index 0000000000..653a2e7f03
--- /dev/null
+++ b/src/lib/libssl/src/perl/ssl_srvr.pl
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$ssl_ctx=SSL::CTX->new("SSLv3");
+
+$ssl_ctx->set_options("-info_callback" =>
+        sub     {
+                print STDERR $_[0]->state()."\n";
+                }
+        );
+
+$ssl_ctx->use_PrivateKey_file("server.pem");
+
+$conn="localhost:4433";
+$conn=$ARGV[0] if $#ARGV >= 0;
+$bio=BIO->new("connect");
+$bio->hostname($conn) || die $ssl->error();
+
+$ssl=$ssl_ctx->new_ssl;
+$ssl->set_bio($bio);
+
+(($ret=$ssl->connect()) > 0) || die $ssl->error();
+
+(($ret=$ssl->write("GET / HTTP/1.0\r\n\r\n")) > 0) || die $ssl->error();
+
+while (1)
+        {
+        $ret=$ssl->read($buf,10240);
+        last if ($ret <= 0);
+        print $buf;
+        }
+
diff --git a/src/lib/libssl/src/perl/sslbio.pl b/src/lib/libssl/src/perl/sslbio.pl
new file mode 100644
index 0000000000..ca9daa36a1
--- /dev/null
+++ b/src/lib/libssl/src/perl/sslbio.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$ssl_ctx=SSL::CTX->new("SSLv3");
+
+#$ssl_ctx->set_options("-info_callback" =>
+#       sub     {
+#               print STDOUT $_[0]->state()."\n";
+#               }
+#       );
+
+# create a ssl bio
+$bssl=BIO->new("ssl");
+$bssl->set_ssl($ssl_ctx->new_ssl()) || die $bssl->error();
+$bssl->get_ssl->set_options("-connect_state") || die $ssl->error();
+
+$bssl->set_callback(sub { printf "XXXXXXXXXXXXXXXXXXXXXX %d %s\n",$_[1],$_[0]->type; });
+
+# create connect bio
+$host="localhost:4433";
+$host=$ARGV[0] if $#ARGV >= 0;
+$bio=BIO->new("connect");
+$bio->hostname($host) || die $bio->error();
+
+# push it in
+$bssl->push($bio);
+
+(($ret=$bssl->write("GET / HTTP/1.0\r\n\r\n")) > 0) || die $bssl->error();
+
+while (1)
+        {
+        $ret=$bssl->read($buf,10240);
+        last if ($ret <= 0);
+        print $buf;
+        }
+
+
diff --git a/src/lib/libssl/src/perl/t.pl b/src/lib/libssl/src/perl/t.pl
new file mode 100644
index 0000000000..fbd9fb8490
--- /dev/null
+++ b/src/lib/libssl/src/perl/t.pl
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$a=SSLeay::BN::dec2bn("1231353465324563455");
+print "a=$a\n".$a->bn2dec."\n";
+$b=SSLeay::BN::dec2bn("98790816238765235");
+print "a=$a\nb=$b\n";
+print $a->gcd($b)."\n";
+
diff --git a/src/lib/libssl/src/perl/test b/src/lib/libssl/src/perl/test
new file mode 100644
index 0000000000..3977c48865
--- /dev/null
+++ b/src/lib/libssl/src/perl/test
@@ -0,0 +1,32 @@
+30373b8dbfc38d360bda81fad2fb462e  8  0  8 des-ecb
+a5f61a73a0894979d46c2481e9f27151  8  8  1 des-cfb
+a64a08dc69e79becccde95bed6239fca  8  8  1 des-ofb
+553d168193e54100524541f2c473b705  8  8  8 des-cbc
+bb75383e4aad6d83418dde16c6cea6f5 16  0  8 des-ede
+3ea71cd9a2e50d82d66b433e9471eeb2 16  8  1 des-ede-cfb
+3d56b76d43dc8d51647773bc9719a355 16  8  1 des-ede-ofb
+eafa89aae63167b9798639c0e31223b4 16  8  8 des-ede-cbc
+a952f8c409fb0df75a7df1aa54ba30b8 24  0  8 des-ede3
+0badccc43a14d8503d33f32a2345bbd2 24  8  1 des-ede3-cfb
+bae638c0e33850d02c792ed0e3d6b600 24  8  1 des-ede3-ofb
+ec4522bbefabf0198126683e661325e2 24  8  8 des-ede3-cbc
+4431f05d198d8afc003aeec85bea01b9 24  8  8 desx-cbc
+606af8d6f30c1fd9c647df5eb716ae0f 16  0  1 rc4
+4aaaf7e4bc3fd2caa6318a4852f636f4  5  0  1 rc4-40
+77e0851e8c96c4a1e26140d1ec822036 16  0  8 idea-ecb
+a28e51e283519fde0e128bcb697bc23e 16  8  1 idea-cfb
+17d0e70f07de6c08e9673d52987599ab 16  8  1 idea-ofb
+0687cf6ca11ee45f8bf9c29525405a4d 16  8  8 idea-cbc
+e2268681a63198fe38282b0a1bb6ed36 16  0  8 rc2-ecb
+f48748e6386790e639bbee4fccaa5067 16  8  8 rc2-cbc
+f250cfe829ef797d6866e32526ec4fe4  5  8  8 rc2-40-cbc
+a372f970b6c346341a2899bb872a7349 16  8  1 rc2-cfb
+d2da66102dea6b833f0fbf71e2cb4988 16  8  1 rc2-ofb
+237b0ef0e4f7fb28a5708d59773caecf 16  0  8 bf-ecb
+c58cf5da90472caf0f0b7fafb0590977 16  8  1 bf-cfb
+1f3e49e2e27f9ad177a6a64b09d361ed 16  8  1 bf-ofb
+66acaf2cb5f301580c59fa17d005b716 16  8  8 bf-cbc
+3548c9fe9fcd13f647ae177a15915af9 16  0  8 cast5-ecb
+e8d074ad8cc0d3d828da80ab18452f91 16  8  1 cast5-cfb
+5331eb4351c2048c27c8a8901fd29e20 16  8  1 cast5-ofb
+8033607fdb68598cc62c379af218eeeb 16  8  8 cast5-cbc
diff --git a/src/lib/libssl/src/perl/test.pl b/src/lib/libssl/src/perl/test.pl
new file mode 100644
index 0000000000..52423ef620
--- /dev/null
+++ b/src/lib/libssl/src/perl/test.pl
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+($a=SSLeay::BN::new()) || die "unable to make bignum\n";
+($b=SSLeay::BN::new()) || die "unable to make bignum\n";
+
+$a=SSLeay::BN::hex2bn("123456789ABCDEF");
+$b=SSLeay::BN::hex2bn("123456789ABCDEF");
+$mod=SSLeay::BN::hex2bn("fedcba9876543201");
+$c=SSLeay::BN::hex2bn("1234");
+
+print "a=".$a->bn2hex()."\n";
+print "b=".$b->bn2hex()."\n";
+print "c=".$c->bn2hex()."\n";
+
+print $a->mul($b)->bn2hex."\n";
+($d,$r)=$b->div($c);
+print "($d)($r)\n";
+printf "%s x %s + %s\n",$c->bn2hex,$d->bn2hex,$r->bn2hex;
+
+$g=$d;
+
+for (;;)
+        {
+        $a=$a->mod_mul($a,$mod);
+        print $a->bn2hex."\n";
+        }
diff --git a/src/lib/libssl/src/perl/test.txt b/src/lib/libssl/src/perl/test.txt
new file mode 100644
index 0000000000..ff37ffd09b
--- /dev/null
+++ b/src/lib/libssl/src/perl/test.txt
@@ -0,0 +1,36 @@
+30373b8dbfc38d360bda81fad2fb462e  8  0  8 des-ecb
+a5f61a73a0894979d46c2481e9f27151  8  8  1 des-cfb
+a64a08dc69e79becccde95bed6239fca  8  8  1 des-ofb
+553d168193e54100524541f2c473b705  8  8  8 des-cbc
+bb75383e4aad6d83418dde16c6cea6f5 16  0  8 des-ede
+3ea71cd9a2e50d82d66b433e9471eeb2 16  8  1 des-ede-cfb
+3d56b76d43dc8d51647773bc9719a355 16  8  1 des-ede-ofb
+eafa89aae63167b9798639c0e31223b4 16  8  8 des-ede-cbc
+a952f8c409fb0df75a7df1aa54ba30b8 24  0  8 des-ede3
+0badccc43a14d8503d33f32a2345bbd2 24  8  1 des-ede3-cfb
+bae638c0e33850d02c792ed0e3d6b600 24  8  1 des-ede3-ofb
+ec4522bbefabf0198126683e661325e2 24  8  8 des-ede3-cbc
+4431f05d198d8afc003aeec85bea01b9 24  8  8 desx-cbc
+606af8d6f30c1fd9c647df5eb716ae0f 16  0  1 rc4
+4aaaf7e4bc3fd2caa6318a4852f636f4  5  0  1 rc4-40
+77e0851e8c96c4a1e26140d1ec822036 16  0  8 idea-ecb
+a28e51e283519fde0e128bcb697bc23e 16  8  1 idea-cfb
+17d0e70f07de6c08e9673d52987599ab 16  8  1 idea-ofb
+0687cf6ca11ee45f8bf9c29525405a4d 16  8  8 idea-cbc
+e2268681a63198fe38282b0a1bb6ed36 16  0  8 rc2-ecb
+f48748e6386790e639bbee4fccaa5067 16  8  8 rc2-cbc
+f250cfe829ef797d6866e32526ec4fe4  5  8  8 rc2-40-cbc
+a372f970b6c346341a2899bb872a7349 16  8  1 rc2-cfb
+d2da66102dea6b833f0fbf71e2cb4988 16  8  1 rc2-ofb
+237b0ef0e4f7fb28a5708d59773caecf 16  0  8 bf-ecb
+c58cf5da90472caf0f0b7fafb0590977 16  8  1 bf-cfb
+1f3e49e2e27f9ad177a6a64b09d361ed 16  8  1 bf-ofb
+66acaf2cb5f301580c59fa17d005b716 16  8  8 bf-cbc
+3548c9fe9fcd13f647ae177a15915af9 16  0  8 cast5-ecb
+e8d074ad8cc0d3d828da80ab18452f91 16  8  1 cast5-cfb
+5331eb4351c2048c27c8a8901fd29e20 16  8  1 cast5-ofb
+8033607fdb68598cc62c379af218eeeb 16  8  8 cast5-cbc
+e3a6760eb5e79bf4063cf0791e99842d 16  0  8 rc5-ecb
+2f5eab0d0992dcce8615a5a60966391a 16  8  1 rc5-cfb
+c5893e49e73342db2957b83b70f23e27 16  8  1 rc5-ofb
+683ce60c8b7bf028ec0d3dc0f018a1a4 16  8  8 rc5-cbc
diff --git a/src/lib/libssl/src/perl/test2.pl b/src/lib/libssl/src/perl/test2.pl
new file mode 100644
index 0000000000..2e1196c072
--- /dev/null
+++ b/src/lib/libssl/src/perl/test2.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+@md=();
+($c=SSLeay::Cipher::new("idea")) ||
+        die "'des' is an unknown cipher algorithm\n";
+
+printf "name      =%s\n" ,$c->name();
+printf "key length=%2d\n",$c->key_length();
+printf "iv length =%2d\n",$c->iv_length();
+printf "block size=%2d\n",$c->block_size();
+
+$data="1234";
+$c->init("01234567","abcdefgh",1);
+$in=$c->update($data);
+$in.=$c->final();
+
+$c->init("01234567","abcdefgh",0);
+$out=$c->update($in);
+$out.=$c->final();
+print $data;
+print " -> ";
+print $out;
+print "\n";
+
diff --git a/src/lib/libssl/src/perl/test3.pl b/src/lib/libssl/src/perl/test3.pl
new file mode 100644
index 0000000000..4102ab9297
--- /dev/null
+++ b/src/lib/libssl/src/perl/test3.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+@md=();
+($c=SSLeay::Cipher::new("idea")) ||
+        die "'des' is an unknown cipher algorithm\n";
+
+$key=" ";
+$iv=" ";
+$c->init($key,$iv,0);
+while (<>)
+        {
+        print $c->update($_);
+        }
+print $c->final();
+
diff --git a/src/lib/libssl/src/perl/test8.pl b/src/lib/libssl/src/perl/test8.pl
new file mode 100644
index 0000000000..c144f7f136
--- /dev/null
+++ b/src/lib/libssl/src/perl/test8.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+# 2687145 * 3003 * 10^5072 - 1. 
+
+$a=SSLeay::BN::set_word(99);
+$b=SSLeay::BN::set_word(100);
+
+$aa=$a->dup;
+$bb=$b->dup;
+
+$c=$a*$b;
+$bb+=$a;
+
+print "$a*$b=$c\n";
+print "$bb\n";
diff --git a/src/lib/libssl/src/perl/test9.pl b/src/lib/libssl/src/perl/test9.pl
new file mode 100644
index 0000000000..cc710c310e
--- /dev/null
+++ b/src/lib/libssl/src/perl/test9.pl
@@ -0,0 +1,38 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+# 2687145 * 3003 * 10^5072 - 1. 
+
+$a=SSLeay::BN::set_word(2687145);
+$b=SSLeay::BN::set_word(3003);
+$c=SSLeay::BN::set_word(10);
+$d=SSLeay::BN::set_word(5072);
+$e=SSLeay::BN::set_word(1);
+
+print $a->bn2hex()."\n";
+print $b->bn2hex()."\n";
+print $c->bn2hex()."\n";
+print $d->bn2hex()."\n";
+print $e->bn2hex()."\n";
+
+$f=(($a->mul($b)->mul($c->exp($d)))->sub($e));
+#print "$a $b\n";
+
+$c=$a->mul($b);
+print "1->".$c->bn2hex()." \n";
+
+$c=$a*$b;
+print "2->".$c->bn2hex()." \n";
+$a*=$b;
+print "3->$a\n";
+
+print $f->bn2hex()." $a\n";
+print $a."\n";
+
+print "$a=(($b*$c)/$d);\n";
+$a=(($b*$c)/$d);
+print "$a\n";
+
diff --git a/src/lib/libssl/src/perl/testbn.pl b/src/lib/libssl/src/perl/testbn.pl
new file mode 100644
index 0000000000..3062439563
--- /dev/null
+++ b/src/lib/libssl/src/perl/testbn.pl
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$num ="a43f6a8885a308d313198a2e03707344a4093822";
+$num.="299f31d0082efa98ec4e6c89452821e638d01377";
+$num.="be5466cf34e90c6cc0ac29b7c97c50dd3f84d5b5";
+$num.="b54709179216d5d98979fb1bd1310ba698dfb5ac";
+$num.="2ffd72dbd01adfb7b8e1afed6a267e96ba7c9045";
+$num.="f12c7f9924a19947b3916cf70801f2e2858efc16";
+$num.="636920d871574e69a458fea3f4933d7e0d95748f";
+$num.="728eb658718bcd5882154aee7b54a41dc25a59b5";
+$num.="9c30d5392af26013c5d1b023286085f0ca417918";
+$num.="b8db38ef8e79dcb0603a180e6c9e0e8bb01e8a3e";
+$num.="d71577c1bd314b2778af2fda55605c60e65525f3";
+$num.="aa55ab945748986263e8144055ca396a2aab10b6";
+$num.="b4cc5c341141e8cea15486af7c8f14a7";
+
+$a=SSLeay::BN::hex2bn($num);
+print "num bits =".$a->num_bits."\n";
+print $a->is_prime(50,sub {print STDERR $_[0]?"+":"."})."\n";
diff --git a/src/lib/libssl/src/perl/testdec.pl b/src/lib/libssl/src/perl/testdec.pl
new file mode 100644
index 0000000000..0dce3f8e79
--- /dev/null
+++ b/src/lib/libssl/src/perl/testdec.pl
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$a=SSLeay::BN::dec2bn("1234");
+
+foreach (1..4)
+        {
+        $a*=$a;
+        print $a."\n",$a->bn2dec()."\n";
+        }
+
diff --git a/src/lib/libssl/src/perl/testmd.pl b/src/lib/libssl/src/perl/testmd.pl
new file mode 100644
index 0000000000..6549166c8a
--- /dev/null
+++ b/src/lib/libssl/src/perl/testmd.pl
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+@md=();
+foreach ("md2", "md5", "sha", "sha1", "mdc2", "ripemd160")
+        {
+        ($f=MD->new($_)) ||
+                die "$_ is an unknown message digest algorithm\n";
+        push(@md,$f);
+        }
+
+while (<>)
+        {
+        foreach $md (@md)
+                { $md->update($_); }
+        }
+
+foreach (@md)
+        {
+        $digest=$_->final();
+        printf "%-4s=%s\n",$_->name(),unpack("H*",$digest);
+        }
+
diff --git a/src/lib/libssl/src/perl/tt.pl b/src/lib/libssl/src/perl/tt.pl
new file mode 100644
index 0000000000..80ec88b2a8
--- /dev/null
+++ b/src/lib/libssl/src/perl/tt.pl
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+for ($i=1; $i<1000; $i++)
+        {
+        $a.=$i%10;
+        $y=SSLeay::BN::dec2bn($a);
+        $z=SSLeay::BN::bn2dec($y);
+
+        print "$a\n$y\n$z\n";
+        }
+
diff --git a/src/lib/libssl/src/perl/typemap b/src/lib/libssl/src/perl/typemap
new file mode 100644
index 0000000000..5226fbc369
--- /dev/null
+++ b/src/lib/libssl/src/perl/typemap
@@ -0,0 +1,96 @@
+
+datum                   T_DATUM
+EVP_MD_CTX *            T_MD_CTX
+EVP_CIPHER_CTX *        T_CIPHER_CTX
+BIGNUM *                T_BIGNUM
+SSL_METHOD *            T_SSL_METHOD
+SSL_CTX *               T_SSL_CTX
+SSL_CIPHER *            T_SSL_CIPHER
+SSL *                   T_SSL
+BIO *                   T_BIO
+X509 *                  T_X509
+
+INPUT
+T_DATUM
+        $var.dptr=SvPV($arg,$var.dsize);
+T_MD_CTX
+        if (sv_derived_from($arg, \"SSLeay::MD\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (EVP_MD_CTX *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::MD\")
+T_CIPHER_CTX
+        if (sv_derived_from($arg, \"SSLeay::Cipher\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (EVP_CIPHER_CTX *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::Cipher\")
+T_BIGNUM
+        sv_to_BIGNUM(&($var),$arg,\"$var is not of type SSLeay::MD, int or string\")
+T_SSL_METHOD
+        if (sv_derived_from($arg, \"SSLeay::SSL::METHOD\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (SSL_METHOD *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::SSL::METHOD\")
+T_SSL_CTX
+        if (sv_derived_from($arg, \"SSLeay::SSL::CTX\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (SSL_CTX *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::SSL::CTX\")
+T_SSL_CIPHER
+        if (sv_derived_from($arg, \"SSLeay::SSL::CIPHER\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (SSL_CIPHER *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::SSL::CIPHER\")
+T_SSL
+        if (sv_derived_from($arg, \"SSLeay::SSL\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (SSL *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::SSL\")
+T_BIO
+        if (sv_derived_from($arg, \"SSLeay::BIO\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (BIO *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::BIO\")
+T_X509
+        if (sv_derived_from($arg, \"SSLeay::X509\")) {
+                IV tmp = SvIV((SV*)SvRV($arg));
+                $var = (X509 *) tmp;
+                }
+        else
+                croak(\"$var is not of type SSLeay::X509\")
+OUTPUT
+T_DATUM
+        sv_setpvn($arg,$var.dptr,$var.dsize);
+T_MD_CTX
+        sv_setref_pv($arg, \"SSLeay::MD\", (void*)$var);
+T_CIPHER_CTX
+        sv_setref_pv($arg, \"SSLeay::Cipher\", (void*)$var);
+T_BIGNUM
+        sv_setref_pv($arg, \"SSLeay::BN\", (void*)$var);
+T_SSL_METHOD
+        sv_setref_pv($arg, \"SSLeay::SSL::METHOD\", (void*)$var);
+T_SSL_CTX
+        sv_setref_pv($arg, \"SSLeay::SSL::CTX\", (void*)$var);
+T_SSL_CIPHER
+        sv_setref_pv($arg, \"SSLeay::SSL::CIPHER\", (void*)$var);
+T_SSL
+        sv_setref_pv($arg, \"SSLeay::SSL\", (void*)$var);
+T_BIO
+        sv_setref_pv($arg, \"SSLeay::BIO\", (void*)$var);
+T_X509
+        sv_setref_pv($arg, \"SSLeay::X509\", (void*)$var);
+
+
diff --git a/src/lib/libssl/src/perl/x509.txt b/src/lib/libssl/src/perl/x509.txt
new file mode 100644
index 0000000000..8468eff512
--- /dev/null
+++ b/src/lib/libssl/src/perl/x509.txt
@@ -0,0 +1,6 @@
+X509::new()
+
+X509::get_verson()
+X509::get_serial_number()
+X509::get_subject_name()
+X509::get_issuer_name()
diff --git a/src/lib/libssl/src/perl/x509.xs b/src/lib/libssl/src/perl/x509.xs
new file mode 100644
index 0000000000..67633ad225
--- /dev/null
+++ b/src/lib/libssl/src/perl/x509.xs
@@ -0,0 +1,74 @@
+#include "p5SSLeay.h"
+
+MODULE =  SSLeay::X509  PACKAGE = SSLeay::X509  PREFIX = p5_X509_
+
+PROTOTYPES: ENABLE
+VERSIONCHECK: DISABLE
+
+void
+p5_X509_new(void )
+        PREINIT:
+                X509 *x509;
+                SV *arg;
+        PPCODE:
+                pr_name("p5_X509_new");
+                EXTEND(sp,1);
+                PUSHs(sv_newmortal());
+                x509=X509_new();
+                sv_setref_pv(ST(0),"SSLeay::X509",(void *)x509);
+
+char *
+p5_X509_get_subject_name(x509)
+        X509 *x509;
+        PREINIT:
+                char *p;
+                X509_NAME *name;
+                char buf[1024];
+                int i;
+        CODE:
+                name=X509_get_subject_name(x509);
+                X509_NAME_oneline(name,buf,sizeof(buf));
+                p= &(buf[0]);
+                RETVAL=p;
+        OUTPUT:
+                RETVAL
+
+char *
+p5_X509_get_issuer_name(x509)
+        X509 *x509;
+        PREINIT:
+                char *p;
+                X509_NAME *name;
+                char buf[1024];
+                int i;
+        CODE:
+                name=X509_get_issuer_name(x509);
+                X509_NAME_oneline(name,buf,sizeof(buf));
+                p= &(buf[0]);
+                RETVAL=p;
+        OUTPUT:
+                RETVAL
+
+int
+p5_X509_get_version(x509)
+        X509 *x509;
+        CODE:
+                RETVAL=X509_get_version(x509);
+        OUTPUT:
+                RETVAL
+
+BIGNUM *
+p5_X509_get_serialNumber(x509)
+        X509 *x509;
+        CODE:
+                RETVAL=ASN1_INTEGER_to_BN(X509_get_serialNumber(x509),NULL);
+        OUTPUT:
+                RETVAL
+
+void
+p5_X509_DESTROY(x509)
+        X509 *x509;
+        CODE:
+        pr_name("p5_X509_DESTROY");
+        X509_free(x509);
+
diff --git a/src/lib/libssl/src/perl/xstmp.c b/src/lib/libssl/src/perl/xstmp.c
new file mode 100644
index 0000000000..aa18959017
--- /dev/null
+++ b/src/lib/libssl/src/perl/xstmp.c
@@ -0,0 +1,102 @@
+/* perl/xstmp.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.]
+ */
+/*
+ * This file was generated automatically by xsubpp version 1.9402 from the 
+ * contents of SSLeay.xs. Do not edit this file, edit SSLeay.xs instead.
+ *
+ *      ANY CHANGES MADE HERE WILL BE LOST! 
+ *
+ */
+
+#line 1 "SSLeay.xs"
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+#ifdef __cplusplus
+}
+#endif
+
+typedef struct datum_st
+        {
+        char *dptr;
+        int dsize;
+        } datum;
+
+#include "crypto.h"
+#include "buffer.h"
+#include "bio.h"
+#include "evp.h"
+#include "err.h"
+#include "x509.h"
+#include "ssl.h"
+
+#if 0
+#define pr_name(name)           printf("%s\n",name)
+#define pr_name_d(name,p2)      printf("%s %d\n",name,p2)
+#define pr_name_dd(name,p2,p3)  printf("%s %d %d\n",name,p2,p3)
+#else
+#define pr_name(name)
+#define pr_name_d(name,p2)
+#define pr_name_dd(name,p2,p3)
+#endif
+
+#include "callback.c"
+
diff --git a/src/lib/libssl/src/perl/y.pl b/src/lib/libssl/src/perl/y.pl
new file mode 100644
index 0000000000..fe608a6724
--- /dev/null
+++ b/src/lib/libssl/src/perl/y.pl
@@ -0,0 +1,7 @@
+#!/usr/bin/perl
+use ExtUtils::testlib;
+use SSLeay;
+
+$message=SSLeay::BN::dec2bn("936345681743241125150760694794510965960940252288797108931456691368672287489405603308617928680920874760917824938589009714909675985261365549781893129784821682998948722");
+
+print $message->bn2hex."\n";
diff --git a/src/lib/libssl/src/perl/yy.pl b/src/lib/libssl/src/perl/yy.pl
new file mode 100644
index 0000000000..2e00edb3e9
--- /dev/null
+++ b/src/lib/libssl/src/perl/yy.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+
+$a=SSLeay::BN::new();
+
+$a+="1234567";
+
+print $a->bn2hex()."\n";
+
+
+for (1 .. 20)
+        {
+        $a*=$a;
+        $b=$a->bn2hex();
+        print " ".$b."\n".length($b)."\n";
+        }
diff --git a/src/lib/libssl/src/perl/z.pl b/src/lib/libssl/src/perl/z.pl
new file mode 100644
index 0000000000..7e2d5285cc
--- /dev/null
+++ b/src/lib/libssl/src/perl/z.pl
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+
+use ExtUtils::testlib;
+
+use SSLeay;
+use Benchmark;
+
+$buf=('x' x (1024*1024));
+$buf=('x' x (1024*1024));
+
+@md=();
+foreach $name ("md2", "mdc2", "sha", "ripemd160", "sha1", "md5")
+        {
+        if (($name eq "md2") || ($name eq "mdc2"))
+                { $num=5; }
+        else    { $num=100; }
+
+        $t=timeit($num,'&hash($name)');
+        printf "%6d000 bytes/sec:$name\n",int(($num*1024*1024)/$t->[1]/1000);
+        }
+
+sub hash
+        {
+        my($name)=@_;
+        my($f,$digest);
+
+        ($f=MD->new($name)) ||
+                die "$_ is an unknown message digest algorithm\n";
+        $f->update($buf);
+        $digest=$f->final();
+        }
+
diff --git a/src/lib/libssl/src/perl/zz.pl b/src/lib/libssl/src/perl/zz.pl
new file mode 100644
index 0000000000..38866c9227
--- /dev/null
+++ b/src/lib/libssl/src/perl/zz.pl
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+use ExtUtils::testlib;
+use SSLeay;
+
+$a=SSLeay::BN::dec2bn("12345678901234567890");
+$b=SSLeay::BN::dec2bn("98765432109876543210");
+print "a=$a\n";
+print "b=$b\n";
+
+$n=$a*$b;
+$m=$n+"1223123235345634764534567889";
+$l=$m*88888888;
+
+$r=$l/$b;
+
+print "a=$a\n";
+print "b=$b\n";
+print "n=$n\n";
+print "m=$m\n";
+print "l=$l\n";
+print "r=$r\n";
+
diff --git a/src/lib/libssl/src/shlib/linux.sh b/src/lib/libssl/src/shlib/linux.sh
new file mode 100644
index 0000000000..f80292d90c
--- /dev/null
+++ b/src/lib/libssl/src/shlib/linux.sh
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+echo "#define DATE      \"`date`\"" >crypto/date.h
+
+major="0"
+minor="8.2"
+slib=libssl
+clib=libcrypto
+CC=gcc
+CPP='gcc -E'
+AS=as
+FLAGS='-DX86_ASM -DTERMIO -O3 -DL_ENDIAN -fomit-frame-pointer -m486 -Wall'
+#FLAGS='-DTERMIO -g2 -ggdb -DL_ENDIAN -m486 -Wall -DREF_CHECK -DCRYPTO_MDEBUG'
+INCLUDE='-Iinclude -Icrypto -Issl'
+SHFLAGS='-DPIC -fpic'
+
+CFLAGS="$FLAGS $INCLUDE $SHFLAGS"
+ASM_OBJ="";
+
+echo compiling bignum assember
+$CPP -DELF crypto/bn/asm/bn86unix.cpp | $AS -o bn_asm.o
+CFLAGS="$CFLAGS -DBN_ASM -DX86_ASM"
+ASM_OBJ="$ASM_OBJ bn_asm.o"
+
+echo compiling des assember
+$CPP -DELF crypto/des/asm/dx86unix.cpp | $AS -o des_enc.o
+$CPP -DELF crypto/des/asm/yx86unix.cpp | $AS -o fcrypt-b.o
+CFLAGS="$CFLAGS -DDES_ASM"
+ASM_OBJ="$ASM_OBJ des_enc.o fcrypt-b.o"
+
+echo compiling blowfish assember
+$CPP -DELF crypto/bf/asm/bx86unix.cpp | $AS -o bf_enc.o
+CFLAGS="$CFLAGS -DBF_ASM"
+ASM_OBJ="$ASM_OBJ bf_enc.o"
+
+echo compiling cast assember
+$CPP -DELF crypto/cast/asm/cx86unix.cpp | $AS -o cast_enc.o
+CFLAGS="$CFLAGS -DCAST_ASM"
+ASM_OBJ="$ASM_OBJ cast_enc.o"
+
+echo compiling rc4 assember
+$CPP -DELF crypto/rc4/asm/rx86unix.cpp | $AS -o rc4_enc.o
+CFLAGS="$CFLAGS -DRC4_ASM"
+ASM_OBJ="$ASM_OBJ rc4_enc.o"
+
+echo compiling md5 assember
+$CPP -DELF crypto/md5/asm/mx86unix.cpp | $AS -o md5_enc.o
+CFLAGS="$CFLAGS -DMD5_ASM"
+ASM_OBJ="$ASM_OBJ md5_enc.o"
+
+echo compiling sha1 assember
+$CPP -DELF crypto/sha/asm/sx86unix.cpp | $AS -o sha1_enc.o
+CFLAGS="$CFLAGS -DSHA1_ASM"
+ASM_OBJ="$ASM_OBJ sha1_enc.o"
+
+echo compiling $clib
+$CC -c $CFLAGS -DCFLAGS="\"$FLAGS\"" -o crypto.o crypto/crypto.c
+
+echo linking $clib.so
+gcc $CFLAGS -shared -Wl,-soname,$clib.so.$major -o $clib.so.$major.$minor crypto.o $ASM_OBJ
+/bin/rm -f $clib.so $clib.so.$major
+ln -s $clib.so.$major.$minor $clib.so
+ln -s $clib.so.$major.$minor $clib.so.$major
+
+echo compiling $slib.so
+$CC -c $CFLAGS -o ssl.o ssl/ssl.c
+
+echo building $slib.so
+gcc $CFLAGS -shared -Wl,-soname,$slib.so.$major -o $slib.so.$major.$minor ssl.o
+/bin/rm -f $slib.so $slib.so.$major
+ln -s $slib.so.$major.$minor $slib.so
+ln -s $slib.so.$major.$minor $slib.so.$major
+
+echo building ssleay executable
+gcc $CFLAGS -o ssleay apps/eay.c -L. -lssl -lcrypto
+
diff --git a/src/lib/libssl/src/ssl/Makefile.ssl b/src/lib/libssl/src/ssl/Makefile.ssl
new file mode 100644
index 0000000000..f4b13bf83b
--- /dev/null
+++ b/src/lib/libssl/src/ssl/Makefile.ssl
@@ -0,0 +1,100 @@
+#
+# SSLeay/ssl/Makefile
+#
+
+DIR=    ssl
+TOP=    ..
+CC=     cc
+INCLUDES= -I../crypto -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=ssl
+ERRC=ssl_err
+GENERAL=Makefile README
+TEST=ssltest.c
+APPS=
+
+LIB=$(TOP)/libssl.a
+LIBSRC= \
+        s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
+        s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
+        s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
+        t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c \
+        ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
+        ssl_ciph.c ssl_stat.c ssl_rsa.c \
+        ssl_asn1.c ssl_txt.c ssl_algs.c \
+        bio_ssl.c $(ERRC).c
+LIBOBJ= \
+        s2_meth.o  s2_srvr.o  s2_clnt.o  s2_lib.o  s2_enc.o s2_pkt.o \
+        s3_meth.o  s3_srvr.o  s3_clnt.o  s3_lib.o  s3_enc.o s3_pkt.o s3_both.o \
+        s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o          s23_pkt.o \
+        t1_meth.o   t1_srvr.o t1_clnt.o  t1_lib.o  t1_enc.o \
+        ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \
+        ssl_ciph.o ssl_stat.o ssl_rsa.o \
+        ssl_asn1.o ssl_txt.o ssl_algs.o \
+        bio_ssl.o $(ERRC).o
+
+SRC= $(LIBSRC)
+
+EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h
+HEADER= $(EXHEADER) ssl_locl.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ..; $(MAKE) DIRS=$(DIR) 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 ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/ssl/readme b/src/lib/libssl/src/ssl/readme
new file mode 100644
index 0000000000..ca174848a1
--- /dev/null
+++ b/src/lib/libssl/src/ssl/readme
@@ -0,0 +1,277 @@
+22 Jun 1996
+This file belongs in ../apps, but I'll leave it here because it deals
+with SSL :-)  It is rather dated but it gives you an idea of how
+things work.
+===
+
+17 Jul 1995
+I have been changing things quite a bit and have not fully updated
+this file, so take what you read with a grain of salt
+eric
+===
+The s_client and s_server programs can be used to test SSL capable
+IP/port addresses and the verification of the X509 certificates in use
+by these services.  I strongly advise having a look at the code to get
+an idea of how to use the authentication under SSLeay.  Any feedback
+on changes and improvements would be greatly accepted.
+
+This file will probably be gibberish unless you have read
+rfc1421, rfc1422, rfc1423 and rfc1424 which describe PEM
+authentication.
+
+A Brief outline (and examples) how to use them to do so.
+
+NOTE:
+The environment variable SSL_CIPER is used to specify the prefered
+cipher to use, play around with setting it's value to combinations of
+RC4-MD5, EXP-RC4-MD5, CBC-DES-MD5, CBC3-DES-MD5, CFB-DES-NULL
+in a : separated list.
+
+This directory contains 3 X509 certificates which can be used by these programs.
+client.pem: a file containing a certificate and private key to be used
+        by s_client.
+server.pem :a file containing a certificate and private key to be used
+        by s_server.
+eay1024.pem:the certificate used to sign client.pem and server.pem.
+        This would be your CA's certificate.  There is also a link
+        from the file a8556381.0 to eay1024.PEM.  The value a8556381
+        is returned by 'x509 -hash -noout <eay1024.pem' and is the
+        value used by X509 verification routines to 'find' this
+        certificte when search a directory for it.
+        [the above is not true any more, the CA cert is 
+         ../certs/testca.pem which is signed by ../certs/mincomca.pem]
+
+When testing the s_server, you may get
+bind: Address already in use
+errors.  These indicate the port is still being held by the unix
+kernel and you are going to have to wait for it to let go of it.  If
+this is the case, remember to use the port commands on the s_server and
+s_client to talk on an alternative port.
+
+=====
+s_client.
+This program can be used to connect to any IP/hostname:port that is
+talking SSL.  Once connected, it will attempt to authenticate the
+certificate it was passed and if everything works as expected, a 2
+directional channel will be open.  Any text typed will be sent to the
+other end.  type Q<cr> to exit.  Flags are as follows.
+-host arg       : Arg is the host or IP address to connect to.
+-port arg       : Arg is the port to connect to (https is 443).
+-verify arg     : Turn on authentication of the server certificate.
+                : Arg specifies the 'depth', this will covered below.
+-cert arg       : The optional certificate to use.  This certificate
+                : will be returned to the server if the server
+                : requests it for client authentication.
+-key arg        : The private key that matches the certificate
+                : specified by the -cert option.  If this is not
+                : specified (but -cert is), the -cert file will be
+                : searched for the Private key.  Both files are
+                : assumed to be in PEM format.
+-CApath arg     : When to look for certificates when 'verifying' the
+                : certificate from the server.
+-CAfile arg     : A file containing certificates to be used for
+                : 'verifying' the server certificate.
+-reconnect      : Once a connection has been made, drop it and
+                : reconnect with same session-id.  This is for testing :-).
+
+The '-verify n' parameter specifies not only to verify the servers
+certificate but to also only take notice of 'n' levels.  The best way
+to explain is to show via examples.
+Given
+s_server -cert server.PEM is running.
+
+s_client
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify error:num=1:unable to get issuer certificate
+        verify return:1
+        CIPHER is CBC-DES-MD5
+What has happened is that the 'SSLeay demo server' certificate's
+issuer ('CA') could not be found but because verify is not on, we
+don't care and the connection has been made anyway.  It is now 'up'
+using CBC-DES-MD5 mode.  This is an unauthenticate secure channel.
+You may not be talking to the right person but the data going to them
+is encrypted.
+
+s_client -verify 0
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify error:num=1:unable to get issuer certificate
+        verify return:1
+        CIPHER is CBC-DES-MD5
+We are 'verifying' but only to depth 0, so since the 'SSLeay demo server'
+certificate passed the date and checksum, we are happy to proceed.
+
+s_client -verify 1
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify error:num=1:unable to get issuer certificate
+        verify return:0
+        ERROR
+        verify error:unable to get issuer certificate
+In this case we failed to make the connection because we could not
+authenticate the certificate because we could not find the
+'CA' certificate.
+
+s_client -verify 1 -CAfile eay1024.PEM
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        CIPHER is CBC-DES-MD5
+We loaded the certificates from the file eay1024.PEM.  Everything
+checked out and so we made the connection.
+
+s_client -verify 1 -CApath .
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        CIPHER is CBC-DES-MD5
+We looked in out local directory for issuer certificates and 'found'
+a8556381.0 and so everything is ok.
+
+It is worth noting that 'CA' is a self certified certificate.  If you
+are passed one of these, it will fail to 'verify' at depth 0 because
+we need to lookup the certifier of a certificate from some information
+that we trust and keep locally.
+
+SSL_CIPHER=CBC3-DES-MD5:RC4-MD5
+export SSL_CIPHER
+s_client -verify 10 -CApath . -reconnect
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        drop the connection and reconnect with the same session id
+        CIPHER is CBC3-DES-MD5
+This has done a full connection and then re-estabished it with the
+same session id but a new socket.  No RSA stuff occures on the second
+connection.  Note that we said we would prefer to use CBC3-DES-MD5
+encryption and so, since the server supports it, we are.
+
+=====
+s_server
+This program accepts SSL connections on a specified port
+Once connected, it will estabish an SSL connection and optionaly
+attempt to authenticate the client.  A 2 directional channel will be
+open.  Any text typed will be sent to the other end.  Type Q<cr> to exit.
+Flags are as follows.
+-port arg       : Arg is the port to listen on.
+-verify arg     : Turn on authentication of the client if they have a
+                : certificate.  Arg specifies the 'depth'.
+-Verify arg     : Turn on authentication of the client. If they don't
+                : have a valid certificate, drop the connection.
+-cert arg       : The certificate to use.  This certificate
+                : will be passed to the client.  If it is not
+                : specified, it will default to server.PEM
+-key arg        : The private key that matches the certificate
+                : specified by the -cert option.  If this is not
+                : specified (but -cert is), the -cert file will be
+                : searched for the Private key.  Both files are
+                : assumed to be in PEM format.  Default is server.PEM
+-CApath arg     : When to look for certificates when 'verifying' the
+                : certificate from the client.
+-CAfile arg     : A file containing certificates to be used for
+                : 'verifying' the client certificate.
+
+For the following 'demo'  I will specify the s_server command and
+the s_client command and then list the output from the s_server.
+s_server
+s_client
+        CONNECTED
+        CIPHER is CBC-DES-MD5
+Everything up and running
+
+s_server -verify 0
+s_client  
+        CONNECTED
+        CIPHER is CBC-DES-MD5
+Ok since no certificate was returned and we don't care.
+
+s_server -verify 0
+./s_client -cert client.PEM
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo client
+        issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify error:num=1:unable to get issuer certificate
+        verify return:1
+        CIPHER is CBC-DES-MD5
+Ok since we were only verifying to level 0
+
+s_server -verify 4
+s_client -cert client.PEM
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo client
+        issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify error:num=1:unable to get issuer certificate
+        verify return:0
+        ERROR
+        verify error:unable to get issuer certificate
+Bad because we could not authenticate the returned certificate.
+
+s_server -verify 4 -CApath .
+s_client -cert client.PEM
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo client
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        CIPHER is CBC-DES-MD5
+Ok because we could authenticate the returned certificate :-).
+
+s_server -Verify 0 -CApath .
+s_client
+        CONNECTED
+        ERROR
+        SSL error:function is:REQUEST_CERTIFICATE
+                 :error is   :client end did not return a certificate
+Error because no certificate returned.
+
+s_server -Verify 4 -CApath .
+s_client -cert client.PEM
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo client
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        CIPHER is CBC-DES-MD5
+Full authentication of the client.
+
+So in summary to do full authentication of both ends
+s_server -Verify 9 -CApath .
+s_client -cert client.PEM -CApath . -verify 9
+From the server side
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo client
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        CIPHER is CBC-DES-MD5
+From the client side
+        CONNECTED
+        depth=0 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
+        verify return:1
+        depth=1 /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
+        verify return:1
+        CIPHER is CBC-DES-MD5
+
+For general probing of the 'internet https' servers for the
+distribution area, run
+s_client -host www.netscape.com -port 443 -verify 4 -CApath ../rsa/hash
+Then enter
+GET /
+and you should be talking to the https server on that host.
+
+www.rsa.com was refusing to respond to connections on 443 when I was
+testing.
+
+have fun :-).
+
+eric
diff --git a/src/lib/libssl/src/ssl/ssl.c b/src/lib/libssl/src/ssl/ssl.c
new file mode 100644
index 0000000000..7f506ce48f
--- /dev/null
+++ b/src/lib/libssl/src/ssl/ssl.c
@@ -0,0 +1,172 @@
+/* ssl/ssl.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define USE_SOCKETS
+#include "../e_os.h"
+
+#include "buffer.h"
+#include "stack.h"
+#include "lhash.h"
+
+#include "bio.h"
+#include "err.h"
+
+#include "bn.h"
+
+#include "rand.h"
+#include "conf.h"
+#include "txt_db.h"
+
+#include "err.h"
+#include "evp.h"
+
+#include "x509.h"
+#include "pkcs7.h"
+#include "pem.h"
+#include "asn1.h"
+#include "objects.h"
+
+#include "ssl_locl.h"
+
+#if !(BUILD_SSLV23) && !defined(BUILD_SSLV2) && !defined(BUILD_SSLV3) && !defined(BUILD_SSL_COMMON) && !defined(BUILD_SSL_BIO) && !defined(BUILD_SSL_OPTIONAL)
+#define BUILD_SSLV23
+#define BUILD_SSLV2
+#define BUILD_SSLV3
+#define BUILD_TLS1
+#define BUILD_SSL_COMMON
+#define BUILD_SSL_BIO
+#define BUILD_SSL_OPTIONAL
+#endif
+
+#ifdef NO_RSA
+#undef BUILD_SSLV2
+#undef BUILD_SSLV23
+#endif
+
+#ifdef NO_SSL2
+#undef BUILD_SSLV2
+#undef BUILD_SSLV23
+#endif
+
+#ifdef NO_SSL3
+#undef BUILD_SSL3
+#undef BUILD_SSLV23
+#endif
+
+#ifdef BUILD_SSLV23
+#include "s23_clnt.c"
+#include "s23_srvr.c"
+#include "s23_pkt.c"
+#include "s23_lib.c"
+#include "s23_meth.c"
+#endif
+
+#ifdef BUILD_SSLV2
+#include "s2_clnt.c"
+#include "s2_srvr.c"
+#include "s2_pkt.c"
+#include "s2_enc.c"
+#include "s2_lib.c"
+#include "s2_meth.c"
+#endif
+
+#ifdef BUILD_SSLV3
+#include "s3_clnt.c"
+#include "s3_both.c"
+#include "s3_srvr.c"
+#include "s3_pkt.c"
+#include "s3_enc.c"
+#include "s3_lib.c"
+#include "s3_meth.c"
+#endif
+
+#ifdef BUILD_TLS1
+#include "t1_clnt.c"
+#include "t1_enc.c"
+#include "t1_lib.c"
+#include "t1_meth.c"
+#include "t1_srvr.c"
+#endif
+
+
+#ifdef BUILD_SSL_COMMON
+#include "ssl_lib.c"
+#include "ssl_algs.c"
+#include "ssl_cert.c"
+#include "ssl_ciph.c"
+#include "ssl_sess.c"
+#include "ssl_rsa.c"
+#endif
+
+/* Extra things */
+#ifdef BUILD_SSL_BIO
+#include "bio_ssl.c"
+#endif
+
+#ifdef BUILD_SSL_OPTIONAL
+#include "ssl_asn1.c"
+#include "ssl_txt.c"
+#include "ssl_stat.c"
+#include "ssl_err.c"
+#include "ssl_err2.c"
+#endif
+
diff --git a/src/lib/libssl/src/ssl/ssl.err b/src/lib/libssl/src/ssl/ssl.err
new file mode 100644
index 0000000000..c54326c624
--- /dev/null
+++ b/src/lib/libssl/src/ssl/ssl.err
@@ -0,0 +1,290 @@
+/* Error codes for the SSL functions. */
+
+/* Function codes. */
+#define SSL_F_CLIENT_CERTIFICATE                         100
+#define SSL_F_CLIENT_HELLO                               101
+#define SSL_F_CLIENT_MASTER_KEY                          102
+#define SSL_F_D2I_SSL_SESSION                            103
+#define SSL_F_DO_SSL3_WRITE                              104
+#define SSL_F_GET_CLIENT_FINISHED                        105
+#define SSL_F_GET_CLIENT_HELLO                           106
+#define SSL_F_GET_CLIENT_MASTER_KEY                      107
+#define SSL_F_GET_SERVER_FINISHED                        108
+#define SSL_F_GET_SERVER_HELLO                           109
+#define SSL_F_GET_SERVER_VERIFY                          110
+#define SSL_F_I2D_SSL_SESSION                            111
+#define SSL_F_READ_N                                     112
+#define SSL_F_REQUEST_CERTIFICATE                        113
+#define SSL_F_SERVER_HELLO                               114
+#define SSL_F_SSL23_ACCEPT                               115
+#define SSL_F_SSL23_CLIENT_HELLO                         116
+#define SSL_F_SSL23_CONNECT                              117
+#define SSL_F_SSL23_GET_CLIENT_HELLO                     118
+#define SSL_F_SSL23_GET_SERVER_HELLO                     119
+#define SSL_F_SSL23_READ                                 120
+#define SSL_F_SSL23_WRITE                                121
+#define SSL_F_SSL2_ACCEPT                                122
+#define SSL_F_SSL2_CONNECT                               123
+#define SSL_F_SSL2_ENC_INIT                              124
+#define SSL_F_SSL2_READ                                  125
+#define SSL_F_SSL2_SET_CERTIFICATE                       126
+#define SSL_F_SSL2_WRITE                                 127
+#define SSL_F_SSL3_ACCEPT                                128
+#define SSL_F_SSL3_CHANGE_CIPHER_STATE                   129
+#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              130
+#define SSL_F_SSL3_CLIENT_HELLO                          131
+#define SSL_F_SSL3_CONNECT                               132
+#define SSL_F_SSL3_CTX_CTRL                              133
+#define SSL_F_SSL3_ENC                                   134
+#define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
+#define SSL_F_SSL3_GET_CERT_VERIFY                       136
+#define SSL_F_SSL3_GET_CLIENT_CERTIFICATE                137
+#define SSL_F_SSL3_GET_CLIENT_HELLO                      138
+#define SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE               139
+#define SSL_F_SSL3_GET_FINISHED                          140
+#define SSL_F_SSL3_GET_KEY_EXCHANGE                      141
+#define SSL_F_SSL3_GET_MESSAGE                           142
+#define SSL_F_SSL3_GET_RECORD                            143
+#define SSL_F_SSL3_GET_SERVER_CERTIFICATE                144
+#define SSL_F_SSL3_GET_SERVER_DONE                       145
+#define SSL_F_SSL3_GET_SERVER_HELLO                      146
+#define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     147
+#define SSL_F_SSL3_READ_BYTES                            148
+#define SSL_F_SSL3_READ_N                                149
+#define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST              150
+#define SSL_F_SSL3_SEND_CLIENT_CERTIFICATE               151
+#define SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE              152
+#define SSL_F_SSL3_SEND_CLIENT_VERIFY                    153
+#define SSL_F_SSL3_SEND_SERVER_CERTIFICATE               154
+#define SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE              155
+#define SSL_F_SSL3_SETUP_BUFFERS                         156
+#define SSL_F_SSL3_SETUP_KEY_BLOCK                       157
+#define SSL_F_SSL3_WRITE_BYTES                           158
+#define SSL_F_SSL3_WRITE_PENDING                         159
+#define SSL_F_SSL_BAD_METHOD                             160
+#define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   161
+#define SSL_F_SSL_CERT_NEW                               162
+#define SSL_F_SSL_CHECK_PRIVATE_KEY                      163
+#define SSL_F_SSL_CREATE_CIPHER_LIST                     164
+#define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  165
+#define SSL_F_SSL_CTX_NEW                                166
+#define SSL_F_SSL_CTX_SET_SSL_VERSION                    167
+#define SSL_F_SSL_CTX_USE_CERTIFICATE                    168
+#define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               169
+#define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               170
+#define SSL_F_SSL_CTX_USE_PRIVATEKEY                     171
+#define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                172
+#define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE                173
+#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY                  174
+#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1             175
+#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             176
+#define SSL_F_SSL_DO_HANDSHAKE                           177
+#define SSL_F_SSL_GET_NEW_SESSION                        178
+#define SSL_F_SSL_GET_SERVER_SEND_CERT                   179
+#define SSL_F_SSL_GET_SIGN_PKEY                          180
+#define SSL_F_SSL_INIT_WBIO_BUFFER                       181
+#define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    182
+#define SSL_F_SSL_NEW                                    183
+#define SSL_F_SSL_RSA_PRIVATE_DECRYPT                    184
+#define SSL_F_SSL_RSA_PUBLIC_ENCRYPT                     185
+#define SSL_F_SSL_SESSION_NEW                            186
+#define SSL_F_SSL_SESSION_PRINT_FP                       187
+#define SSL_F_SSL_SET_CERT                               188
+#define SSL_F_SSL_SET_FD                                 189
+#define SSL_F_SSL_SET_PKEY                               190
+#define SSL_F_SSL_SET_RFD                                191
+#define SSL_F_SSL_SET_SESSION                            192
+#define SSL_F_SSL_SET_WFD                                193
+#define SSL_F_SSL_UNDEFINED_FUNCTION                     194
+#define SSL_F_SSL_USE_CERTIFICATE                        195
+#define SSL_F_SSL_USE_CERTIFICATE_ASN1                   196
+#define SSL_F_SSL_USE_CERTIFICATE_FILE                   197
+#define SSL_F_SSL_USE_PRIVATEKEY                         198
+#define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    199
+#define SSL_F_SSL_USE_PRIVATEKEY_FILE                    200
+#define SSL_F_SSL_USE_RSAPRIVATEKEY                      201
+#define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 202
+#define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 203
+#define SSL_F_SSL_WRITE                                  204
+#define SSL_F_TLS1_CHANGE_CIPHER_STATE                   205
+#define SSL_F_TLS1_ENC                                   206
+#define SSL_F_TLS1_SETUP_KEY_BLOCK                       207
+#define SSL_F_WRITE_PENDING                              208
+
+/* Reason codes. */
+#define SSL_R_APP_DATA_IN_HANDSHAKE                      100
+#define SSL_R_BAD_ALERT_RECORD                           101
+#define SSL_R_BAD_AUTHENTICATION_TYPE                    102
+#define SSL_R_BAD_CHANGE_CIPHER_SPEC                     103
+#define SSL_R_BAD_CHECKSUM                               104
+#define SSL_R_BAD_CLIENT_REQUEST                         105
+#define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
+#define SSL_R_BAD_DECOMPRESSION                          107
+#define SSL_R_BAD_DH_G_LENGTH                            108
+#define SSL_R_BAD_DH_PUB_KEY_LENGTH                      109
+#define SSL_R_BAD_DH_P_LENGTH                            110
+#define SSL_R_BAD_DIGEST_LENGTH                          111
+#define SSL_R_BAD_DSA_SIGNATURE                          112
+#define SSL_R_BAD_MAC_DECODE                             113
+#define SSL_R_BAD_MESSAGE_TYPE                           114
+#define SSL_R_BAD_PACKET_LENGTH                          115
+#define SSL_R_BAD_PROTOCOL_VERSION_NUMBER                116
+#define SSL_R_BAD_RESPONSE_ARGUMENT                      117
+#define SSL_R_BAD_RSA_DECRYPT                            118
+#define SSL_R_BAD_RSA_ENCRYPT                            119
+#define SSL_R_BAD_RSA_E_LENGTH                           120
+#define SSL_R_BAD_RSA_MODULUS_LENGTH                     121
+#define SSL_R_BAD_RSA_SIGNATURE                          122
+#define SSL_R_BAD_SIGNATURE                              123
+#define SSL_R_BAD_SSL_FILETYPE                           124
+#define SSL_R_BAD_SSL_SESSION_ID_LENGTH                  125
+#define SSL_R_BAD_STATE                                  126
+#define SSL_R_BAD_WRITE_RETRY                            127
+#define SSL_R_BIO_NOT_SET                                128
+#define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  129
+#define SSL_R_BN_LIB                                     130
+#define SSL_R_CA_DN_LENGTH_MISMATCH                      131
+#define SSL_R_CA_DN_TOO_LONG                             132
+#define SSL_R_CCS_RECEIVED_EARLY                         133
+#define SSL_R_CERTIFICATE_VERIFY_FAILED                  134
+#define SSL_R_CERT_LENGTH_MISMATCH                       135
+#define SSL_R_CHALLENGE_IS_DIFFERENT                     136
+#define SSL_R_CIPHER_CODE_WRONG_LENGTH                   137
+#define SSL_R_CIPHER_OR_HASH_UNAVAILABLE                 138
+#define SSL_R_CIPHER_TABLE_SRC_ERROR                     139
+#define SSL_R_COMPRESSED_LENGTH_TOO_LONG                 140
+#define SSL_R_COMPRESSION_FAILURE                        141
+#define SSL_R_CONNECTION_ID_IS_DIFFERENT                 142
+#define SSL_R_CONNECTION_TYPE_NOT_SET                    143
+#define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              144
+#define SSL_R_DATA_LENGTH_TOO_LONG                       145
+#define SSL_R_DECRYPTION_FAILED                          146
+#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            147
+#define SSL_R_DIGEST_CHECK_FAILED                        148
+#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  149
+#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              150
+#define SSL_R_EXCESSIVE_MESSAGE_SIZE                     151
+#define SSL_R_EXTRA_DATA_IN_MESSAGE                      152
+#define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     153
+#define SSL_R_HTTPS_PROXY_REQUEST                        154
+#define SSL_R_HTTP_REQUEST                               155
+#define SSL_R_INTERNAL_ERROR                             156
+#define SSL_R_INVALID_CHALLENGE_LENGTH                   157
+#define SSL_R_LENGTH_MISMATCH                            158
+#define SSL_R_LENGTH_TOO_SHORT                           159
+#define SSL_R_LIBRARY_HAS_NO_CIPHERS                     160
+#define SSL_R_MISSING_DH_DSA_CERT                        161
+#define SSL_R_MISSING_DH_KEY                             162
+#define SSL_R_MISSING_DH_RSA_CERT                        163
+#define SSL_R_MISSING_DSA_SIGNING_CERT                   164
+#define SSL_R_MISSING_EXPORT_TMP_DH_KEY                  165
+#define SSL_R_MISSING_EXPORT_TMP_RSA_KEY                 166
+#define SSL_R_MISSING_RSA_CERTIFICATE                    167
+#define SSL_R_MISSING_RSA_ENCRYPTING_CERT                168
+#define SSL_R_MISSING_RSA_SIGNING_CERT                   169
+#define SSL_R_MISSING_TMP_DH_KEY                         170
+#define SSL_R_MISSING_TMP_RSA_KEY                        171
+#define SSL_R_MISSING_TMP_RSA_PKEY                       172
+#define SSL_R_MISSING_VERIFY_MESSAGE                     173
+#define SSL_R_NON_SSLV2_INITIAL_PACKET                   174
+#define SSL_R_NO_CERTIFICATES_RETURNED                   175
+#define SSL_R_NO_CERTIFICATE_ASSIGNED                    176
+#define SSL_R_NO_CERTIFICATE_RETURNED                    177
+#define SSL_R_NO_CERTIFICATE_SET                         178
+#define SSL_R_NO_CERTIFICATE_SPECIFIED                   179
+#define SSL_R_NO_CIPHERS_AVAILABLE                       180
+#define SSL_R_NO_CIPHERS_PASSED                          181
+#define SSL_R_NO_CIPHERS_SPECIFIED                       182
+#define SSL_R_NO_CIPHER_LIST                             183
+#define SSL_R_NO_CIPHER_MATCH                            184
+#define SSL_R_NO_CLIENT_CERT_RECEIVED                    185
+#define SSL_R_NO_COMPRESSION_SPECIFIED                   186
+#define SSL_R_NO_PRIVATEKEY                              187
+#define SSL_R_NO_PRIVATE_KEY_ASSIGNED                    188
+#define SSL_R_NO_PROTOCOLS_AVAILABLE                     189
+#define SSL_R_NO_PUBLICKEY                               190
+#define SSL_R_NO_SHARED_CIPHER                           191
+#define SSL_R_NULL_SSL_CTX                               192
+#define SSL_R_NULL_SSL_METHOD_PASSED                     193
+#define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            194
+#define SSL_R_PACKET_LENGTH_TOO_LONG                     195
+#define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE          196
+#define SSL_R_PEER_ERROR                                 197
+#define SSL_R_PEER_ERROR_CERTIFICATE                     198
+#define SSL_R_PEER_ERROR_NO_CERTIFICATE                  199
+#define SSL_R_PEER_ERROR_NO_CIPHER                       200
+#define SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE    201
+#define SSL_R_PRE_MAC_LENGTH_TOO_LONG                    202
+#define SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS          203
+#define SSL_R_PROTOCOL_IS_SHUTDOWN                       204
+#define SSL_R_PUBLIC_KEY_ENCRYPT_ERROR                   205
+#define SSL_R_PUBLIC_KEY_IS_NOT_RSA                      206
+#define SSL_R_PUBLIC_KEY_NOT_RSA                         207
+#define SSL_R_READ_BIO_NOT_SET                           208
+#define SSL_R_READ_WRONG_PACKET_TYPE                     209
+#define SSL_R_RECORD_LENGTH_MISMATCH                     210
+#define SSL_R_RECORD_TOO_LARGE                           211
+#define SSL_R_REQUIRED_CIPHER_MISSING                    212
+#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO                 213
+#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO                   214
+#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO                 215
+#define SSL_R_SHORT_READ                                 216
+#define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      217
+#define SSL_R_SSL3_SESSION_ID_TOO_SHORT                  218
+#define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE                1042
+#define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC                 1020
+#define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED            1045
+#define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED            1044
+#define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN            1046
+#define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE          1030
+#define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE              1040
+#define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER              1047
+#define SSL_R_SSLV3_ALERT_NO_CERTIFICATE                 1041
+#define SSL_R_SSLV3_ALERT_PEER_ERROR_CERTIFICATE         219
+#define SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CERTIFICATE      220
+#define SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CIPHER           221
+#define SSL_R_SSLV3_ALERT_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE 222
+#define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010
+#define SSL_R_SSLV3_ALERT_UNKNOWN_REMOTE_ERROR_TYPE      223
+#define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043
+#define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         224
+#define SSL_R_SSL_HANDSHAKE_FAILURE                      225
+#define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 226
+#define SSL_R_SSL_SESSION_ID_IS_DIFFERENT                227
+#define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER       228
+#define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 229
+#define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    230
+#define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            231
+#define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  232
+#define SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY               233
+#define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS               234
+#define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       235
+#define SSL_R_UNABLE_TO_FIND_SSL_METHOD                  236
+#define SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES           237
+#define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           238
+#define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          239
+#define SSL_R_UNEXPECTED_MESSAGE                         240
+#define SSL_R_UNEXPECTED_RECORD                          241
+#define SSL_R_UNKNOWN_ALERT_TYPE                         242
+#define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   243
+#define SSL_R_UNKNOWN_CIPHER_RETURNED                    244
+#define SSL_R_UNKNOWN_CIPHER_TYPE                        245
+#define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  246
+#define SSL_R_UNKNOWN_PKEY_TYPE                          247
+#define SSL_R_UNKNOWN_PROTOCOL                           248
+#define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE                  249
+#define SSL_R_UNKNOWN_SSL_VERSION                        250
+#define SSL_R_UNKNOWN_STATE                              251
+#define SSL_R_UNSUPPORTED_CIPHER                         252
+#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM          253
+#define SSL_R_UNSUPPORTED_PROTOCOL                       254
+#define SSL_R_UNSUPPORTED_SSL_VERSION                    255
+#define SSL_R_WRITE_BIO_NOT_SET                          256
+#define SSL_R_WRONG_CIPHER_RETURNED                      257
+#define SSL_R_WRONG_MESSAGE_TYPE                         258
+#define SSL_R_WRONG_NUMBER_OF_KEY_BITS                   259
+#define SSL_R_WRONG_SIGNATURE_LENGTH                     260
+#define SSL_R_WRONG_SIGNATURE_SIZE                       261
+#define SSL_R_WRONG_SSL_VERSION                          262
+#define SSL_R_WRONG_VERSION_NUMBER                       263
+#define SSL_R_X509_LIB                                   264
diff --git a/src/lib/libssl/src/test/.rnd b/src/lib/libssl/src/test/.rnd
new file mode 100644
index 0000000000..234970e241
--- /dev/null
+++ b/src/lib/libssl/src/test/.rnd
diff --git a/src/lib/libssl/src/test/Makefile.ssl b/src/lib/libssl/src/test/Makefile.ssl
new file mode 100644
index 0000000000..b3de76751e
--- /dev/null
+++ b/src/lib/libssl/src/test/Makefile.ssl
@@ -0,0 +1,294 @@
+#
+# test/Makefile.ssl
+#
+
+DIR=            test
+TOP=            ..
+CC=             cc
+INCLUDES=       -I../include
+CFLAG=          -g
+INSTALLTOP=     /usr/local/ssl
+MAKEFILE=       Makefile.ssl
+MAKE=           make -f $(MAKEFILE)
+MAKEDEPEND=     makedepend -f$(MAKEFILE)
+
+PEX_LIBS=
+EX_LIBS= #-lnsl -lsocket
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile.ssl
+
+DLIBCRYPTO= ../libcrypto.a
+DLIBSSL= ../libssl.a
+LIBCRYPTO= -L.. -lcrypto
+LIBSSL= -L.. -lssl
+
+BNTEST=         bntest
+EXPTEST=        exptest
+IDEATEST=       ideatest
+SHATEST=        shatest
+SHA1TEST=       sha1test
+MDC2TEST=       mdc2test
+RMDTEST=        rmdtest
+MD2TEST=        md2test
+MD5TEST=        md5test
+HMACTEST=       hmactest
+RC2TEST=        rc2test
+RC4TEST=        rc4test
+RC5TEST=        rc5test
+BFTEST=         bftest
+CASTTEST=       casttest
+DESTEST=        destest
+RANDTEST=       randtest
+DHTEST=         dhtest
+DSATEST=        dsatest
+METHTEST=       methtest
+SSLTEST=        ssltest
+
+EXE=    $(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD5TEST) $(HMACTEST) \
+        $(RC2TEST) $(RC4TEST) $(RC5TEST) \
+        $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
+        $(RANDTEST) $(DHTEST) \
+        $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST)
+
+# $(METHTEST)
+
+OBJ=    $(BNTEST).o $(IDEATEST).o $(MD2TEST).o  $(MD5TEST).o $(HMACTEST).o \
+        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
+        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
+        $(RANDTEST).o $(DHTEST).o $(CASTTEST).o \
+        $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o
+SRC=    $(BNTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD5TEST).c  $(HMACTEST).c \
+        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
+        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
+        $(RANDTEST).c $(DHTEST).c $(CASTTEST).c \
+        $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c
+
+EXHEADER= 
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all:    exe
+
+exe:    $(EXE)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+
+errors:
+
+install:
+
+tags:
+        ctags $(SRC)
+
+tests:  exe apps \
+        test_des test_idea test_sha test_md5 test_hmac test_md2 test_mdc2 \
+        test_rc2 test_rc4 test_rc5 test_bf test_cast \
+        test_rand test_enc test_x509 test_rsa test_crl test_sid test_req \
+        test_pkcs7 test_bn test_verify test_dh test_dsa test_reqgen \
+        test_ss test_ssl test_ca
+
+apps:
+        @(cd ../apps; $(MAKE)  CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all)
+
+test_des:
+        #./$(DESTEST)
+
+test_idea:
+        ./$(IDEATEST)
+
+test_sha:
+        ./$(SHATEST)
+        ./$(SHA1TEST)
+
+test_mdc2:
+        ./$(MDC2TEST)
+
+test_md5:
+        ./$(MD5TEST)
+
+test_hmac:
+        ./$(HMACTEST)
+
+test_md2:
+        ./$(MD2TEST)
+
+test_rmd:
+        ./$(RMDTEST)
+
+test_bf:
+        ./$(BFTEST)
+
+test_cast:
+        ./$(CASTTEST)
+
+test_rc2:
+        ./$(RC2TEST)
+
+test_rc4:
+        ./$(RC4TEST)
+
+test_rc5:
+        ./$(RC5TEST)
+
+test_rand:
+        ./$(RANDTEST)
+
+test_enc:
+        @sh ./testenc
+
+test_x509:
+        echo test normal x509v1 certificate
+        sh ./tx509 2>/dev/null
+        echo test first x509v3 certificate
+        sh ./tx509 v3-cert1.pem 2>/dev/null
+        echo test second x509v3 certificate
+        sh ./tx509 v3-cert2.pem 2>/dev/null
+
+test_rsa:
+        @sh ./trsa 2>/dev/null
+
+test_crl:
+        @sh ./tcrl 2>/dev/null
+
+test_sid:
+        @sh ./tsid 2>/dev/null
+
+test_req:
+        @sh ./treq 2>/dev/null
+        @sh ./treq testreq2.pem 2>/dev/null
+
+test_pkcs7:
+        @sh ./tpkcs7 2>/dev/null
+        @sh ./tpkcs7d 2>/dev/null
+
+test_bn:
+        @echo 'test a^b%c implementations'
+        ./$(EXPTEST)
+        @echo starting big number library test, could take a while...
+        @(./$(BNTEST)|bc) | awk '{ \
+if ($$0 != "0") {print "error"; exit(1); } \
+if (((NR+1)%64) == 0) print NR+1," tests done"; }'
+
+test_verify:
+        @echo "The following command should have some OK's and some failures"
+        @echo "There are definitly a few expired certificates"
+        ../apps/ssleay verify -CApath ../certs ../certs/*.pem
+
+test_dh:
+        @echo "Generate as set of DH parameters"
+        ./$(DHTEST)
+
+test_dsa:
+        @echo "Generate as set of DSA parameters"
+        ./$(DSATEST)
+
+test_reqgen:
+        @echo "Generate and verify a certificate request"
+        @sh ./testgen
+
+test_ss:
+        @echo "Generate and certify a test certificate"
+        @sh ./testss
+
+test_ssl:
+        @echo "test SSL protocol"
+        @sh ./testssl
+
+test_ca:
+        @echo "Generate and certify a test certificate via the 'ca' program"
+        @sh ./testca
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+
+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 $(EXE) *.ss log
+
+$(DLIBSSL):
+        (cd ../ssl; $(MAKE))
+
+$(DLIBCRYPTO):
+        (cd ../crypto; $(MAKE))
+
+$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+        $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/test/certCA.srl b/src/lib/libssl/src/test/certCA.srl
new file mode 100644
index 0000000000..39f5b69311
--- /dev/null
+++ b/src/lib/libssl/src/test/certCA.srl
@@ -0,0 +1 @@
+71
diff --git a/src/lib/libssl/src/test/demoCA/index.txt b/src/lib/libssl/src/test/demoCA/index.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/lib/libssl/src/test/demoCA/index.txt
diff --git a/src/lib/libssl/src/test/demoCA/private/cakey.pem b/src/lib/libssl/src/test/demoCA/private/cakey.pem
new file mode 100644
index 0000000000..edd5a5773f
--- /dev/null
+++ b/src/lib/libssl/src/test/demoCA/private/cakey.pem
@@ -0,0 +1,2 @@
+-----BEGIN RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/src/test/demoCA/serial b/src/lib/libssl/src/test/demoCA/serial
new file mode 100644
index 0000000000..8a0f05e166
--- /dev/null
+++ b/src/lib/libssl/src/test/demoCA/serial
@@ -0,0 +1 @@
+01
diff --git a/src/lib/libssl/src/test/dsa-ca.pem b/src/lib/libssl/src/test/dsa-ca.pem
new file mode 100644
index 0000000000..9eb08f3ddd
--- /dev/null
+++ b/src/lib/libssl/src/test/dsa-ca.pem
@@ -0,0 +1,43 @@
+-----BEGIN DSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,C5B6C7CC9E1FE2C0
+
+svCXBcBRhMuU22UXOfiKZA+thmz6KYXpt1Yg5Rd+TYQcQ1MdvNy0B0tkP1SxzDq0
+Xh1eMeTML9/9/0rKakgNXXXbpi5RB8t6BmwRSyej89F7nn1mtR3qzoyPRpp15SDl
+Tn67C+2v+HDF3MFk88hiNCYkNbcmi7TWvChsl8N1r7wdZwtIox56yXdgxw6ZIpa/
+par0oUCzN7fiavPgCWz1kfPNSaBQSdxwH7TZi5tMHAr0J3C7a7QRnZfE09R59Uqr
+zslrq+ndIw1BZAxoY0SlBu+iFOVaBVlwToC4AsHkv7j7l8ITtr7f42YbBa44D9TO
+uOhONmkk/v3Fso4RaOEzdKZC+hnmmzvHs6TiTWm6yzJgSFwyOUK0eGmKEeVxpcH5
+rUOlHOwzen+FFtocZDZAfdFnb7QY7L/boQvyA5A+ZbRG4DUpmBQeQsSaICHM5Rxx
+1QaLF413VNPXTLPbW0ilSc2H8x2iZTIVKfd33oSO6NhXPtSYQgfecEF4BvNHY5c4
+HovjT4mckbK95bcBzoCHu43vuSQkmZzdYo/ydSZt6zoPavbBLueTpgSbdXiDi827
+MVqOsYxGCb+kez0FoDSTgw==
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE REQUEST-----
+MIICUjCCAhECAQAwUjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAxMCQ0Ew
+ggG0MIIBKQYFKw4DAgwwggEeAoGBAKc/boW/QWopffCfRxkwkJoJHdpqMx7FPYaW
+sxXgUy6P4FmCc5A+dTGZR3pS+4Xk2aZ7OJtoioSbh8YetX6GS1NbWc9xZRmIbs5m
+rmuINvvsKNzC16W75Sw5JkvamnAYlTeVEFYj9hXtugRe3jlP/bdDH7WkZW/NgBHk
+cJVbUM1JAhUA9wcx7fpsBgPVhYocrJxl51BmZW8CgYBN30wDppGK9RlvUEYlmeVo
+bzDjaeHls12YuyiGSPzemQQ/X4gMnHMkDSBduSqaPxiWJ+Rih8F7dGJT/GEnqHqR
+CZ228U2cVA9YBu5JdAfOVX4jzhb2ytxaYQF+yXG1TfbcNCmHaPZeIJOz2/XkCWxB
+F5WS6wG1c6Vqftgy7Q4CuAOBhAACgYAapll6iqz9XrZFlk2GCVcB+KihxWnH7IuH
+vSLw9YUrJahcBHmbpvt494lF4gC5w3WPM+vXJofbusk4GoQEEsQNMDaah4m49uUq
+AylOVFJJJXuirVJ+o+0TtOFDITEAl+YZZariXOD7tdOSOl9RLMPC6+daHKS9e68u
+3enxhqnDGaAAMAkGBSsOAwIbBQADMAAwLQIVAJGVuFsG/0DBuSZ0jF7ypdU0/G0v
+AhQfeF5BoMMDbX/kidUVpQ6gadPlZA==
+-----END CERTIFICATE REQUEST-----
+-----BEGIN CERTIFICATE-----
+MIIBrjCCAWwCAQswCQYFKw4DAhsFADBTMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
+U29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQww
+CgYDVQQDEwNQQ0EwHhcNOTcwNjE1MDIxNDI5WhcNOTcwNzE1MDIxNDI5WjBSMQsw
+CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMQswCQYDVQQDEwJDQTCBkjAJBgUrDgMCDAUAA4GE
+AAKBgBqmWXqKrP1etkWWTYYJVwH4qKHFacfsi4e9IvD1hSslqFwEeZum+3j3iUXi
+ALnDdY8z69cmh9u6yTgahAQSxA0wNpqHibj25SoDKU5UUkkle6KtUn6j7RO04UMh
+MQCX5hllquJc4Pu105I6X1Esw8Lr51ocpL17ry7d6fGGqcMZMAkGBSsOAwIbBQAD
+MQAwLgIVAJ4wtQsANPxHo7Q4IQZYsL12SKdbAhUAjJ9n38zxT+iai2164xS+LIfa
+C1Q=
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/test/dsa-pca.pem b/src/lib/libssl/src/test/dsa-pca.pem
new file mode 100644
index 0000000000..e3641ad47e
--- /dev/null
+++ b/src/lib/libssl/src/test/dsa-pca.pem
@@ -0,0 +1,49 @@
+-----BEGIN DSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,F80EEEBEEA7386C4
+
+GZ9zgFcHOlnhPoiSbVi/yXc9mGoj44A6IveD4UlpSEUt6Xbse3Fr0KHIUyQ3oGnS
+mClKoAp/eOTb5Frhto85SzdsxYtac+X1v5XwdzAMy2KowHVk1N8A5jmE2OlkNPNt
+of132MNlo2cyIRYaa35PPYBGNCmUm7YcYS8O90YtkrQZZTf4+2C4kllhMcdkQwkr
+FWSWC8YOQ7w0LHb4cX1FejHHom9Nd/0PN3vn3UyySvfOqoR7nbXkrpHXmPIr0hxX
+RcF0aXcV/CzZ1/nfXWQf4o3+oD0T22SDoVcZY60IzI0oIc3pNCbDV3uKNmgekrFd
+qOUJ+QW8oWp7oefRx62iBfIeC8DZunohMXaWAQCU0sLQOR4yEdeUCnzCSywe0bG1
+diD0KYaEe+Yub1BQH4aLsBgDjardgpJRTQLq0DUvw0/QGO1irKTJzegEDNVBKrVn
+V4AHOKT1CUKqvGNRP1UnccUDTF6miOAtaj/qpzra7sSk7dkGBvIEeFoAg84kfh9h
+hVvF1YyzC9bwZepruoqoUwke/WdNIR5ymOVZ/4Liw0JdIOcq+atbdRX08niqIRkf
+dsZrUj4leo3zdefYUQ7w4N2Ns37yDFq7
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE REQUEST-----
+MIICVTCCAhMCAQAwUzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEMMAoGA1UEAxMDUENB
+MIIBtTCCASkGBSsOAwIMMIIBHgKBgQCnP26Fv0FqKX3wn0cZMJCaCR3aajMexT2G
+lrMV4FMuj+BZgnOQPnUxmUd6UvuF5NmmezibaIqEm4fGHrV+hktTW1nPcWUZiG7O
+Zq5riDb77Cjcwtelu+UsOSZL2ppwGJU3lRBWI/YV7boEXt45T/23Qx+1pGVvzYAR
+5HCVW1DNSQIVAPcHMe36bAYD1YWKHKycZedQZmVvAoGATd9MA6aRivUZb1BGJZnl
+aG8w42nh5bNdmLsohkj83pkEP1+IDJxzJA0gXbkqmj8YlifkYofBe3RiU/xhJ6h6
+kQmdtvFNnFQPWAbuSXQHzlV+I84W9srcWmEBfslxtU323DQph2j2XiCTs9v15Als
+QReVkusBtXOlan7YMu0OArgDgYUAAoGBAKbtuR5AdW+ICjCFe2ixjUiJJzM2IKwe
+6NZEMXg39+HQ1UTPTmfLZLps+rZfolHDXuRKMXbGFdSF0nXYzotPCzi7GauwEJTZ
+yr27ZZjA1C6apGSQ9GzuwNvZ4rCXystVEagAS8OQ4H3D4dWS17Zg31ICb5o4E5r0
+z09o/Uz46u0VoAAwCQYFKw4DAhsFAAMxADAuAhUArRubTxsbIXy3AhtjQ943AbNB
+nSICFQCu+g1iW3jwF+gOcbroD4S/ZcvB3w==
+-----END CERTIFICATE REQUEST-----
+-----BEGIN CERTIFICATE-----
+MIIC0zCCApECAQAwCQYFKw4DAhsFADBTMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
+U29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQww
+CgYDVQQDEwNQQ0EwHhcNOTcwNjE0MjI1NDQ1WhcNOTcwNzE0MjI1NDQ1WjBTMQsw
+CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDEwNQQ0EwggG1MIIBKQYFKw4DAgww
+ggEeAoGBAKc/boW/QWopffCfRxkwkJoJHdpqMx7FPYaWsxXgUy6P4FmCc5A+dTGZ
+R3pS+4Xk2aZ7OJtoioSbh8YetX6GS1NbWc9xZRmIbs5mrmuINvvsKNzC16W75Sw5
+JkvamnAYlTeVEFYj9hXtugRe3jlP/bdDH7WkZW/NgBHkcJVbUM1JAhUA9wcx7fps
+BgPVhYocrJxl51BmZW8CgYBN30wDppGK9RlvUEYlmeVobzDjaeHls12YuyiGSPze
+mQQ/X4gMnHMkDSBduSqaPxiWJ+Rih8F7dGJT/GEnqHqRCZ228U2cVA9YBu5JdAfO
+VX4jzhb2ytxaYQF+yXG1TfbcNCmHaPZeIJOz2/XkCWxBF5WS6wG1c6Vqftgy7Q4C
+uAOBhQACgYEApu25HkB1b4gKMIV7aLGNSIknMzYgrB7o1kQxeDf34dDVRM9OZ8tk
+umz6tl+iUcNe5EoxdsYV1IXSddjOi08LOLsZq7AQlNnKvbtlmMDULpqkZJD0bO7A
+29nisJfKy1URqABLw5DgfcPh1ZLXtmDfUgJvmjgTmvTPT2j9TPjq7RUwCQYFKw4D
+AhsFAAMxADAuAhUAvtv6AkMolix1Jvy3UnVEIUqdCUICFQC+jq8P49mwrY9oJ24n
+5rKUjNBhSg==
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/src/test/p b/src/lib/libssl/src/test/p
new file mode 100644
index 0000000000..b3de76751e
--- /dev/null
+++ b/src/lib/libssl/src/test/p
@@ -0,0 +1,294 @@
+#
+# test/Makefile.ssl
+#
+
+DIR=            test
+TOP=            ..
+CC=             cc
+INCLUDES=       -I../include
+CFLAG=          -g
+INSTALLTOP=     /usr/local/ssl
+MAKEFILE=       Makefile.ssl
+MAKE=           make -f $(MAKEFILE)
+MAKEDEPEND=     makedepend -f$(MAKEFILE)
+
+PEX_LIBS=
+EX_LIBS= #-lnsl -lsocket
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile.ssl
+
+DLIBCRYPTO= ../libcrypto.a
+DLIBSSL= ../libssl.a
+LIBCRYPTO= -L.. -lcrypto
+LIBSSL= -L.. -lssl
+
+BNTEST=         bntest
+EXPTEST=        exptest
+IDEATEST=       ideatest
+SHATEST=        shatest
+SHA1TEST=       sha1test
+MDC2TEST=       mdc2test
+RMDTEST=        rmdtest
+MD2TEST=        md2test
+MD5TEST=        md5test
+HMACTEST=       hmactest
+RC2TEST=        rc2test
+RC4TEST=        rc4test
+RC5TEST=        rc5test
+BFTEST=         bftest
+CASTTEST=       casttest
+DESTEST=        destest
+RANDTEST=       randtest
+DHTEST=         dhtest
+DSATEST=        dsatest
+METHTEST=       methtest
+SSLTEST=        ssltest
+
+EXE=    $(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD5TEST) $(HMACTEST) \
+        $(RC2TEST) $(RC4TEST) $(RC5TEST) \
+        $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
+        $(RANDTEST) $(DHTEST) \
+        $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST)
+
+# $(METHTEST)
+
+OBJ=    $(BNTEST).o $(IDEATEST).o $(MD2TEST).o  $(MD5TEST).o $(HMACTEST).o \
+        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
+        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
+        $(RANDTEST).o $(DHTEST).o $(CASTTEST).o \
+        $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o
+SRC=    $(BNTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD5TEST).c  $(HMACTEST).c \
+        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
+        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
+        $(RANDTEST).c $(DHTEST).c $(CASTTEST).c \
+        $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c
+
+EXHEADER= 
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all:    exe
+
+exe:    $(EXE)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+
+errors:
+
+install:
+
+tags:
+        ctags $(SRC)
+
+tests:  exe apps \
+        test_des test_idea test_sha test_md5 test_hmac test_md2 test_mdc2 \
+        test_rc2 test_rc4 test_rc5 test_bf test_cast \
+        test_rand test_enc test_x509 test_rsa test_crl test_sid test_req \
+        test_pkcs7 test_bn test_verify test_dh test_dsa test_reqgen \
+        test_ss test_ssl test_ca
+
+apps:
+        @(cd ../apps; $(MAKE)  CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all)
+
+test_des:
+        #./$(DESTEST)
+
+test_idea:
+        ./$(IDEATEST)
+
+test_sha:
+        ./$(SHATEST)
+        ./$(SHA1TEST)
+
+test_mdc2:
+        ./$(MDC2TEST)
+
+test_md5:
+        ./$(MD5TEST)
+
+test_hmac:
+        ./$(HMACTEST)
+
+test_md2:
+        ./$(MD2TEST)
+
+test_rmd:
+        ./$(RMDTEST)
+
+test_bf:
+        ./$(BFTEST)
+
+test_cast:
+        ./$(CASTTEST)
+
+test_rc2:
+        ./$(RC2TEST)
+
+test_rc4:
+        ./$(RC4TEST)
+
+test_rc5:
+        ./$(RC5TEST)
+
+test_rand:
+        ./$(RANDTEST)
+
+test_enc:
+        @sh ./testenc
+
+test_x509:
+        echo test normal x509v1 certificate
+        sh ./tx509 2>/dev/null
+        echo test first x509v3 certificate
+        sh ./tx509 v3-cert1.pem 2>/dev/null
+        echo test second x509v3 certificate
+        sh ./tx509 v3-cert2.pem 2>/dev/null
+
+test_rsa:
+        @sh ./trsa 2>/dev/null
+
+test_crl:
+        @sh ./tcrl 2>/dev/null
+
+test_sid:
+        @sh ./tsid 2>/dev/null
+
+test_req:
+        @sh ./treq 2>/dev/null
+        @sh ./treq testreq2.pem 2>/dev/null
+
+test_pkcs7:
+        @sh ./tpkcs7 2>/dev/null
+        @sh ./tpkcs7d 2>/dev/null
+
+test_bn:
+        @echo 'test a^b%c implementations'
+        ./$(EXPTEST)
+        @echo starting big number library test, could take a while...
+        @(./$(BNTEST)|bc) | awk '{ \
+if ($$0 != "0") {print "error"; exit(1); } \
+if (((NR+1)%64) == 0) print NR+1," tests done"; }'
+
+test_verify:
+        @echo "The following command should have some OK's and some failures"
+        @echo "There are definitly a few expired certificates"
+        ../apps/ssleay verify -CApath ../certs ../certs/*.pem
+
+test_dh:
+        @echo "Generate as set of DH parameters"
+        ./$(DHTEST)
+
+test_dsa:
+        @echo "Generate as set of DSA parameters"
+        ./$(DSATEST)
+
+test_reqgen:
+        @echo "Generate and verify a certificate request"
+        @sh ./testgen
+
+test_ss:
+        @echo "Generate and certify a test certificate"
+        @sh ./testss
+
+test_ssl:
+        @echo "test SSL protocol"
+        @sh ./testssl
+
+test_ca:
+        @echo "Generate and certify a test certificate via the 'ca' program"
+        @sh ./testca
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+
+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 $(EXE) *.ss log
+
+$(DLIBSSL):
+        (cd ../ssl; $(MAKE))
+
+$(DLIBCRYPTO):
+        (cd ../crypto; $(MAKE))
+
+$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+        $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/src/test/riptest b/src/lib/libssl/src/test/riptest
new file mode 100644
index 0000000000..8685d0ce53
--- /dev/null
+++ b/src/lib/libssl/src/test/riptest
diff --git a/src/lib/libssl/src/test/test.txt b/src/lib/libssl/src/test/test.txt
new file mode 100644
index 0000000000..c6d8d50ba9
--- /dev/null
+++ b/src/lib/libssl/src/test/test.txt
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+test=./test.txt
+
+cat $0 >$test;
+
+for i in rc4 des-cfb des-ofb des-ecb des-cbc des-ede des-ede3 \
+        des-cbc-ede des-cbc-ede3 idea-ecb idea-cfb idea-ofb idea-cbc 
+do
+        echo $i
+        ../apps/ssleay $i -e -k test < $test > $test.$i.cipher
+        ../apps/ssleay $i -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+
+        echo $i base64
+        ../apps/ssleay $i -a -e -k test < $test > $test.$i.cipher
+        ../apps/ssleay $i -a -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+done
diff --git a/src/lib/libssl/src/test/testkey.pem b/src/lib/libssl/src/test/testkey.pem
new file mode 100644
index 0000000000..edd5a5773f
--- /dev/null
+++ b/src/lib/libssl/src/test/testkey.pem
@@ -0,0 +1,2 @@
+-----BEGIN RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/src/test/testreq.pem b/src/lib/libssl/src/test/testreq.pem
new file mode 100644
index 0000000000..1311fa7785
--- /dev/null
+++ b/src/lib/libssl/src/test/testreq.pem
@@ -0,0 +1,9 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBQjCB7QIBADCBhzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQx
+ETAPBgNVBAcTCEJyaXNiYW5lMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDET
+MBEGA1UEAxMKRXJpYyBZb3VuZzEfMB0GCSqGSIb3DQEJARYQZWF5QG1pbmNvbS5v
+ei5hdTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDVKdT5QB2ZojtNQGjA/9J7s2o4
+RNkuSq8l377uWLAyMljtdkcoRsvUy5lZ997UDHFTbVFA038ZBrmw7l5EyHeXAgMB
+AAGgADANBgkqhkiG9w0BAQQFAANBAKnaFr4u7PTdfmpjiX/H8Ho4UWGVRWUlvD2R
+/D9yoTj7TN3uODx2BD0drErVBe/Zjv81vhH6Yo3cJO/hRS3A7jw=
+-----END CERTIFICATE REQUEST-----
diff --git a/src/lib/libssl/src/tools/Makefile.ssl b/src/lib/libssl/src/tools/Makefile.ssl
new file mode 100644
index 0000000000..537e97d268
--- /dev/null
+++ b/src/lib/libssl/src/tools/Makefile.ssl
@@ -0,0 +1,54 @@
+#
+# SSLeay/tools/Makefile
+#
+
+DIR=    tools
+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
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile.ssl
+TEST=
+APPS= c_hash c_info c_issuer c_name c_rehash
+
+all:
+
+install:
+        @for i in $(APPS) ; \
+        do  \
+        (cp $$i $(INSTALLTOP)/bin/$$i; \
+        chmod 755 $(INSTALLTOP)/bin/$$i ); \
+        done;
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+
+lint:
+
+tags:
+
+errors:
+
+depend:
+
+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/libssl/src/util/mklink.sh b/src/lib/libssl/src/util/mklink.sh
new file mode 100644
index 0000000000..1e052ed6ee
--- /dev/null
+++ b/src/lib/libssl/src/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/libssl/src/util/ranlib.sh b/src/lib/libssl/src/util/ranlib.sh
new file mode 100644
index 0000000000..543f712c6b
--- /dev/null
+++ b/src/lib/libssl/src/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/libssl/src/util/sep_lib.sh b/src/lib/libssl/src/util/sep_lib.sh
new file mode 100644
index 0000000000..2348db874e
--- /dev/null
+++ b/src/lib/libssl/src/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/libssl/src/util/ssldir.pl b/src/lib/libssl/src/util/ssldir.pl
new file mode 100644
index 0000000000..10584686da
--- /dev/null
+++ b/src/lib/libssl/src/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/libssl/src/util/up_ver.pl b/src/lib/libssl/src/util/up_ver.pl
new file mode 100644
index 0000000000..32c086b2aa
--- /dev/null
+++ b/src/lib/libssl/src/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/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile
new file mode 100644
index 0000000000..3816de81ea
--- /dev/null
+++ b/src/lib/libssl/ssl-patent/Makefile
@@ -0,0 +1,90 @@
+
+LIB=    ssl
+
+SSLEAYDIST= src-patent
+
+LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+= -DL_ENDIAN -DBN_ASM
+.else
+.if ${MACHINE} == "arc"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE} == "galileo"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE} == "pmax"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "alpha"
+# no ENDIAN stuff defined for alpha
+.else
+CFLAGS+= -DB_ENDIAN
+.endif
+.endif
+.endif
+.endif
+.endif 
+
+CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+CFLAGS+= -I${LCRYPTO_SRC}/des
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+CFLAGS+= -I${LCRYPTO_SRC}/err
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
+
+SRCS=   s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
+        s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
+        s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
+        t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c \
+        ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
+        ssl_ciph.c ssl_stat.c ssl_rsa.c \
+        ssl_asn1.c ssl_txt.c ssl_algs.c \
+        bio_ssl.c ssl_err.c
+
+HDRS=   ssl.h ssl2.h ssl3.h ssl23.h tls1.h
+
+.PATH:  ${LSSL_SRC}
+
+includes:
+        @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
+        @cd ${LSSL_SRC}; for i in $(HDRS); do \
+                j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \
+                ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+                $$i ${DESTDIR}/usr/include/ssl"; \
+                echo $$j; \
+                eval "$$j"; \
+        done
+
+
+.include <bsd.lib.mk>
diff --git a/src/lib/libssl/ssl-patent/shlib_version b/src/lib/libssl/ssl-patent/shlib_version
new file mode 100644
index 0000000000..893819d18f
--- /dev/null
+++ b/src/lib/libssl/ssl-patent/shlib_version
@@ -0,0 +1,2 @@
+major=1
+minor=1
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
new file mode 100644
index 0000000000..7a2b6da6e0
--- /dev/null
+++ b/src/lib/libssl/ssl/Makefile
@@ -0,0 +1,90 @@
+
+LIB=    ssl
+
+SSLEAYDIST= src
+
+LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+= -DL_ENDIAN -DBN_ASM
+.else
+.if ${MACHINE_ARCH} == "arc"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "pmax"
+CFLAGS+= -DL_ENDIAN
+.else
+.if ${MACHINE_ARCH} == "alpha"
+# no ENDIAN stuff defined for alpha
+.else
+CFLAGS+= -DB_ENDIAN
+.endif
+.endif
+.endif
+.endif 
+
+CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+CFLAGS+= -I${LCRYPTO_SRC}/des
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+CFLAGS+= -I${LCRYPTO_SRC}/err
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
+
+SRCS=   s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
+        s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \
+        s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
+        t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c \
+        ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
+        ssl_ciph.c ssl_stat.c ssl_rsa.c \
+        ssl_asn1.c ssl_txt.c ssl_algs.c \
+        bio_ssl.c ssl_err.c
+
+HDRS=   ssl.h ssl2.h ssl3.h ssl23.h tls1.h
+
+.PATH:  ${LSSL_SRC}
+
+includes:
+        @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
+        @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
+        cd ${LSSL_SRC}; for i in $(HDRS); do \
+                f=`basename $$i`; \
+                j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \
+                       $$i >$$d/$$f && \
+                (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
+                ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+                $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
+                echo $$j; \
+                eval "$$j"; \
+        done; \
+        rm -rf $$d
+
+.include <bsd.lib.mk>
diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version
new file mode 100644
index 0000000000..1edea46de9
--- /dev/null
+++ b/src/lib/libssl/ssl/shlib_version
@@ -0,0 +1,2 @@
+major=1
+minor=0
diff --git a/src/lib/libssl/ssleay.cnf b/src/lib/libssl/ssleay.cnf
new file mode 100644
index 0000000000..c6480ee465
--- /dev/null
+++ b/src/lib/libssl/ssleay.cnf
@@ -0,0 +1,65 @@
+#
+# SSLeay example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+RANDFILE                = /dev/arandom
+
+####################################################################
+[ req ]
+default_bits            = 1024
+default_keyfile         = privkey.pem
+distinguished_name      = req_distinguished_name
+attributes              = req_attributes
+
+[ req_distinguished_name ]
+countryName                     = Country Name (2 letter code)
+#countryName_default            = AU
+countryName_min                 = 2
+countryName_max                 = 2
+
+stateOrProvinceName             = State or Province Name (full name)
+#stateOrProvinceName_default    = Some-State
+
+localityName                    = Locality Name (eg, city)
+
+0.organizationName              = Organization Name (eg, company)
+#0.organizationName_default     = Internet Widgits Pty Ltd
+
+# we can do this but it is not needed normally :-)
+#1.organizationName             = Second Organization Name (eg, company)
+#1.organizationName_default     = CryptSoft Pty Ltd
+
+organizationalUnitName          = Organizational Unit Name (eg, section)
+#organizationalUnitName_default =
+
+commonName                      = Common Name (eg, fully qualified host name)
+commonName_max                  = 64
+
+emailAddress                    = Email Address
+emailAddress_max                = 64
+
+[ req_attributes ]
+challengePassword               = A challenge password
+challengePassword_min           = 4
+challengePassword_max           = 20
+
+unstructuredName                = An optional company name
+
+[ x509v3_extensions ]
+
+nsCaRevocationUrl               = http://www.cryptsoft.com/ca-crl.pem
+nsComment                       = "This is a comment"
+
+# under ASN.1, the 0 bit would be encoded as 80
+nsCertType                      = 0x40
+
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+#nsCertSequence
+#nsCertExt
+#nsDataType
+
diff --git a/src/lib/libssl/test/.rnd b/src/lib/libssl/test/.rnd
new file mode 100644
index 0000000000..234970e241
--- /dev/null
+++ b/src/lib/libssl/test/.rnd
diff --git a/src/lib/libssl/test/Makefile.ssl b/src/lib/libssl/test/Makefile.ssl
new file mode 100644
index 0000000000..b3de76751e
--- /dev/null
+++ b/src/lib/libssl/test/Makefile.ssl
@@ -0,0 +1,294 @@
+#
+# test/Makefile.ssl
+#
+
+DIR=            test
+TOP=            ..
+CC=             cc
+INCLUDES=       -I../include
+CFLAG=          -g
+INSTALLTOP=     /usr/local/ssl
+MAKEFILE=       Makefile.ssl
+MAKE=           make -f $(MAKEFILE)
+MAKEDEPEND=     makedepend -f$(MAKEFILE)
+
+PEX_LIBS=
+EX_LIBS= #-lnsl -lsocket
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile.ssl
+
+DLIBCRYPTO= ../libcrypto.a
+DLIBSSL= ../libssl.a
+LIBCRYPTO= -L.. -lcrypto
+LIBSSL= -L.. -lssl
+
+BNTEST=         bntest
+EXPTEST=        exptest
+IDEATEST=       ideatest
+SHATEST=        shatest
+SHA1TEST=       sha1test
+MDC2TEST=       mdc2test
+RMDTEST=        rmdtest
+MD2TEST=        md2test
+MD5TEST=        md5test
+HMACTEST=       hmactest
+RC2TEST=        rc2test
+RC4TEST=        rc4test
+RC5TEST=        rc5test
+BFTEST=         bftest
+CASTTEST=       casttest
+DESTEST=        destest
+RANDTEST=       randtest
+DHTEST=         dhtest
+DSATEST=        dsatest
+METHTEST=       methtest
+SSLTEST=        ssltest
+
+EXE=    $(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD5TEST) $(HMACTEST) \
+        $(RC2TEST) $(RC4TEST) $(RC5TEST) \
+        $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
+        $(RANDTEST) $(DHTEST) \
+        $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST)
+
+# $(METHTEST)
+
+OBJ=    $(BNTEST).o $(IDEATEST).o $(MD2TEST).o  $(MD5TEST).o $(HMACTEST).o \
+        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
+        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
+        $(RANDTEST).o $(DHTEST).o $(CASTTEST).o \
+        $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o
+SRC=    $(BNTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD5TEST).c  $(HMACTEST).c \
+        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
+        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
+        $(RANDTEST).c $(DHTEST).c $(CASTTEST).c \
+        $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c
+
+EXHEADER= 
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all:    exe
+
+exe:    $(EXE)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+
+errors:
+
+install:
+
+tags:
+        ctags $(SRC)
+
+tests:  exe apps \
+        test_des test_idea test_sha test_md5 test_hmac test_md2 test_mdc2 \
+        test_rc2 test_rc4 test_rc5 test_bf test_cast \
+        test_rand test_enc test_x509 test_rsa test_crl test_sid test_req \
+        test_pkcs7 test_bn test_verify test_dh test_dsa test_reqgen \
+        test_ss test_ssl test_ca
+
+apps:
+        @(cd ../apps; $(MAKE)  CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all)
+
+test_des:
+        #./$(DESTEST)
+
+test_idea:
+        ./$(IDEATEST)
+
+test_sha:
+        ./$(SHATEST)
+        ./$(SHA1TEST)
+
+test_mdc2:
+        ./$(MDC2TEST)
+
+test_md5:
+        ./$(MD5TEST)
+
+test_hmac:
+        ./$(HMACTEST)
+
+test_md2:
+        ./$(MD2TEST)
+
+test_rmd:
+        ./$(RMDTEST)
+
+test_bf:
+        ./$(BFTEST)
+
+test_cast:
+        ./$(CASTTEST)
+
+test_rc2:
+        ./$(RC2TEST)
+
+test_rc4:
+        ./$(RC4TEST)
+
+test_rc5:
+        ./$(RC5TEST)
+
+test_rand:
+        ./$(RANDTEST)
+
+test_enc:
+        @sh ./testenc
+
+test_x509:
+        echo test normal x509v1 certificate
+        sh ./tx509 2>/dev/null
+        echo test first x509v3 certificate
+        sh ./tx509 v3-cert1.pem 2>/dev/null
+        echo test second x509v3 certificate
+        sh ./tx509 v3-cert2.pem 2>/dev/null
+
+test_rsa:
+        @sh ./trsa 2>/dev/null
+
+test_crl:
+        @sh ./tcrl 2>/dev/null
+
+test_sid:
+        @sh ./tsid 2>/dev/null
+
+test_req:
+        @sh ./treq 2>/dev/null
+        @sh ./treq testreq2.pem 2>/dev/null
+
+test_pkcs7:
+        @sh ./tpkcs7 2>/dev/null
+        @sh ./tpkcs7d 2>/dev/null
+
+test_bn:
+        @echo 'test a^b%c implementations'
+        ./$(EXPTEST)
+        @echo starting big number library test, could take a while...
+        @(./$(BNTEST)|bc) | awk '{ \
+if ($$0 != "0") {print "error"; exit(1); } \
+if (((NR+1)%64) == 0) print NR+1," tests done"; }'
+
+test_verify:
+        @echo "The following command should have some OK's and some failures"
+        @echo "There are definitly a few expired certificates"
+        ../apps/ssleay verify -CApath ../certs ../certs/*.pem
+
+test_dh:
+        @echo "Generate as set of DH parameters"
+        ./$(DHTEST)
+
+test_dsa:
+        @echo "Generate as set of DSA parameters"
+        ./$(DSATEST)
+
+test_reqgen:
+        @echo "Generate and verify a certificate request"
+        @sh ./testgen
+
+test_ss:
+        @echo "Generate and certify a test certificate"
+        @sh ./testss
+
+test_ssl:
+        @echo "test SSL protocol"
+        @sh ./testssl
+
+test_ca:
+        @echo "Generate and certify a test certificate via the 'ca' program"
+        @sh ./testca
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+
+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 $(EXE) *.ss log
+
+$(DLIBSSL):
+        (cd ../ssl; $(MAKE))
+
+$(DLIBCRYPTO):
+        (cd ../crypto; $(MAKE))
+
+$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+        $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/test/certCA.srl b/src/lib/libssl/test/certCA.srl
new file mode 100644
index 0000000000..39f5b69311
--- /dev/null
+++ b/src/lib/libssl/test/certCA.srl
@@ -0,0 +1 @@
+71
diff --git a/src/lib/libssl/test/demoCA/index.txt b/src/lib/libssl/test/demoCA/index.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/src/lib/libssl/test/demoCA/index.txt
diff --git a/src/lib/libssl/test/demoCA/private/cakey.pem b/src/lib/libssl/test/demoCA/private/cakey.pem
new file mode 100644
index 0000000000..edd5a5773f
--- /dev/null
+++ b/src/lib/libssl/test/demoCA/private/cakey.pem
@@ -0,0 +1,2 @@
+-----BEGIN RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/test/demoCA/serial b/src/lib/libssl/test/demoCA/serial
new file mode 100644
index 0000000000..8a0f05e166
--- /dev/null
+++ b/src/lib/libssl/test/demoCA/serial
@@ -0,0 +1 @@
+01
diff --git a/src/lib/libssl/test/dsa-ca.pem b/src/lib/libssl/test/dsa-ca.pem
new file mode 100644
index 0000000000..9eb08f3ddd
--- /dev/null
+++ b/src/lib/libssl/test/dsa-ca.pem
@@ -0,0 +1,43 @@
+-----BEGIN DSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,C5B6C7CC9E1FE2C0
+
+svCXBcBRhMuU22UXOfiKZA+thmz6KYXpt1Yg5Rd+TYQcQ1MdvNy0B0tkP1SxzDq0
+Xh1eMeTML9/9/0rKakgNXXXbpi5RB8t6BmwRSyej89F7nn1mtR3qzoyPRpp15SDl
+Tn67C+2v+HDF3MFk88hiNCYkNbcmi7TWvChsl8N1r7wdZwtIox56yXdgxw6ZIpa/
+par0oUCzN7fiavPgCWz1kfPNSaBQSdxwH7TZi5tMHAr0J3C7a7QRnZfE09R59Uqr
+zslrq+ndIw1BZAxoY0SlBu+iFOVaBVlwToC4AsHkv7j7l8ITtr7f42YbBa44D9TO
+uOhONmkk/v3Fso4RaOEzdKZC+hnmmzvHs6TiTWm6yzJgSFwyOUK0eGmKEeVxpcH5
+rUOlHOwzen+FFtocZDZAfdFnb7QY7L/boQvyA5A+ZbRG4DUpmBQeQsSaICHM5Rxx
+1QaLF413VNPXTLPbW0ilSc2H8x2iZTIVKfd33oSO6NhXPtSYQgfecEF4BvNHY5c4
+HovjT4mckbK95bcBzoCHu43vuSQkmZzdYo/ydSZt6zoPavbBLueTpgSbdXiDi827
+MVqOsYxGCb+kez0FoDSTgw==
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE REQUEST-----
+MIICUjCCAhECAQAwUjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAxMCQ0Ew
+ggG0MIIBKQYFKw4DAgwwggEeAoGBAKc/boW/QWopffCfRxkwkJoJHdpqMx7FPYaW
+sxXgUy6P4FmCc5A+dTGZR3pS+4Xk2aZ7OJtoioSbh8YetX6GS1NbWc9xZRmIbs5m
+rmuINvvsKNzC16W75Sw5JkvamnAYlTeVEFYj9hXtugRe3jlP/bdDH7WkZW/NgBHk
+cJVbUM1JAhUA9wcx7fpsBgPVhYocrJxl51BmZW8CgYBN30wDppGK9RlvUEYlmeVo
+bzDjaeHls12YuyiGSPzemQQ/X4gMnHMkDSBduSqaPxiWJ+Rih8F7dGJT/GEnqHqR
+CZ228U2cVA9YBu5JdAfOVX4jzhb2ytxaYQF+yXG1TfbcNCmHaPZeIJOz2/XkCWxB
+F5WS6wG1c6Vqftgy7Q4CuAOBhAACgYAapll6iqz9XrZFlk2GCVcB+KihxWnH7IuH
+vSLw9YUrJahcBHmbpvt494lF4gC5w3WPM+vXJofbusk4GoQEEsQNMDaah4m49uUq
+AylOVFJJJXuirVJ+o+0TtOFDITEAl+YZZariXOD7tdOSOl9RLMPC6+daHKS9e68u
+3enxhqnDGaAAMAkGBSsOAwIbBQADMAAwLQIVAJGVuFsG/0DBuSZ0jF7ypdU0/G0v
+AhQfeF5BoMMDbX/kidUVpQ6gadPlZA==
+-----END CERTIFICATE REQUEST-----
+-----BEGIN CERTIFICATE-----
+MIIBrjCCAWwCAQswCQYFKw4DAhsFADBTMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
+U29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQww
+CgYDVQQDEwNQQ0EwHhcNOTcwNjE1MDIxNDI5WhcNOTcwNzE1MDIxNDI5WjBSMQsw
+CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMQswCQYDVQQDEwJDQTCBkjAJBgUrDgMCDAUAA4GE
+AAKBgBqmWXqKrP1etkWWTYYJVwH4qKHFacfsi4e9IvD1hSslqFwEeZum+3j3iUXi
+ALnDdY8z69cmh9u6yTgahAQSxA0wNpqHibj25SoDKU5UUkkle6KtUn6j7RO04UMh
+MQCX5hllquJc4Pu105I6X1Esw8Lr51ocpL17ry7d6fGGqcMZMAkGBSsOAwIbBQAD
+MQAwLgIVAJ4wtQsANPxHo7Q4IQZYsL12SKdbAhUAjJ9n38zxT+iai2164xS+LIfa
+C1Q=
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/test/dsa-pca.pem b/src/lib/libssl/test/dsa-pca.pem
new file mode 100644
index 0000000000..e3641ad47e
--- /dev/null
+++ b/src/lib/libssl/test/dsa-pca.pem
@@ -0,0 +1,49 @@
+-----BEGIN DSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,F80EEEBEEA7386C4
+
+GZ9zgFcHOlnhPoiSbVi/yXc9mGoj44A6IveD4UlpSEUt6Xbse3Fr0KHIUyQ3oGnS
+mClKoAp/eOTb5Frhto85SzdsxYtac+X1v5XwdzAMy2KowHVk1N8A5jmE2OlkNPNt
+of132MNlo2cyIRYaa35PPYBGNCmUm7YcYS8O90YtkrQZZTf4+2C4kllhMcdkQwkr
+FWSWC8YOQ7w0LHb4cX1FejHHom9Nd/0PN3vn3UyySvfOqoR7nbXkrpHXmPIr0hxX
+RcF0aXcV/CzZ1/nfXWQf4o3+oD0T22SDoVcZY60IzI0oIc3pNCbDV3uKNmgekrFd
+qOUJ+QW8oWp7oefRx62iBfIeC8DZunohMXaWAQCU0sLQOR4yEdeUCnzCSywe0bG1
+diD0KYaEe+Yub1BQH4aLsBgDjardgpJRTQLq0DUvw0/QGO1irKTJzegEDNVBKrVn
+V4AHOKT1CUKqvGNRP1UnccUDTF6miOAtaj/qpzra7sSk7dkGBvIEeFoAg84kfh9h
+hVvF1YyzC9bwZepruoqoUwke/WdNIR5ymOVZ/4Liw0JdIOcq+atbdRX08niqIRkf
+dsZrUj4leo3zdefYUQ7w4N2Ns37yDFq7
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE REQUEST-----
+MIICVTCCAhMCAQAwUzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEMMAoGA1UEAxMDUENB
+MIIBtTCCASkGBSsOAwIMMIIBHgKBgQCnP26Fv0FqKX3wn0cZMJCaCR3aajMexT2G
+lrMV4FMuj+BZgnOQPnUxmUd6UvuF5NmmezibaIqEm4fGHrV+hktTW1nPcWUZiG7O
+Zq5riDb77Cjcwtelu+UsOSZL2ppwGJU3lRBWI/YV7boEXt45T/23Qx+1pGVvzYAR
+5HCVW1DNSQIVAPcHMe36bAYD1YWKHKycZedQZmVvAoGATd9MA6aRivUZb1BGJZnl
+aG8w42nh5bNdmLsohkj83pkEP1+IDJxzJA0gXbkqmj8YlifkYofBe3RiU/xhJ6h6
+kQmdtvFNnFQPWAbuSXQHzlV+I84W9srcWmEBfslxtU323DQph2j2XiCTs9v15Als
+QReVkusBtXOlan7YMu0OArgDgYUAAoGBAKbtuR5AdW+ICjCFe2ixjUiJJzM2IKwe
+6NZEMXg39+HQ1UTPTmfLZLps+rZfolHDXuRKMXbGFdSF0nXYzotPCzi7GauwEJTZ
+yr27ZZjA1C6apGSQ9GzuwNvZ4rCXystVEagAS8OQ4H3D4dWS17Zg31ICb5o4E5r0
+z09o/Uz46u0VoAAwCQYFKw4DAhsFAAMxADAuAhUArRubTxsbIXy3AhtjQ943AbNB
+nSICFQCu+g1iW3jwF+gOcbroD4S/ZcvB3w==
+-----END CERTIFICATE REQUEST-----
+-----BEGIN CERTIFICATE-----
+MIIC0zCCApECAQAwCQYFKw4DAhsFADBTMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
+U29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQww
+CgYDVQQDEwNQQ0EwHhcNOTcwNjE0MjI1NDQ1WhcNOTcwNzE0MjI1NDQ1WjBTMQsw
+CQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJu
+ZXQgV2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDEwNQQ0EwggG1MIIBKQYFKw4DAgww
+ggEeAoGBAKc/boW/QWopffCfRxkwkJoJHdpqMx7FPYaWsxXgUy6P4FmCc5A+dTGZ
+R3pS+4Xk2aZ7OJtoioSbh8YetX6GS1NbWc9xZRmIbs5mrmuINvvsKNzC16W75Sw5
+JkvamnAYlTeVEFYj9hXtugRe3jlP/bdDH7WkZW/NgBHkcJVbUM1JAhUA9wcx7fps
+BgPVhYocrJxl51BmZW8CgYBN30wDppGK9RlvUEYlmeVobzDjaeHls12YuyiGSPze
+mQQ/X4gMnHMkDSBduSqaPxiWJ+Rih8F7dGJT/GEnqHqRCZ228U2cVA9YBu5JdAfO
+VX4jzhb2ytxaYQF+yXG1TfbcNCmHaPZeIJOz2/XkCWxBF5WS6wG1c6Vqftgy7Q4C
+uAOBhQACgYEApu25HkB1b4gKMIV7aLGNSIknMzYgrB7o1kQxeDf34dDVRM9OZ8tk
+umz6tl+iUcNe5EoxdsYV1IXSddjOi08LOLsZq7AQlNnKvbtlmMDULpqkZJD0bO7A
+29nisJfKy1URqABLw5DgfcPh1ZLXtmDfUgJvmjgTmvTPT2j9TPjq7RUwCQYFKw4D
+AhsFAAMxADAuAhUAvtv6AkMolix1Jvy3UnVEIUqdCUICFQC+jq8P49mwrY9oJ24n
+5rKUjNBhSg==
+-----END CERTIFICATE-----
+
diff --git a/src/lib/libssl/test/p b/src/lib/libssl/test/p
new file mode 100644
index 0000000000..b3de76751e
--- /dev/null
+++ b/src/lib/libssl/test/p
@@ -0,0 +1,294 @@
+#
+# test/Makefile.ssl
+#
+
+DIR=            test
+TOP=            ..
+CC=             cc
+INCLUDES=       -I../include
+CFLAG=          -g
+INSTALLTOP=     /usr/local/ssl
+MAKEFILE=       Makefile.ssl
+MAKE=           make -f $(MAKEFILE)
+MAKEDEPEND=     makedepend -f$(MAKEFILE)
+
+PEX_LIBS=
+EX_LIBS= #-lnsl -lsocket
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile.ssl
+
+DLIBCRYPTO= ../libcrypto.a
+DLIBSSL= ../libssl.a
+LIBCRYPTO= -L.. -lcrypto
+LIBSSL= -L.. -lssl
+
+BNTEST=         bntest
+EXPTEST=        exptest
+IDEATEST=       ideatest
+SHATEST=        shatest
+SHA1TEST=       sha1test
+MDC2TEST=       mdc2test
+RMDTEST=        rmdtest
+MD2TEST=        md2test
+MD5TEST=        md5test
+HMACTEST=       hmactest
+RC2TEST=        rc2test
+RC4TEST=        rc4test
+RC5TEST=        rc5test
+BFTEST=         bftest
+CASTTEST=       casttest
+DESTEST=        destest
+RANDTEST=       randtest
+DHTEST=         dhtest
+DSATEST=        dsatest
+METHTEST=       methtest
+SSLTEST=        ssltest
+
+EXE=    $(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD5TEST) $(HMACTEST) \
+        $(RC2TEST) $(RC4TEST) $(RC5TEST) \
+        $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
+        $(RANDTEST) $(DHTEST) \
+        $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST)
+
+# $(METHTEST)
+
+OBJ=    $(BNTEST).o $(IDEATEST).o $(MD2TEST).o  $(MD5TEST).o $(HMACTEST).o \
+        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
+        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
+        $(RANDTEST).o $(DHTEST).o $(CASTTEST).o \
+        $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o
+SRC=    $(BNTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD5TEST).c  $(HMACTEST).c \
+        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
+        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
+        $(RANDTEST).c $(DHTEST).c $(CASTTEST).c \
+        $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c
+
+EXHEADER= 
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all:    exe
+
+exe:    $(EXE)
+
+files:
+        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+        /bin/rm -f Makefile
+        $(TOP)/util/point.sh Makefile.ssl Makefile ;
+
+errors:
+
+install:
+
+tags:
+        ctags $(SRC)
+
+tests:  exe apps \
+        test_des test_idea test_sha test_md5 test_hmac test_md2 test_mdc2 \
+        test_rc2 test_rc4 test_rc5 test_bf test_cast \
+        test_rand test_enc test_x509 test_rsa test_crl test_sid test_req \
+        test_pkcs7 test_bn test_verify test_dh test_dsa test_reqgen \
+        test_ss test_ssl test_ca
+
+apps:
+        @(cd ../apps; $(MAKE)  CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all)
+
+test_des:
+        #./$(DESTEST)
+
+test_idea:
+        ./$(IDEATEST)
+
+test_sha:
+        ./$(SHATEST)
+        ./$(SHA1TEST)
+
+test_mdc2:
+        ./$(MDC2TEST)
+
+test_md5:
+        ./$(MD5TEST)
+
+test_hmac:
+        ./$(HMACTEST)
+
+test_md2:
+        ./$(MD2TEST)
+
+test_rmd:
+        ./$(RMDTEST)
+
+test_bf:
+        ./$(BFTEST)
+
+test_cast:
+        ./$(CASTTEST)
+
+test_rc2:
+        ./$(RC2TEST)
+
+test_rc4:
+        ./$(RC4TEST)
+
+test_rc5:
+        ./$(RC5TEST)
+
+test_rand:
+        ./$(RANDTEST)
+
+test_enc:
+        @sh ./testenc
+
+test_x509:
+        echo test normal x509v1 certificate
+        sh ./tx509 2>/dev/null
+        echo test first x509v3 certificate
+        sh ./tx509 v3-cert1.pem 2>/dev/null
+        echo test second x509v3 certificate
+        sh ./tx509 v3-cert2.pem 2>/dev/null
+
+test_rsa:
+        @sh ./trsa 2>/dev/null
+
+test_crl:
+        @sh ./tcrl 2>/dev/null
+
+test_sid:
+        @sh ./tsid 2>/dev/null
+
+test_req:
+        @sh ./treq 2>/dev/null
+        @sh ./treq testreq2.pem 2>/dev/null
+
+test_pkcs7:
+        @sh ./tpkcs7 2>/dev/null
+        @sh ./tpkcs7d 2>/dev/null
+
+test_bn:
+        @echo 'test a^b%c implementations'
+        ./$(EXPTEST)
+        @echo starting big number library test, could take a while...
+        @(./$(BNTEST)|bc) | awk '{ \
+if ($$0 != "0") {print "error"; exit(1); } \
+if (((NR+1)%64) == 0) print NR+1," tests done"; }'
+
+test_verify:
+        @echo "The following command should have some OK's and some failures"
+        @echo "There are definitly a few expired certificates"
+        ../apps/ssleay verify -CApath ../certs ../certs/*.pem
+
+test_dh:
+        @echo "Generate as set of DH parameters"
+        ./$(DHTEST)
+
+test_dsa:
+        @echo "Generate as set of DSA parameters"
+        ./$(DSATEST)
+
+test_reqgen:
+        @echo "Generate and verify a certificate request"
+        @sh ./testgen
+
+test_ss:
+        @echo "Generate and certify a test certificate"
+        @sh ./testss
+
+test_ssl:
+        @echo "test SSL protocol"
+        @sh ./testssl
+
+test_ca:
+        @echo "Generate and certify a test certificate via the 'ca' program"
+        @sh ./testca
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+
+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 $(EXE) *.ss log
+
+$(DLIBSSL):
+        (cd ../ssl; $(MAKE))
+
+$(DLIBCRYPTO):
+        (cd ../crypto; $(MAKE))
+
+$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
+        $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
+        $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
+$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+        $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/lib/libssl/test/riptest b/src/lib/libssl/test/riptest
new file mode 100644
index 0000000000..8685d0ce53
--- /dev/null
+++ b/src/lib/libssl/test/riptest
diff --git a/src/lib/libssl/test/test.txt b/src/lib/libssl/test/test.txt
new file mode 100644
index 0000000000..c6d8d50ba9
--- /dev/null
+++ b/src/lib/libssl/test/test.txt
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+test=./test.txt
+
+cat $0 >$test;
+
+for i in rc4 des-cfb des-ofb des-ecb des-cbc des-ede des-ede3 \
+        des-cbc-ede des-cbc-ede3 idea-ecb idea-cfb idea-ofb idea-cbc 
+do
+        echo $i
+        ../apps/ssleay $i -e -k test < $test > $test.$i.cipher
+        ../apps/ssleay $i -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+
+        echo $i base64
+        ../apps/ssleay $i -a -e -k test < $test > $test.$i.cipher
+        ../apps/ssleay $i -a -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+done
diff --git a/src/lib/libssl/test/testkey.pem b/src/lib/libssl/test/testkey.pem
new file mode 100644
index 0000000000..edd5a5773f
--- /dev/null
+++ b/src/lib/libssl/test/testkey.pem
@@ -0,0 +1,2 @@
+-----BEGIN RSA PRIVATE KEY-----
+-----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/test/testreq.pem b/src/lib/libssl/test/testreq.pem
new file mode 100644
index 0000000000..1311fa7785
--- /dev/null
+++ b/src/lib/libssl/test/testreq.pem
@@ -0,0 +1,9 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBQjCB7QIBADCBhzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQx
+ETAPBgNVBAcTCEJyaXNiYW5lMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDET
+MBEGA1UEAxMKRXJpYyBZb3VuZzEfMB0GCSqGSIb3DQEJARYQZWF5QG1pbmNvbS5v
+ei5hdTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDVKdT5QB2ZojtNQGjA/9J7s2o4
+RNkuSq8l377uWLAyMljtdkcoRsvUy5lZ997UDHFTbVFA038ZBrmw7l5EyHeXAgMB
+AAGgADANBgkqhkiG9w0BAQQFAANBAKnaFr4u7PTdfmpjiX/H8Ho4UWGVRWUlvD2R
+/D9yoTj7TN3uODx2BD0drErVBe/Zjv81vhH6Yo3cJO/hRS3A7jw=
+-----END CERTIFICATE REQUEST-----
diff --git a/src/regress/lib/libc/Makefile b/src/regress/lib/libc/Makefile
new file mode 100644
index 0000000000..7b65e2c1c5
--- /dev/null
+++ b/src/regress/lib/libc/Makefile
@@ -0,0 +1,16 @@
+#       $NetBSD: Makefile,v 1.6 1995/04/24 05:52:15 cgd Exp $
+
+SUBDIR+= _setjmp db regex setjmp sigsetjmp
+.if (${MACHINE_ARCH} != "vax")
+SUBDIR+= ieeefp
+.endif
+
+.if exists(arch/${MACHINE_ARCH})
+SUBDIR+= arch/${MACHINE_ARCH}
+.endif
+
+regress: _SUBDIRUSE
+
+install:
+
+.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/_setjmp/Makefile b/src/regress/lib/libc/_setjmp/Makefile
new file mode 100644
index 0000000000..c2b9dc1aae
--- /dev/null
+++ b/src/regress/lib/libc/_setjmp/Makefile
@@ -0,0 +1,16 @@
+#       $NetBSD: Makefile,v 1.2 1995/04/20 22:38:44 cgd Exp $
+
+PROG=   _setjmptest
+SRCS=   jmptest.c
+NOMAN=  noman, no way, man
+
+CFLAGS+= -DTEST_U_SETJMP
+
+.PATH:  ${.CURDIR}/../setjmp
+
+install:
+
+regress: ${PROG}
+        ./${PROG}
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/arch/alpha/Makefile b/src/regress/lib/libc/arch/alpha/Makefile
new file mode 100644
index 0000000000..b79a82b0e2
--- /dev/null
+++ b/src/regress/lib/libc/arch/alpha/Makefile
@@ -0,0 +1,10 @@
+#       $NetBSD: Makefile,v 1.1 1995/04/24 05:53:31 cgd Exp $
+
+# do nothing here; none of the tests here can be run automatically
+SUBDIR=
+
+regress: _SUBDIRUSE
+
+install:
+
+.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/Makefile b/src/regress/lib/libc/arch/alpha/divremtest/Makefile
new file mode 100644
index 0000000000..bd3b12f537
--- /dev/null
+++ b/src/regress/lib/libc/arch/alpha/divremtest/Makefile
@@ -0,0 +1,29 @@
+#       $NetBSD: Makefile,v 1.1 1995/04/24 05:53:34 cgd Exp $
+
+PROG=   divremtest
+NOMAN=
+
+CLEANFILES+=    mkcases cases.c mktestcases testcases
+
+divremtest.c: cases.c
+
+cases.c: mkcases
+        /bin/rm -f cases.c
+        mkcases > cases.c
+
+# a typical strategy to use this:
+# compile a NetBSD divremtest binary, an OSF/1 divremtest binary, and an
+# OSF/1 mktestcases binary.  You then run mktestecases | divremtest -g
+# on an OSF/1 machine, and pipe the output to an rsh to a NetBSD machine
+# which then runs divremtest.  You can test an infinite number of random
+# values that way; I like to put a 'dd' in, so I can see how much I've done.
+
+testcases: mktestcases divremtest
+        /bin/rm -f testcases
+        mktestcases | divremtest -g > testcases
+
+regress:
+        @echo THIS TEST CANNOT BE RUN AUTOMATICALLY.
+        @false
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/divremtest.c b/src/regress/lib/libc/arch/alpha/divremtest/divremtest.c
new file mode 100644
index 0000000000..fcf64c9384
--- /dev/null
+++ b/src/regress/lib/libc/arch/alpha/divremtest/divremtest.c
@@ -0,0 +1,183 @@
+/*      $NetBSD: divremtest.c,v 1.1 1995/04/24 05:53:35 cgd Exp $       */
+
+/*
+ * Copyright (c) 1995 Christopher G. Demetriou
+ * 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 Christopher G. Demetriou
+ *      for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+
+void    testfile();
+void    usage();
+
+int generate;
+
+int
+main(argc, argv)
+        int argc;
+        char **argv;
+{
+        int c;
+
+        signal(SIGFPE, SIG_IGN);
+
+        while ((c = getopt(argc, argv, "g")) != -1)
+                switch (c) {
+                case 'g':
+                        generate = 1;
+                        break;
+
+                default:
+                        usage();
+                        break;
+        }
+
+        argc -= optind;
+        argv += optind;
+
+        if (argc == 0)
+                testfile();
+        else
+                for (; argc != 0; argc--, argv++) {
+                        if (freopen(argv[0], "r", stdin) == NULL) {
+                                fprintf(stderr,
+                                    "divremtest: couldn't open %s\n",
+                                    argv[0]);
+                                exit(1);
+                        }
+
+                        testfile();
+                }
+
+        exit(0);
+}
+
+void
+testfile()
+{
+        union operand {
+                unsigned long   input;
+                int             op_int;
+                unsigned int    op_u_int;
+                long            op_long;
+                unsigned long   op_u_long;
+        } op1, op2, divres, modres, divwant, modwant;
+        char opspec[6];
+        int encoded, i;
+
+        while (scanf("%6c %lx %lx %lx %lx\n", opspec, &op1.input,
+            &op2.input, &divwant.input, &modwant.input) != EOF) {
+
+                encoded = 0;
+
+                for (i = 0; i < 6; i += 2) {
+                        int posval;
+
+                        switch (opspec[i]) {
+                        case '.':
+                                posval = 0;
+                                break;
+                        case '-':
+                                posval = 1;
+                                break;
+                        default:
+                                fprintf(stderr,
+                                    "unknown signedness spec %c\n",
+                                    opspec[i]);
+                                exit(1);
+                        }
+                        encoded |= posval << ((5 - i) * 4);
+                }
+                        
+                for (i = 1; i < 6; i += 2) {
+                        int posval;
+
+                        switch (opspec[i]) {
+                        case 'i':
+                                posval = 0;
+                                break;
+                        case 'l':
+                                posval = 1;
+                                break;
+                        default:
+                                fprintf(stderr, "unknown length spec %c\n",
+                                    opspec[i]);
+                                exit(1);
+                        }
+                        encoded |= posval << ((5 - i) * 4);
+                }
+
+                /* KILL ME!!! */
+                switch (encoded) {
+
+#define TRY_IT(a, b, c)                                                 \
+        divres.a = op1.b / op2.c;                                       \
+        modres.a = op1.b % op2.c;                                       \
+        if (generate) {                                                 \
+                printf("%6s 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n",     \
+                    opspec, op1.input, op2.input,                       \
+                    divres.a, modres.a);                                \
+        } else {                                                        \
+                if ((divres.a != divwant.a) ||                          \
+                    (modres.a != modwant.a)) {                          \
+                        fprintf(stderr, "%6s 0x%016lx 0x%016lx\n",      \
+                            opspec, op1.input, op2.input);              \
+                        fprintf(stderr, "FAILED:\n");                   \
+                        fprintf(stderr,                                 \
+                            "div:\twanted 0x%16lx, got 0x%16lx\n",      \
+                            divwant.a, divres.a);                       \
+                        fprintf(stderr,                                 \
+                            "mod:\twanted 0x%16lx, got 0x%16lx\n",      \
+                            modwant.a, modres.a);                       \
+                                                                        \
+                        exit(1);                                        \
+                }                                                       \
+        }
+
+#include "cases.c"
+
+#undef TRY_IT
+
+                default:
+                        fprintf(stderr,
+                            "INTERNAL ERROR: unknown encoding %x\n", encoded);
+                        exit(1);
+                }
+        }
+}
+
+void
+usage()
+{
+
+        fprintf(stderr, "usage: divremtest [-v] [testfile ...]\n");
+        exit(1);
+}
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/mkcases.c b/src/regress/lib/libc/arch/alpha/divremtest/mkcases.c
new file mode 100644
index 0000000000..65ca17af4c
--- /dev/null
+++ b/src/regress/lib/libc/arch/alpha/divremtest/mkcases.c
@@ -0,0 +1,63 @@
+/*      $NetBSD: mkcases.c,v 1.1 1995/04/24 05:53:36 cgd Exp $  */
+
+/*
+ * Copyright (c) 1995 Christopher G. Demetriou
+ * 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 Christopher G. Demetriou
+ *      for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+char *tab[4] = { "u_int", "int", "u_long", "long" };
+
+int
+main()
+{
+        int i;
+
+        for (i = 0; i < 64; i++) {
+                printf(
+"               case 0x%d%d%d%d%d%d:    /* %s <= %s op %s */\n",
+                        (i >> 5) & 1,
+                        (i >> 4) & 1,
+                        (i >> 3) & 1,
+                        (i >> 2) & 1,
+                        (i >> 1) & 1,
+                        (i >> 0) & 1,
+                        tab[(i >> 4) & 0x3],
+                        tab[(i >> 2) & 0x3],
+                        tab[(i >> 0) & 0x3]);
+                printf(
+"                       TRY_IT(op_%s, op_%s, op_%s);\n",
+                        tab[(i >> 4) & 0x3],
+                        tab[(i >> 2) & 0x3],
+                        tab[(i >> 0) & 0x3]);
+                printf(
+"                       break;\n\n");
+        }
+
+        exit(0);
+}
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/mktestcases.c b/src/regress/lib/libc/arch/alpha/divremtest/mktestcases.c
new file mode 100644
index 0000000000..ef02d61d70
--- /dev/null
+++ b/src/regress/lib/libc/arch/alpha/divremtest/mktestcases.c
@@ -0,0 +1,67 @@
+/*      $NetBSD: mktestcases.c,v 1.1 1995/04/24 05:53:37 cgd Exp $      */
+
+/*
+ * Copyright (c) 1995 Christopher G. Demetriou
+ * 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 Christopher G. Demetriou
+ *      for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+
+int
+main()
+{
+        int i, j;
+        unsigned long n1, n2;
+
+        srandom(time(NULL));
+
+        for (i = 1; /* i < 10240 */ 1; i++) {
+                n1 = (unsigned)
+                    (random() & ((random() & random()) | 0x80000000));
+                n1 <<= 32;
+                n1 |= (unsigned)(random() & random() & random());
+
+                n2 = (unsigned)
+                    (random() & ((random() & random()) | 0x80000000));
+                n2 <<= 32;
+                n2 |= (unsigned)(random() & random() & random());
+
+                for (j = 0; j < 64; j++) {
+                        char *tab[] = { ".i", ".l", "-i", "-l" };
+
+                        printf("%s%s%s 0x%lx 0x%lx 0 0\n",
+                            tab[(j >> 4) & 0x3],
+                            tab[(j >> 2) & 0x3],
+                            tab[(j >> 0) & 0x3],
+                            n1, n2);
+                }
+        }
+
+        exit(0);
+}
diff --git a/src/regress/lib/libc/db/Makefile b/src/regress/lib/libc/db/Makefile
new file mode 100644
index 0000000000..d42dc96315
--- /dev/null
+++ b/src/regress/lib/libc/db/Makefile
@@ -0,0 +1,17 @@
+#       $NetBSD: Makefile,v 1.11 1995/12/12 01:54:15 cgd Exp $
+#       @(#)Makefile    8.1 (Berkeley) 6/4/93
+
+PROG=   dbtest
+
+# add -DSTATISTICS to CFLAGS to get usage statistics.  Note that
+# for this to work, libc must be compiled with -DSTATISTICS as well
+CFLAGS+= -g -D__DBINTERFACE_PRIVATE -DDEBUG
+NOMAN=  noman
+CLEANFILES+= t1 t2 t3
+
+install:
+
+regress:
+        sh ${.CURDIR}/run.test
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/db/README b/src/regress/lib/libc/db/README
new file mode 100644
index 0000000000..fddf5c3d5a
--- /dev/null
+++ b/src/regress/lib/libc/db/README
@@ -0,0 +1,68 @@
+#       $NetBSD: README,v 1.5 1996/05/03 21:54:19 cgd Exp $
+#       @(#)README      8.8 (Berkeley) 7/31/94
+
+To run the tests, enter "make regress".
+
+Fairly large files (the command files) are built in this directory during
+the test runs, and even larger files (the database files) are created in
+"/var/tmp".  If the latter directory doesn't exist, set the environmental
+variable TMPDIR to a directory where the files can be built.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+The script file consists of lines with an initial character which is
+the command for that line, or an initial character indicating a key
+or data entry for a previous command.
+
+Legal command characters are as follows:
+
+c: compare a record
+        + must be followed by [kK][dD]; the data value in the database
+          associated with the specified key is compared to the specified
+          data value.
+e: echo a string
+        + writes out the rest of the line into the output file; if the
+          last character is not a carriage-return, a newline is appended.
+f: set the flags for the next command
+        + no value zero's the flags
+g: do a get command
+        + must be followed by [kK]
+        + writes out the retrieved data DBT.
+o [r]: dump [reverse]
+        + dump the database out, if 'r' is set, in reverse order.
+p: do a put command
+        + must be followed by [kK][dD]
+r: do a del command
+        + must be followed by [kK] unless R_CURSOR flag set.
+S: sync the database
+s: do a seq command
+        + must be followed by [kK] if R_CURSOR flag set.
+        + writes out the retrieved data DBT.
+
+Legal key/data characters are as follows:
+
+D [file]: data file
+        + set the current data value to the contents of the file
+d [data]:
+        + set the current key value to the contents of the line.
+K [file]: key file
+        + set the current key value to the contents of the file
+k [data]:
+        + set the current key value to the contents of the line.
+
+Blank lines, lines with leading white space, and lines with leading
+hash marks (#) are ignored.
+
+Options to dbtest are as follows:
+
+        -d: Set the DB_LOCK flag.
+        -f: Use the file argument as the database file.
+        -i: Use the rest of the argument to set elements in the info
+            structure.  If the type is btree, then "-i cachesize=10240"
+            will set BTREEINFO.cachesize to 10240.
+        -o: The rest of the argument is the output file instead of
+            using stdout.
+        -s: Don't delete the database file before opening it, i.e.
+            use the database file from a previous run.
+
+Dbtest requires two arguments, the type of access "hash", "recno"
+or "btree", and the script name or "-" to indicate stdin.
diff --git a/src/regress/lib/libc/db/dbtest.c b/src/regress/lib/libc/db/dbtest.c
new file mode 100644
index 0000000000..6ccfba5011
--- /dev/null
+++ b/src/regress/lib/libc/db/dbtest.c
@@ -0,0 +1,759 @@
+/*      $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $   */
+
+/*-
+ * Copyright (c) 1992, 1993, 1994
+ *      The Regents of the University of California.  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 the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1992, 1993, 1994\n\
+        The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)dbtest.c    8.17 (Berkeley) 9/1/94";
+#else
+static char rcsid[] = "$NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <db.h>
+
+enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
+
+void     compare __P((DBT *, DBT *));
+DBTYPE   dbtype __P((char *));
+void     dump __P((DB *, int));
+void     err __P((const char *, ...));
+void     get __P((DB *, DBT *));
+void     getdata __P((DB *, DBT *, DBT *));
+void     put __P((DB *, DBT *, DBT *));
+void     rem __P((DB *, DBT *));
+char    *sflags __P((int));
+void     synk __P((DB *));
+void    *rfile __P((char *, size_t *));
+void     seq __P((DB *, DBT *));
+u_int    setflags __P((char *));
+void    *setinfo __P((DBTYPE, char *));
+void     usage __P((void));
+void    *xmalloc __P((char *, size_t));
+
+DBTYPE type;                            /* Database type. */
+void *infop;                            /* Iflags. */
+u_long lineno;                          /* Current line in test script. */
+u_int flags;                            /* Current DB flags. */
+int ofd = STDOUT_FILENO;                /* Standard output fd. */
+
+DB *XXdbp;                              /* Global for gdb. */
+int XXlineno;                           /* Fast breakpoint for gdb. */
+
+int
+main(argc, argv)
+        int argc;
+        char *argv[];
+{
+        extern int optind;
+        extern char *optarg;
+        enum S command, state;
+        DB *dbp;
+        DBT data, key, keydata;
+        size_t len;
+        int ch, oflags, sflag;
+        char *fname, *infoarg, *p, *t, buf[8 * 1024];
+
+        infoarg = NULL;
+        fname = NULL;
+        oflags = O_CREAT | O_RDWR;
+        sflag = 0;
+        while ((ch = getopt(argc, argv, "f:i:lo:s")) != -1)
+                switch (ch) {
+                case 'f':
+                        fname = optarg;
+                        break;
+                case 'i':
+                        infoarg = optarg;
+                        break;
+                case 'l':
+                        oflags |= DB_LOCK;
+                        break;
+                case 'o':
+                        if ((ofd = open(optarg,
+                            O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
+                                err("%s: %s", optarg, strerror(errno));
+                        break;
+                case 's':
+                        sflag = 1;
+                        break;
+                case '?':
+                default:
+                        usage();
+                }
+        argc -= optind;
+        argv += optind;
+
+        if (argc != 2)
+                usage();
+
+        /* Set the type. */
+        type = dbtype(*argv++);
+
+        /* Open the descriptor file. */
+        if (strcmp(*argv, "-") && freopen(*argv, "r", stdin) == NULL)
+            err("%s: %s", *argv, strerror(errno));
+
+        /* Set up the db structure as necessary. */
+        if (infoarg == NULL)
+                infop = NULL;
+        else
+                for (p = strtok(infoarg, ",\t "); p != NULL;
+                    p = strtok(0, ",\t "))
+                        if (*p != '\0')
+                                infop = setinfo(type, p);
+
+        /*
+         * Open the DB.  Delete any preexisting copy, you almost never
+         * want it around, and it often screws up tests.
+         */
+        if (fname == NULL) {
+                p = getenv("TMPDIR");
+                if (p == NULL)
+                        p = "/var/tmp";
+                (void)sprintf(buf, "%s/__dbtest", p);
+                fname = buf;
+                (void)unlink(buf);
+        } else  if (!sflag)
+                (void)unlink(fname);
+
+        if ((dbp = dbopen(fname,
+            oflags, S_IRUSR | S_IWUSR, type, infop)) == NULL)
+                err("dbopen: %s", strerror(errno));
+        XXdbp = dbp;
+
+        state = COMMAND;
+        for (lineno = 1;
+            (p = fgets(buf, sizeof(buf), stdin)) != NULL; ++lineno) {
+                /* Delete the newline, displaying the key/data is easier. */
+                if (ofd == STDOUT_FILENO && (t = strchr(p, '\n')) != NULL)
+                        *t = '\0';
+                if ((len = strlen(buf)) == 0 || isspace(*p) || *p == '#')
+                        continue;
+
+                /* Convenient gdb break point. */
+                if (XXlineno == lineno)
+                        XXlineno = 1;
+                switch (*p) {
+                case 'c':                       /* compare */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        state = KEY;
+                        command = COMPARE;
+                        break;
+                case 'e':                       /* echo */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        /* Don't display the newline, if CR at EOL. */
+                        if (p[len - 2] == '\r')
+                                --len;
+                        if (write(ofd, p + 1, len - 1) != len - 1 ||
+                            write(ofd, "\n", 1) != 1)
+                                err("write: %s", strerror(errno));
+                        break;
+                case 'g':                       /* get */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        state = KEY;
+                        command = GET;
+                        break;
+                case 'p':                       /* put */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        state = KEY;
+                        command = PUT;
+                        break;
+                case 'r':                       /* remove */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        if (flags == R_CURSOR) {
+                                rem(dbp, &key);
+                                state = COMMAND;
+                        } else {
+                                state = KEY;
+                                command = REMOVE;
+                        }
+                        break;
+                case 'S':                       /* sync */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        synk(dbp);
+                        state = COMMAND;
+                        break;
+                case 's':                       /* seq */
+                        if (state != COMMAND)
+                                err("line %lu: not expecting command", lineno);
+                        if (flags == R_CURSOR) {
+                                state = KEY;
+                                command = SEQ;
+                        } else
+                                seq(dbp, &key);
+                        break;
+                case 'f':
+                        flags = setflags(p + 1);
+                        break;
+                case 'D':                       /* data file */
+                        if (state != DATA)
+                                err("line %lu: not expecting data", lineno);
+                        data.data = rfile(p + 1, &data.size);
+                        goto ldata;
+                case 'd':                       /* data */
+                        if (state != DATA)
+                                err("line %lu: not expecting data", lineno);
+                        data.data = xmalloc(p + 1, len - 1);
+                        data.size = len - 1;
+ldata:                  switch (command) {
+                        case COMPARE:
+                                compare(&keydata, &data);
+                                break;
+                        case PUT:
+                                put(dbp, &key, &data);
+                                break;
+                        default:
+                                err("line %lu: command doesn't take data",
+                                    lineno);
+                        }
+                        if (type != DB_RECNO)
+                                free(key.data);
+                        free(data.data);
+                        state = COMMAND;
+                        break;
+                case 'K':                       /* key file */
+                        if (state != KEY)
+                                err("line %lu: not expecting a key", lineno);
+                        if (type == DB_RECNO)
+                                err("line %lu: 'K' not available for recno",
+                                    lineno);
+                        key.data = rfile(p + 1, &key.size);
+                        goto lkey;
+                case 'k':                       /* key */
+                        if (state != KEY)
+                                err("line %lu: not expecting a key", lineno);
+                        if (type == DB_RECNO) {
+                                static recno_t recno;
+                                recno = atoi(p + 1);
+                                key.data = &recno;
+                                key.size = sizeof(recno);
+                        } else {
+                                key.data = xmalloc(p + 1, len - 1);
+                                key.size = len - 1;
+                        }
+lkey:                   switch (command) {
+                        case COMPARE:
+                                getdata(dbp, &key, &keydata);
+                                state = DATA;
+                                break;
+                        case GET:
+                                get(dbp, &key);
+                                if (type != DB_RECNO)
+                                        free(key.data);
+                                state = COMMAND;
+                                break;
+                        case PUT:
+                                state = DATA;
+                                break;
+                        case REMOVE:
+                                rem(dbp, &key);
+                                if ((type != DB_RECNO) && (flags != R_CURSOR))
+                                        free(key.data);
+                                state = COMMAND;
+                                break;
+                        case SEQ:
+                                seq(dbp, &key);
+                                if ((type != DB_RECNO) && (flags != R_CURSOR))
+                                        free(key.data);
+                                state = COMMAND;
+                                break;
+                        default:
+                                err("line %lu: command doesn't take a key",
+                                    lineno);
+                        }
+                        break;
+                case 'o':
+                        dump(dbp, p[1] == 'r');
+                        break;
+                default:
+                        err("line %lu: %s: unknown command character",
+                            lineno, p);
+                }
+        }
+#ifdef STATISTICS
+        /*
+         * -l must be used (DB_LOCK must be set) for this to be
+         * used, otherwise a page will be locked and it will fail.
+         */
+        if (type == DB_BTREE && oflags & DB_LOCK)
+                __bt_stat(dbp);
+#endif
+        if (dbp->close(dbp))
+                err("db->close: %s", strerror(errno));
+        (void)close(ofd);
+        exit(0);
+}
+
+#define NOOVERWRITE     "put failed, would overwrite key\n"
+
+void
+compare(db1, db2)
+        DBT *db1, *db2;
+{
+        register size_t len;
+        register u_char *p1, *p2;
+
+        if (db1->size != db2->size)
+                printf("compare failed: key->data len %lu != data len %lu\n",
+                    db1->size, db2->size);
+
+        len = MIN(db1->size, db2->size);
+        for (p1 = db1->data, p2 = db2->data; len--;)
+                if (*p1++ != *p2++) {
+                        printf("compare failed at offset %d\n",
+                            p1 - (u_char *)db1->data);
+                        break;
+                }
+}
+
+void
+get(dbp, kp)
+        DB *dbp;
+        DBT *kp;
+{
+        DBT data;
+
+        switch (dbp->get(dbp, kp, &data, flags)) {
+        case 0:
+                (void)write(ofd, data.data, data.size);
+                if (ofd == STDOUT_FILENO)
+                        (void)write(ofd, "\n", 1);
+                break;
+        case -1:
+                err("line %lu: get: %s", lineno, strerror(errno));
+                /* NOTREACHED */
+        case 1:
+#define NOSUCHKEY       "get failed, no such key\n"
+                if (ofd != STDOUT_FILENO)
+                        (void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
+                else
+                        (void)fprintf(stderr, "%d: %.*s: %s",
+                            lineno, MIN(kp->size, 20), kp->data, NOSUCHKEY);
+#undef  NOSUCHKEY
+                break;
+        }
+}
+
+void
+getdata(dbp, kp, dp)
+        DB *dbp;
+        DBT *kp, *dp;
+{
+        switch (dbp->get(dbp, kp, dp, flags)) {
+        case 0:
+                return;
+        case -1:
+                err("line %lu: getdata: %s", lineno, strerror(errno));
+                /* NOTREACHED */
+        case 1:
+                err("line %lu: getdata failed, no such key", lineno);
+                /* NOTREACHED */
+        }
+}
+
+void
+put(dbp, kp, dp)
+        DB *dbp;
+        DBT *kp, *dp;
+{
+        switch (dbp->put(dbp, kp, dp, flags)) {
+        case 0:
+                break;
+        case -1:
+                err("line %lu: put: %s", lineno, strerror(errno));
+                /* NOTREACHED */
+        case 1:
+                (void)write(ofd, NOOVERWRITE, sizeof(NOOVERWRITE) - 1);
+                break;
+        }
+}
+
+void
+rem(dbp, kp)
+        DB *dbp;
+        DBT *kp;
+{
+        switch (dbp->del(dbp, kp, flags)) {
+        case 0:
+                break;
+        case -1:
+                err("line %lu: rem: %s", lineno, strerror(errno));
+                /* NOTREACHED */
+        case 1:
+#define NOSUCHKEY       "rem failed, no such key\n"
+                if (ofd != STDOUT_FILENO)
+                        (void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
+                else if (flags != R_CURSOR)
+                        (void)fprintf(stderr, "%d: %.*s: %s", 
+                            lineno, MIN(kp->size, 20), kp->data, NOSUCHKEY);
+                else
+                        (void)fprintf(stderr,
+                            "%d: rem of cursor failed\n", lineno);
+#undef  NOSUCHKEY
+                break;
+        }
+}
+
+void
+synk(dbp)
+        DB *dbp;
+{
+        switch (dbp->sync(dbp, flags)) {
+        case 0:
+                break;
+        case -1:
+                err("line %lu: synk: %s", lineno, strerror(errno));
+                /* NOTREACHED */
+        }
+}
+
+void
+seq(dbp, kp)
+        DB *dbp;
+        DBT *kp;
+{
+        DBT data;
+
+        switch (dbp->seq(dbp, kp, &data, flags)) {
+        case 0:
+                (void)write(ofd, data.data, data.size);
+                if (ofd == STDOUT_FILENO)
+                        (void)write(ofd, "\n", 1);
+                break;
+        case -1:
+                err("line %lu: seq: %s", lineno, strerror(errno));
+                /* NOTREACHED */
+        case 1:
+#define NOSUCHKEY       "seq failed, no such key\n"
+                if (ofd != STDOUT_FILENO)
+                        (void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
+                else if (flags == R_CURSOR)
+                        (void)fprintf(stderr, "%d: %.*s: %s", 
+                            lineno, MIN(kp->size, 20), kp->data, NOSUCHKEY);
+                else
+                        (void)fprintf(stderr,
+                            "%d: seq (%s) failed\n", lineno, sflags(flags));
+#undef  NOSUCHKEY
+                break;
+        }
+}
+
+void
+dump(dbp, rev)
+        DB *dbp;
+        int rev;
+{
+        DBT key, data;
+        int flags, nflags;
+
+        if (rev) {
+                flags = R_LAST;
+                nflags = R_PREV;
+        } else {
+                flags = R_FIRST;
+                nflags = R_NEXT;
+        }
+        for (;; flags = nflags)
+                switch (dbp->seq(dbp, &key, &data, flags)) {
+                case 0:
+                        (void)write(ofd, data.data, data.size);
+                        if (ofd == STDOUT_FILENO)
+                                (void)write(ofd, "\n", 1);
+                        break;
+                case 1:
+                        goto done;
+                case -1:
+                        err("line %lu: (dump) seq: %s",
+                            lineno, strerror(errno));
+                        /* NOTREACHED */
+                }
+done:   return;
+}
+        
+u_int
+setflags(s)
+        char *s;
+{
+        char *p;
+
+        for (; isspace(*s); ++s);
+        if (*s == '\n' || *s == '\0')
+                return (0);
+        if ((p = strchr(s, '\n')) != NULL)
+                *p = '\0';
+        if (!strcmp(s, "R_CURSOR"))             return (R_CURSOR);
+        if (!strcmp(s, "R_FIRST"))              return (R_FIRST);
+        if (!strcmp(s, "R_IAFTER"))             return (R_IAFTER);
+        if (!strcmp(s, "R_IBEFORE"))            return (R_IBEFORE);
+        if (!strcmp(s, "R_LAST"))               return (R_LAST);
+        if (!strcmp(s, "R_NEXT"))               return (R_NEXT);
+        if (!strcmp(s, "R_NOOVERWRITE"))        return (R_NOOVERWRITE);
+        if (!strcmp(s, "R_PREV"))               return (R_PREV);
+        if (!strcmp(s, "R_SETCURSOR"))          return (R_SETCURSOR);
+
+        err("line %lu: %s: unknown flag", lineno, s);
+        /* NOTREACHED */
+}
+
+char *
+sflags(flags)
+        int flags;
+{
+        switch (flags) {
+        case R_CURSOR:          return ("R_CURSOR");
+        case R_FIRST:           return ("R_FIRST");
+        case R_IAFTER:          return ("R_IAFTER");
+        case R_IBEFORE:         return ("R_IBEFORE");
+        case R_LAST:            return ("R_LAST");
+        case R_NEXT:            return ("R_NEXT");
+        case R_NOOVERWRITE:     return ("R_NOOVERWRITE");
+        case R_PREV:            return ("R_PREV");
+        case R_SETCURSOR:       return ("R_SETCURSOR");
+        }
+
+        return ("UNKNOWN!");
+}
+        
+DBTYPE
+dbtype(s)
+        char *s;
+{
+        if (!strcmp(s, "btree"))
+                return (DB_BTREE);
+        if (!strcmp(s, "hash"))
+                return (DB_HASH);
+        if (!strcmp(s, "recno"))
+                return (DB_RECNO);
+        err("%s: unknown type (use btree, hash or recno)", s);
+        /* NOTREACHED */
+}
+
+void *
+setinfo(type, s)
+        DBTYPE type;
+        char *s;
+{
+        static BTREEINFO ib;
+        static HASHINFO ih;
+        static RECNOINFO rh;
+        char *eq;
+
+        if ((eq = strchr(s, '=')) == NULL)
+                err("%s: illegal structure set statement", s);
+        *eq++ = '\0';
+        if (!isdigit(*eq))
+                err("%s: structure set statement must be a number", s);
+                
+        switch (type) {
+        case DB_BTREE:
+                if (!strcmp("flags", s)) {
+                        ib.flags = atoi(eq);
+                        return (&ib);
+                }
+                if (!strcmp("cachesize", s)) {
+                        ib.cachesize = atoi(eq);
+                        return (&ib);
+                }
+                if (!strcmp("maxkeypage", s)) {
+                        ib.maxkeypage = atoi(eq);
+                        return (&ib);
+                }
+                if (!strcmp("minkeypage", s)) {
+                        ib.minkeypage = atoi(eq);
+                        return (&ib);
+                }
+                if (!strcmp("lorder", s)) {
+                        ib.lorder = atoi(eq);
+                        return (&ib);
+                }
+                if (!strcmp("psize", s)) {
+                        ib.psize = atoi(eq);
+                        return (&ib);
+                }
+                break;
+        case DB_HASH:
+                if (!strcmp("bsize", s)) {
+                        ih.bsize = atoi(eq);
+                        return (&ih);
+                }
+                if (!strcmp("ffactor", s)) {
+                        ih.ffactor = atoi(eq);
+                        return (&ih);
+                }
+                if (!strcmp("nelem", s)) {
+                        ih.nelem = atoi(eq);
+                        return (&ih);
+                }
+                if (!strcmp("cachesize", s)) {
+                        ih.cachesize = atoi(eq);
+                        return (&ih);
+                }
+                if (!strcmp("lorder", s)) {
+                        ih.lorder = atoi(eq);
+                        return (&ih);
+                }
+                break;
+        case DB_RECNO:
+                if (!strcmp("flags", s)) {
+                        rh.flags = atoi(eq);
+                        return (&rh);
+                }
+                if (!strcmp("cachesize", s)) {
+                        rh.cachesize = atoi(eq);
+                        return (&rh);
+                }
+                if (!strcmp("lorder", s)) {
+                        rh.lorder = atoi(eq);
+                        return (&rh);
+                }
+                if (!strcmp("reclen", s)) {
+                        rh.reclen = atoi(eq);
+                        return (&rh);
+                }
+                if (!strcmp("bval", s)) {
+                        rh.bval = atoi(eq);
+                        return (&rh);
+                }
+                if (!strcmp("psize", s)) {
+                        rh.psize = atoi(eq);
+                        return (&rh);
+                }
+                break;
+        }
+        err("%s: unknown structure value", s);
+        /* NOTREACHED */
+}
+
+void *
+rfile(name, lenp)
+        char *name;
+        size_t *lenp;
+{
+        struct stat sb;
+        void *p;
+        int fd;
+        char *np;
+
+        for (; isspace(*name); ++name);
+        if ((np = strchr(name, '\n')) != NULL)
+                *np = '\0';
+        if ((fd = open(name, O_RDONLY, 0)) < 0 ||
+            fstat(fd, &sb))
+                err("%s: %s\n", name, strerror(errno));
+#ifdef NOT_PORTABLE
+        if (sb.st_size > (off_t)SIZE_T_MAX)
+                err("%s: %s\n", name, strerror(E2BIG));
+#endif
+        if ((p = (void *)malloc((u_int)sb.st_size)) == NULL)
+                err("%s", strerror(errno));
+        (void)read(fd, p, (int)sb.st_size);
+        *lenp = sb.st_size;
+        (void)close(fd);
+        return (p);
+}
+
+void *
+xmalloc(text, len)
+        char *text;
+        size_t len;
+{
+        void *p;
+
+        if ((p = (void *)malloc(len)) == NULL)
+                err("%s", strerror(errno));
+        memmove(p, text, len);
+        return (p);
+}
+
+void
+usage()
+{
+        (void)fprintf(stderr,
+            "usage: dbtest [-l] [-f file] [-i info] [-o file] type script\n");
+        exit(1);
+}
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+void
+#ifdef __STDC__
+err(const char *fmt, ...)
+#else
+err(fmt, va_alist)
+        char *fmt;
+        va_dcl
+#endif
+{
+        va_list ap;
+#ifdef __STDC__
+        va_start(ap, fmt);
+#else
+        va_start(ap);
+#endif
+        (void)fprintf(stderr, "dbtest: ");
+        (void)vfprintf(stderr, fmt, ap);
+        va_end(ap);
+        (void)fprintf(stderr, "\n");
+        exit(1);
+        /* NOTREACHED */
+}
diff --git a/src/regress/lib/libc/db/run.test b/src/regress/lib/libc/db/run.test
new file mode 100644
index 0000000000..acbd3f49e1
--- /dev/null
+++ b/src/regress/lib/libc/db/run.test
@@ -0,0 +1,706 @@
+#!/bin/sh -
+#
+#       $NetBSD: run.test,v 1.8 1996/05/03 21:57:51 cgd Exp $
+#       @(#)run.test    8.10 (Berkeley) 7/26/94
+#
+
+# db regression tests
+main()
+{
+
+        PROG=./dbtest
+        TMP1=t1
+        TMP2=t2
+        TMP3=t3
+
+        if [ -f /usr/share/dict/words ]; then
+                DICT=/usr/share/dict/words
+        elif [ -f /usr/dict/words ]; then
+                DICT=/usr/dict/words
+        else
+                echo 'run.test: no dictionary'
+                exit 1
+        fi
+        
+        if [ $# -eq 0 ]; then
+                for t in 1 2 3 4 5 6 7 8 9 10 11 12 13 20; do
+                        test$t
+                done
+        else
+                while [ $# -gt 0 ]
+                        do case "$1" in
+                        test*)
+                                $1;;
+                        [0-9]*)
+                                test$1;;
+                        btree)
+                                for t in 1 2 3 7 8 9 10 12 13; do
+                                        test$t
+                                done;;
+                        hash)
+                                for t in 1 2 3 8 13 20; do
+                                        test$t
+                                done;;
+                        recno)
+                                for t in 1 2 3 4 5 6 7 10 11; do
+                                        test$t
+                                done;;
+                        *)
+                                echo "run.test: unknown test $1"
+                                echo "usage: run.test test# | type"
+                                exit 1
+                        esac
+                        shift
+                done
+        fi
+        rm -f $TMP1 $TMP2 $TMP3
+        exit 0
+}
+
+# Take the first hundred entries in the dictionary, and make them
+# be key/data pairs.
+test1()
+{
+        echo "Test 1: btree, hash: small key, small data pairs"
+        sed 200q $DICT > $TMP1
+        for type in btree hash; do
+                rm -f $TMP2 $TMP3
+                for i in `sed 200q $DICT`; do
+                        echo p
+                        echo k$i
+                        echo d$i
+                        echo g
+                        echo k$i
+                done > $TMP2
+                $PROG -o $TMP3 $type $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test1: type $type: failed"
+                        exit 1
+                fi
+        done
+        echo "Test 1: recno: small key, small data pairs"
+        rm -f $TMP2 $TMP3
+        sed 200q $DICT |
+        awk '{ 
+                ++i;
+                printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
+        }' > $TMP2
+        $PROG -o $TMP3 recno $TMP2
+        if (cmp -s $TMP1 $TMP3) ; then :
+        else
+                echo "test1: type recno: failed"
+                exit 1
+        fi
+}
+
+# Take the first 200 entries in the dictionary, and give them
+# each a medium size data entry.
+test2()
+{
+        echo "Test 2: btree, hash: small key, medium data pairs"
+        mdata=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
+        echo $mdata |
+        awk '{ for (i = 1; i < 201; ++i) print $0 }' > $TMP1
+        for type in hash btree; do
+                rm -f $TMP2 $TMP3
+                for i in `sed 200q $DICT`; do
+                        echo p
+                        echo k$i
+                        echo d$mdata
+                        echo g
+                        echo k$i
+                done > $TMP2
+                $PROG -o $TMP3 $type $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test2: type $type: failed"
+                        exit 1
+                fi
+        done
+        echo "Test 2: recno: small key, medium data pairs"
+        rm -f $TMP2 $TMP3
+        echo $mdata | 
+        awk '{  for (i = 1; i < 201; ++i)
+                printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
+        }' > $TMP2
+        $PROG -o $TMP3 recno $TMP2
+        if (cmp -s $TMP1 $TMP3) ; then :
+        else
+                echo "test2: type recno: failed"
+                exit 1
+        fi
+}
+
+# Insert the programs in /bin with their paths as their keys.
+test3()
+{
+        echo "Test 3: hash: small key, big data pairs"
+        rm -f $TMP1
+        (find /bin -type f -print | xargs cat) > $TMP1
+        for type in hash; do
+                rm -f $TMP2 $TMP3
+                for i in `find /bin -type f -print`; do
+                        echo p
+                        echo k$i
+                        echo D$i
+                        echo g
+                        echo k$i
+                done > $TMP2
+                $PROG -o $TMP3 $type $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test3: $type: failed"
+                        exit 1
+                fi
+        done
+        echo "Test 3: btree: small key, big data pairs"
+        for psize in 512 16384 65536; do
+                echo "    page size $psize"
+                for type in btree; do
+                        rm -f $TMP2 $TMP3
+                        for i in `find /bin -type f -print`; do
+                                echo p
+                                echo k$i
+                                echo D$i
+                                echo g
+                                echo k$i
+                        done > $TMP2
+                        $PROG -i psize=$psize -o $TMP3 $type $TMP2
+                        if (cmp -s $TMP1 $TMP3) ; then :
+                        else
+                                echo "test3: $type: page size $psize: failed"
+                                exit 1
+                        fi
+                done
+        done
+        echo "Test 3: recno: big data pairs"
+        rm -f $TMP2 $TMP3
+        find /bin -type f -print | 
+        awk '{
+                ++i;
+                printf("p\nk%d\nD%s\ng\nk%d\n", i, $0, i);
+        }' > $TMP2
+        for psize in 512 16384 65536; do
+                echo "    page size $psize"
+                $PROG -i psize=$psize -o $TMP3 recno $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test3: recno: page size $psize: failed"
+                        exit 1
+                fi
+        done
+}
+
+# Do random recno entries.
+test4()
+{
+        echo "Test 4: recno: random entries"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk '{
+                for (i = 37; i <= 37 + 88 * 17; i += 17) {
+                        if (i % 41)
+                                s = substr($0, 1, i % 41);
+                        else
+                                s = substr($0, 1);
+                        printf("input key %d: %s\n", i, s);
+                }
+                for (i = 1; i <= 15; ++i) {
+                        if (i % 41)
+                                s = substr($0, 1, i % 41);
+                        else
+                                s = substr($0, 1);
+                        printf("input key %d: %s\n", i, s);
+                }
+                for (i = 19234; i <= 19234 + 61 * 27; i += 27) {
+                        if (i % 41)
+                                s = substr($0, 1, i % 41);
+                        else
+                                s = substr($0, 1);
+                        printf("input key %d: %s\n", i, s);
+                }
+                exit
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+        cat $TMP1 |
+        awk 'BEGIN {
+                        i = 37;
+                        incr = 17;
+                }
+                {
+                        printf("p\nk%d\nd%s\n", i, $0);
+                        if (i == 19234 + 61 * 27)
+                                exit;
+                        if (i == 37 + 88 * 17) {
+                                i = 1;
+                                incr = 1;
+                        } else if (i == 15) {
+                                i = 19234;
+                                incr = 27;
+                        } else
+                                i += incr;
+                }
+                END {
+                        for (i = 37; i <= 37 + 88 * 17; i += 17)
+                                printf("g\nk%d\n", i);
+                        for (i = 1; i <= 15; ++i)
+                                printf("g\nk%d\n", i);
+                        for (i = 19234; i <= 19234 + 61 * 27; i += 27)
+                                printf("g\nk%d\n", i);
+                }' > $TMP2
+        $PROG -o $TMP3 recno $TMP2
+        if (cmp -s $TMP1 $TMP3) ; then :
+        else
+                echo "test4: type recno: failed"
+                exit 1
+        fi
+}
+
+# Do reverse order recno entries.
+test5()
+{
+        echo "Test 5: recno: reverse order entries"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk ' {
+                for (i = 1500; i; --i) {
+                        if (i % 34)
+                                s = substr($0, 1, i % 34);
+                        else
+                                s = substr($0, 1);
+                        printf("input key %d: %s\n", i, s);
+                }
+                exit;
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+        cat $TMP1 |
+        awk 'BEGIN {
+                        i = 1500;
+                }
+                {
+                        printf("p\nk%d\nd%s\n", i, $0);
+                        --i;
+                }
+                END {
+                        for (i = 1500; i; --i) 
+                                printf("g\nk%d\n", i);
+                }' > $TMP2
+        $PROG -o $TMP3 recno $TMP2
+        if (cmp -s $TMP1 $TMP3) ; then :
+        else
+                echo "test5: type recno: failed"
+                exit 1
+        fi
+}
+                
+# Do alternating order recno entries.
+test6()
+{
+        echo "Test 6: recno: alternating order entries"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk ' {
+                for (i = 1; i < 1200; i += 2) {
+                        if (i % 34)
+                                s = substr($0, 1, i % 34);
+                        else
+                                s = substr($0, 1);
+                        printf("input key %d: %s\n", i, s);
+                }
+                for (i = 2; i < 1200; i += 2) {
+                        if (i % 34)
+                                s = substr($0, 1, i % 34);
+                        else
+                                s = substr($0, 1);
+                        printf("input key %d: %s\n", i, s);
+                }
+                exit;
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+        cat $TMP1 |
+        awk 'BEGIN {
+                        i = 1;
+                        even = 0;
+                }
+                {
+                        printf("p\nk%d\nd%s\n", i, $0);
+                        i += 2;
+                        if (i >= 1200) {
+                                if (even == 1)
+                                        exit;
+                                even = 1;
+                                i = 2;
+                        }
+                }
+                END {
+                        for (i = 1; i < 1200; ++i) 
+                                printf("g\nk%d\n", i);
+                }' > $TMP2
+        $PROG -o $TMP3 recno $TMP2
+        sort -o $TMP1 $TMP1
+        sort -o $TMP3 $TMP3
+        if (cmp -s $TMP1 $TMP3) ; then :
+        else
+                echo "test6: type recno: failed"
+                exit 1
+        fi
+}
+
+# Delete cursor record
+test7()
+{
+        echo "Test 7: btree, recno: delete cursor record"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk '{
+                for (i = 1; i <= 120; ++i)
+                        printf("%05d: input key %d: %s\n", i, i, $0);
+                printf("%05d: input key %d: %s\n", 120, 120, $0);
+                printf("seq failed, no such key\n");
+                printf("%05d: input key %d: %s\n", 1, 1, $0);
+                printf("%05d: input key %d: %s\n", 2, 2, $0);
+                exit;
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+
+        for type in btree recno; do
+                cat $TMP1 |
+                awk '{
+                        if (i == 120)
+                                exit;
+                        printf("p\nk%d\nd%s\n", ++i, $0);
+                }
+                END {
+                        printf("fR_NEXT\n");
+                        for (i = 1; i <= 120; ++i)
+                                printf("s\n");
+                        printf("fR_CURSOR\ns\nk120\n");
+                        printf("r\n");
+                        printf("fR_NEXT\ns\n");
+                        printf("fR_CURSOR\ns\nk1\n");
+                        printf("r\n");
+                        printf("fR_FIRST\ns\n");
+                }' > $TMP2
+                $PROG -o $TMP3 recno $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test7: type $type: failed"
+                        exit 1
+                fi
+        done
+}
+
+# Make sure that overflow pages are reused.
+test8()
+{
+        echo "Test 8: btree, hash: repeated small key, big data pairs"
+        rm -f $TMP1
+        echo "" | 
+        awk 'BEGIN {
+                for (i = 1; i <= 10; ++i) {
+                        printf("p\nkkey1\nD/bin/sh\n");
+                        printf("p\nkkey2\nD/bin/csh\n");
+                        if (i % 8 == 0) {
+                                printf("c\nkkey2\nD/bin/csh\n");
+                                printf("c\nkkey1\nD/bin/sh\n");
+                                printf("e\t%d of 10 (comparison)\n", i);
+                        } else
+                                printf("e\t%d of 10             \n", i);
+                        printf("r\nkkey1\nr\nkkey2\n");
+                }
+        }' > $TMP1
+        $PROG btree $TMP1
+#       $PROG hash $TMP1
+        # No explicit test for success.
+}
+
+# Test btree duplicate keys
+test9()
+{
+        echo "Test 9: btree: duplicate keys"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk '{
+                for (i = 1; i <= 543; ++i)
+                        printf("%05d: input key %d: %s\n", i, i, $0);
+                exit;
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+
+        for type in btree; do
+                cat $TMP1 | 
+                awk '{
+                        if (i++ % 2)
+                                printf("p\nkduplicatekey\nd%s\n", $0);
+                        else
+                                printf("p\nkunique%dkey\nd%s\n", i, $0);
+                }
+                END {
+                                printf("o\n");
+                }' > $TMP2
+                $PROG -iflags=1 -o $TMP3 $type $TMP2
+                sort -o $TMP3 $TMP3
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test9: type $type: failed"
+                        exit 1
+                fi
+        done
+}
+
+# Test use of cursor flags without initialization
+test10()
+{
+        echo "Test 10: btree, recno: test cursor flag use"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk '{
+                for (i = 1; i <= 20; ++i)
+                        printf("%05d: input key %d: %s\n", i, i, $0);
+                exit;
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+
+        # Test that R_CURSOR doesn't succeed before cursor initialized
+        for type in btree recno; do
+                cat $TMP1 |
+                awk '{
+                        if (i == 10)
+                                exit;
+                        printf("p\nk%d\nd%s\n", ++i, $0);
+                }
+                END {
+                        printf("fR_CURSOR\nr\n");
+                        printf("eR_CURSOR SHOULD HAVE FAILED\n");
+                }' > $TMP2
+                $PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
+                if [ -s $TMP3 ] ; then
+                        echo "Test 10: delete: R_CURSOR SHOULD HAVE FAILED"
+                        exit 1
+                fi
+        done
+        for type in btree recno; do
+                cat $TMP1 |
+                awk '{
+                        if (i == 10)
+                                exit;
+                        printf("p\nk%d\nd%s\n", ++i, $0);
+                }
+                END {
+                        printf("fR_CURSOR\np\nk1\ndsome data\n");
+                        printf("eR_CURSOR SHOULD HAVE FAILED\n");
+                }' > $TMP2
+                $PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
+                if [ -s $TMP3 ] ; then
+                        echo "Test 10: put: R_CURSOR SHOULD HAVE FAILED"
+                        exit 1
+                fi
+        done
+}
+
+# Test insert in reverse order.
+test11()
+{
+        echo "Test 11: recno: reverse order insert"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk '{
+                for (i = 1; i <= 779; ++i)
+                        printf("%05d: input key %d: %s\n", i, i, $0);
+                exit;
+        }' > $TMP1
+        rm -f $TMP2 $TMP3
+
+        for type in recno; do
+                cat $TMP1 |
+                awk '{
+                        if (i == 0) {
+                                i = 1;
+                                printf("p\nk1\nd%s\n", $0);
+                                printf("%s\n", "fR_IBEFORE");
+                        } else
+                                printf("p\nk1\nd%s\n", $0);
+                }
+                END {
+                                printf("or\n");
+                }' > $TMP2
+                $PROG -o $TMP3 $type $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test11: type $type: failed"
+                        exit 1
+                fi
+        done
+}
+
+# Take the first 20000 entries in the dictionary, reverse them, and give
+# them each a small size data entry.  Use a small page size to make sure
+# the btree split code gets hammered.
+test12()
+{
+        echo "Test 12: btree: lots of keys, small page size"
+        mdata=abcdefghijklmnopqrstuvwxy
+        echo $mdata |
+        awk '{ for (i = 1; i < 20001; ++i) print $0 }' > $TMP1
+        for type in btree; do
+                rm -f $TMP2 $TMP3
+                for i in `sed 20000q $DICT | rev`; do
+                        echo p
+                        echo k$i
+                        echo d$mdata
+                        echo g
+                        echo k$i
+                done > $TMP2
+                $PROG -i psize=512 -o $TMP3 $type $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test12: type $type: failed"
+                        exit 1
+                fi
+        done
+}
+
+# Test different byte orders.
+test13()
+{
+        echo "Test 13: btree, hash: differing byte orders"
+        sed 50q $DICT > $TMP1
+        for order in 1234 4321; do
+                for type in btree hash; do
+                        rm -f byte.file $TMP2 $TMP3
+                        for i in `sed 50q $DICT`; do
+                                echo p
+                                echo k$i
+                                echo d$i
+                                echo g
+                                echo k$i
+                        done > $TMP2
+                        $PROG -ilorder=$order -f byte.file -o $TMP3 $type $TMP2
+                        if (cmp -s $TMP1 $TMP3) ; then :
+                        else
+                                echo "test13: $type/$order put failed"
+                                exit 1
+                        fi
+                        for i in `sed 50q $DICT`; do
+                                echo g
+                                echo k$i
+                        done > $TMP2
+                        $PROG -s \
+                            -ilorder=$order -f byte.file -o $TMP3 $type $TMP2
+                        if (cmp -s $TMP1 $TMP3) ; then :
+                        else
+                                echo "test13: $type/$order get failed"
+                                exit 1
+                        fi
+                done
+        done
+        rm -f byte.file
+}
+
+# Try a variety of bucketsizes and fill factors for hashing
+test20()
+{
+        echo\
+    "Test 20: hash: bucketsize, fill factor; nelem 25000 cachesize 65536"
+        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
+        awk '{
+                for (i = 1; i <= 10000; ++i) {
+                        if (i % 34)
+                                s = substr($0, 1, i % 34);
+                        else
+                                s = substr($0, 1);
+                        printf("%s\n", s);
+                }
+                exit;
+        }' > $TMP1
+        sed 10000q $DICT |
+        awk 'BEGIN {
+                ds="abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg"
+        }
+        {
+                if (++i % 34)
+                        s = substr(ds, 1, i % 34);
+                else
+                        s = substr(ds, 1);
+                printf("p\nk%s\nd%s\n", $0, s);
+        }' > $TMP2
+        sed 10000q $DICT |
+        awk '{
+                ++i;
+                printf("g\nk%s\n", $0);
+        }' >> $TMP2
+        bsize=256
+        for ffactor in 11 14 21; do
+                echo "    bucketsize $bsize, fill factor $ffactor"
+                $PROG -o$TMP3 \
+                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
+                    hash $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test20: type hash:\
+bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
+                        exit 1
+                fi
+        done
+        bsize=512
+        for ffactor in 21 28 43; do
+                echo "    bucketsize $bsize, fill factor $ffactor"
+                $PROG -o$TMP3 \
+                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
+                    hash $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test20: type hash:\
+bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
+                        exit 1
+                fi
+        done
+        bsize=1024
+        for ffactor in 43 57 85; do
+                echo "    bucketsize $bsize, fill factor $ffactor"
+                $PROG -o$TMP3 \
+                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
+                    hash $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test20: type hash:\
+bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
+                        exit 1
+                fi
+        done
+        bsize=2048
+        for ffactor in 85 114 171; do
+                echo "    bucketsize $bsize, fill factor $ffactor"
+                $PROG -o$TMP3 \
+                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
+                    hash $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test20: type hash:\
+bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
+                        exit 1
+                fi
+        done
+        bsize=4096
+        for ffactor in 171 228 341; do
+                echo "    bucketsize $bsize, fill factor $ffactor"
+                $PROG -o$TMP3 \
+                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
+                    hash $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test20: type hash:\
+bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
+                        exit 1
+                fi
+        done
+        bsize=8192
+        for ffactor in 341 455 683; do
+                echo "    bucketsize $bsize, fill factor $ffactor"
+                $PROG -o$TMP3 \
+                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
+                    hash $TMP2
+                if (cmp -s $TMP1 $TMP3) ; then :
+                else
+                        echo "test20: type hash:\
+bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
+                        exit 1
+                fi
+        done
+}
+
+main $*
diff --git a/src/regress/lib/libc/ieeefp/Makefile b/src/regress/lib/libc/ieeefp/Makefile
new file mode 100644
index 0000000000..0f453a31e9
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/Makefile
@@ -0,0 +1,9 @@
+#       $NetBSD: Makefile,v 1.5 1996/04/09 16:54:18 phil Exp $
+
+SUBDIR+= except round
+
+regress: _SUBDIRUSE
+
+install:
+
+.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/ieeefp/except/Makefile b/src/regress/lib/libc/ieeefp/except/Makefile
new file mode 100644
index 0000000000..91f24f15f6
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/except/Makefile
@@ -0,0 +1,12 @@
+#       $NetBSD: Makefile,v 1.1 1995/04/26 00:27:25 jtc Exp $
+
+PROG=   except
+SRCS=   except.c
+NOMAN=
+
+install:
+
+regress: ${PROG}
+        ./${PROG}
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/ieeefp/except/except.c b/src/regress/lib/libc/ieeefp/except/except.c
new file mode 100644
index 0000000000..a2a107a788
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/except/except.c
@@ -0,0 +1,88 @@
+#include <stdio.h>
+#include <signal.h>
+#include <assert.h>
+#include <ieeefp.h>
+#include <float.h>
+
+void sigfpe();
+volatile sig_atomic_t signal_cought;
+
+static volatile const double one  = 1.0;
+static volatile const double zero = 0.0;
+static volatile const double huge = DBL_MAX;
+static volatile const double tiny = DBL_MIN;
+
+int
+main()
+{
+        volatile double x;
+
+        /*
+         * check to make sure that all exceptions are masked and 
+         * that the accumulated exception status is clear.
+         */
+        assert(fpgetmask() == 0);
+        assert(fpgetsticky() == 0);
+
+        /* set up signal handler */
+        signal (SIGFPE, sigfpe);
+        signal_cought = 0;
+
+        /* trip divide by zero */
+        x = one / zero;
+        assert (fpgetsticky() & FP_X_DZ);
+        assert (signal_cought == 0);
+        fpsetsticky(0);
+
+        /* trip invalid operation */
+        x = zero / zero;
+        assert (fpgetsticky() & FP_X_INV);
+        assert (signal_cought == 0);
+        fpsetsticky(0);
+
+        /* trip overflow */
+        x = huge * huge;
+        assert (fpgetsticky() & FP_X_OFL);
+        assert (signal_cought == 0);
+        fpsetsticky(0);
+
+        /* trip underflow */
+        x = tiny * tiny;
+        assert (fpgetsticky() & FP_X_UFL);
+        assert (signal_cought == 0);
+        fpsetsticky(0);
+
+#if 0
+        /* unmask and then trip divide by zero */
+        fpsetmask(FP_X_DZ);
+        x = one / zero;
+        assert (signal_cought == 1);
+        signal_cought = 0;
+
+        /* unmask and then trip invalid operation */
+        fpsetmask(FP_X_INV);
+        x = zero / zero;
+        assert (signal_cought == 1);
+        signal_cought = 0;
+
+        /* unmask and then trip overflow */
+        fpsetmask(FP_X_OFL);
+        x = huge * huge;
+        assert (signal_cought == 1);
+        signal_cought = 0;
+
+        /* unmask and then trip underflow */
+        fpsetmask(FP_X_UFL);
+        x = tiny * tiny;
+        assert (signal_cought == 1);
+        signal_cought = 0;
+#endif
+
+        exit(0);
+}
+
+void
+sigfpe()
+{
+        signal_cought = 1;
+}
diff --git a/src/regress/lib/libc/ieeefp/round/Makefile b/src/regress/lib/libc/ieeefp/round/Makefile
new file mode 100644
index 0000000000..571133436c
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/round/Makefile
@@ -0,0 +1,12 @@
+#       $NetBSD: Makefile,v 1.1 1995/04/26 00:27:27 jtc Exp $
+
+PROG=   round
+SRCS=   round.c
+NOMAN=
+
+install:
+
+regress: ${PROG}
+        ./${PROG}
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/ieeefp/round/round.c b/src/regress/lib/libc/ieeefp/round/round.c
new file mode 100644
index 0000000000..b9fcd9771e
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/round/round.c
@@ -0,0 +1,44 @@
+/*      $NetBSD: round.c,v 1.1 1995/04/26 00:27:28 jtc Exp $    */
+
+/*
+ * Written by J.T. Conklin, Apr 18, 1995
+ * Public domain.
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+#include <ieeefp.h>
+#include <float.h>
+
+int
+main()
+{
+        /*
+         * This test would be better if it actually performed some
+         * calculations to verify the selected rounding mode.  But
+         * this is probably acceptable since the fp{get,set}round
+         * functions usually just get or set the processors fpu
+         * control word.
+         */
+
+        assert(fpgetround() == FP_RN);
+        assert(FLT_ROUNDS == 1);
+
+        assert(fpsetround(FP_RP) == FP_RN);
+        assert(fpgetround() == FP_RP);
+        assert(FLT_ROUNDS == 2);
+
+        assert(fpsetround(FP_RM) == FP_RP);
+        assert(fpgetround() == FP_RM);
+        assert(FLT_ROUNDS == 3);
+
+        assert(fpsetround(FP_RZ) == FP_RM);
+        assert(fpgetround() == FP_RZ);
+        assert(FLT_ROUNDS == 0);
+
+        assert(fpsetround(FP_RN) == FP_RZ);
+        assert(fpgetround() == FP_RN);
+        assert(FLT_ROUNDS == 1);
+
+        exit(0);
+}
diff --git a/src/regress/lib/libc/regex/Makefile b/src/regress/lib/libc/regex/Makefile
new file mode 100644
index 0000000000..93b7bb9052
--- /dev/null
+++ b/src/regress/lib/libc/regex/Makefile
@@ -0,0 +1,16 @@
+#       $NetBSD: Makefile,v 1.2 1995/02/16 19:38:45 cgd Exp $
+
+PROG=   re
+SRCS=   main.c split.c debug.c
+NOMAN=
+
+CFLAGS+= -I${.CURDIR}/../../../../lib/libc/regex
+
+TESTS=  ${.CURDIR}/tests
+
+regress:
+        ./re < ${TESTS}
+        ./re -el < ${TESTS}
+        ./re -er < ${TESTS}
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/regex/debug.c b/src/regress/lib/libc/regex/debug.c
new file mode 100644
index 0000000000..41cd4a557d
--- /dev/null
+++ b/src/regress/lib/libc/regex/debug.c
@@ -0,0 +1,244 @@
+/*      $NetBSD: debug.c,v 1.2 1995/04/20 22:39:42 cgd Exp $    */
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <regex.h>
+
+#include "utils.h"
+#include "regex2.h"
+#include "debug.ih"
+
+/*
+ - regprint - print a regexp for debugging
+ == void regprint(regex_t *r, FILE *d);
+ */
+void
+regprint(r, d)
+regex_t *r;
+FILE *d;
+{
+        register struct re_guts *g = r->re_g;
+        register int i;
+        register int c;
+        register int last;
+        int nincat[NC];
+
+        fprintf(d, "%ld states, %d categories", (long)g->nstates,
+                                                        g->ncategories);
+        fprintf(d, ", first %ld last %ld", (long)g->firststate,
+                                                (long)g->laststate);
+        if (g->iflags&USEBOL)
+                fprintf(d, ", USEBOL");
+        if (g->iflags&USEEOL)
+                fprintf(d, ", USEEOL");
+        if (g->iflags&BAD)
+                fprintf(d, ", BAD");
+        if (g->nsub > 0)
+                fprintf(d, ", nsub=%ld", (long)g->nsub);
+        if (g->must != NULL)
+                fprintf(d, ", must(%ld) `%*s'", (long)g->mlen, (int)g->mlen,
+                                                                g->must);
+        if (g->backrefs)
+                fprintf(d, ", backrefs");
+        if (g->nplus > 0)
+                fprintf(d, ", nplus %ld", (long)g->nplus);
+        fprintf(d, "\n");
+        s_print(g, d);
+        for (i = 0; i < g->ncategories; i++) {
+                nincat[i] = 0;
+                for (c = CHAR_MIN; c <= CHAR_MAX; c++)
+                        if (g->categories[c] == i)
+                                nincat[i]++;
+        }
+        fprintf(d, "cc0#%d", nincat[0]);
+        for (i = 1; i < g->ncategories; i++)
+                if (nincat[i] == 1) {
+                        for (c = CHAR_MIN; c <= CHAR_MAX; c++)
+                                if (g->categories[c] == i)
+                                        break;
+                        fprintf(d, ", %d=%s", i, regchar(c));
+                }
+        fprintf(d, "\n");
+        for (i = 1; i < g->ncategories; i++)
+                if (nincat[i] != 1) {
+                        fprintf(d, "cc%d\t", i);
+                        last = -1;
+                        for (c = CHAR_MIN; c <= CHAR_MAX+1; c++)        /* +1 does flush */
+                                if (c <= CHAR_MAX && g->categories[c] == i) {
+                                        if (last < 0) {
+                                                fprintf(d, "%s", regchar(c));
+                                                last = c;
+                                        }
+                                } else {
+                                        if (last >= 0) {
+                                                if (last != c-1)
+                                                        fprintf(d, "-%s",
+                                                                regchar(c-1));
+                                                last = -1;
+                                        }
+                                }
+                        fprintf(d, "\n");
+                }
+}
+
+/*
+ - s_print - print the strip for debugging
+ == static void s_print(register struct re_guts *g, FILE *d);
+ */
+static void
+s_print(g, d)
+register struct re_guts *g;
+FILE *d;
+{
+        register sop *s;
+        register cset *cs;
+        register int i;
+        register int done = 0;
+        register sop opnd;
+        register int col = 0;
+        register int last;
+        register sopno offset = 2;
+#       define  GAP()   {       if (offset % 5 == 0) { \
+                                        if (col > 40) { \
+                                                fprintf(d, "\n\t"); \
+                                                col = 0; \
+                                        } else { \
+                                                fprintf(d, " "); \
+                                                col++; \
+                                        } \
+                                } else \
+                                        col++; \
+                                offset++; \
+                        }
+
+        if (OP(g->strip[0]) != OEND)
+                fprintf(d, "missing initial OEND!\n");
+        for (s = &g->strip[1]; !done; s++) {
+                opnd = OPND(*s);
+                switch (OP(*s)) {
+                case OEND:
+                        fprintf(d, "\n");
+                        done = 1;
+                        break;
+                case OCHAR:
+                        if (strchr("\\|()^$.[+*?{}!<> ", (char)opnd) != NULL)
+                                fprintf(d, "\\%c", (char)opnd);
+                        else
+                                fprintf(d, "%s", regchar((char)opnd));
+                        break;
+                case OBOL:
+                        fprintf(d, "^");
+                        break;
+                case OEOL:
+                        fprintf(d, "$");
+                        break;
+                case OBOW:
+                        fprintf(d, "\\{");
+                        break;
+                case OEOW:
+                        fprintf(d, "\\}");
+                        break;
+                case OANY:
+                        fprintf(d, ".");
+                        break;
+                case OANYOF:
+                        fprintf(d, "[(%ld)", (long)opnd);
+                        cs = &g->sets[opnd];
+                        last = -1;
+                        for (i = 0; i < g->csetsize+1; i++)     /* +1 flushes */
+                                if (CHIN(cs, i) && i < g->csetsize) {
+                                        if (last < 0) {
+                                                fprintf(d, "%s", regchar(i));
+                                                last = i;
+                                        }
+                                } else {
+                                        if (last >= 0) {
+                                                if (last != i-1)
+                                                        fprintf(d, "-%s",
+                                                                regchar(i-1));
+                                                last = -1;
+                                        }
+                                }
+                        fprintf(d, "]");
+                        break;
+                case OBACK_:
+                        fprintf(d, "(\\<%ld>", (long)opnd);
+                        break;
+                case O_BACK:
+                        fprintf(d, "<%ld>\\)", (long)opnd);
+                        break;
+                case OPLUS_:
+                        fprintf(d, "(+");
+                        if (OP(*(s+opnd)) != O_PLUS)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        break;
+                case O_PLUS:
+                        if (OP(*(s-opnd)) != OPLUS_)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        fprintf(d, "+)");
+                        break;
+                case OQUEST_:
+                        fprintf(d, "(?");
+                        if (OP(*(s+opnd)) != O_QUEST)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        break;
+                case O_QUEST:
+                        if (OP(*(s-opnd)) != OQUEST_)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        fprintf(d, "?)");
+                        break;
+                case OLPAREN:
+                        fprintf(d, "((<%ld>", (long)opnd);
+                        break;
+                case ORPAREN:
+                        fprintf(d, "<%ld>))", (long)opnd);
+                        break;
+                case OCH_:
+                        fprintf(d, "<");
+                        if (OP(*(s+opnd)) != OOR2)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        break;
+                case OOR1:
+                        if (OP(*(s-opnd)) != OOR1 && OP(*(s-opnd)) != OCH_)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        fprintf(d, "|");
+                        break;
+                case OOR2:
+                        fprintf(d, "|");
+                        if (OP(*(s+opnd)) != OOR2 && OP(*(s+opnd)) != O_CH)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        break;
+                case O_CH:
+                        if (OP(*(s-opnd)) != OOR1)
+                                fprintf(d, "<%ld>", (long)opnd);
+                        fprintf(d, ">");
+                        break;
+                default:
+                        fprintf(d, "!%ld(%ld)!", (long)OP(*s), (long)opnd);
+                        break;
+                }
+                if (!done)
+                        GAP();
+        }
+}
+
+/*
+ - regchar - make a character printable
+ == static char *regchar(int ch);
+ */
+static char *                   /* -> representation */
+regchar(ch)
+int ch;
+{
+        static char buf[10];
+
+        if (isprint(ch) || ch == ' ')
+                sprintf(buf, "%c", ch);
+        else
+                sprintf(buf, "\\%o", ch);
+        return(buf);
+}
diff --git a/src/regress/lib/libc/regex/debug.ih b/src/regress/lib/libc/regex/debug.ih
new file mode 100644
index 0000000000..fb9bac0c75
--- /dev/null
+++ b/src/regress/lib/libc/regex/debug.ih
@@ -0,0 +1,16 @@
+/*      $NetBSD: debug.ih,v 1.2 1995/04/20 22:39:47 cgd Exp $   */
+
+/* ========= begin header generated by ./mkh ========= */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* === debug.c === */
+void regprint __P((regex_t *r, FILE *d));
+static void s_print __P((register struct re_guts *g, FILE *d));
+static char *regchar __P((int ch));
+
+#ifdef __cplusplus
+}
+#endif
+/* ========= end header generated by ./mkh ========= */
diff --git a/src/regress/lib/libc/regex/main.c b/src/regress/lib/libc/regex/main.c
new file mode 100644
index 0000000000..6e63ffc235
--- /dev/null
+++ b/src/regress/lib/libc/regex/main.c
@@ -0,0 +1,515 @@
+/*      $OpenBSD: main.c,v 1.3 1997/01/15 23:41:07 millert Exp $        */
+/*      $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $     */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <regex.h>
+#include <assert.h>
+#include <unistd.h>
+
+#include "main.ih"
+
+char *progname;
+int debug = 0;
+int line = 0;
+int status = 0;
+
+int copts = REG_EXTENDED;
+int eopts = 0;
+regoff_t startoff = 0;
+regoff_t endoff = 0;
+
+
+extern int split();
+extern void regprint();
+
+/*
+ - main - do the simple case, hand off to regress() for regression
+ */
+int
+main(argc, argv)
+int argc;
+char *argv[];
+{
+        regex_t re;
+#       define  NS      10
+        regmatch_t subs[NS];
+        char erbuf[100];
+        int err;
+        size_t len;
+        int c;
+        int errflg = 0;
+        register int i;
+        extern int optind;
+        extern char *optarg;
+
+        progname = argv[0];
+
+        while ((c = getopt(argc, argv, "c:e:S:E:x")) != -1)
+                switch (c) {
+                case 'c':       /* compile options */
+                        copts = options('c', optarg);
+                        break;
+                case 'e':       /* execute options */
+                        eopts = options('e', optarg);
+                        break;
+                case 'S':       /* start offset */
+                        startoff = (regoff_t)atoi(optarg);
+                        break;
+                case 'E':       /* end offset */
+                        endoff = (regoff_t)atoi(optarg);
+                        break;
+                case 'x':       /* Debugging. */
+                        debug++;
+                        break;
+                case '?':
+                default:
+                        errflg++;
+                        break;
+                }
+        if (errflg) {
+                fprintf(stderr, "usage: %s ", progname);
+                fprintf(stderr, "[-c copt][-C][-d] [re]\n");
+                exit(2);
+        }
+
+        if (optind >= argc) {
+                regress(stdin);
+                exit(status);
+        }
+
+        err = regcomp(&re, argv[optind++], copts);
+        if (err) {
+                len = regerror(err, &re, erbuf, sizeof(erbuf));
+                fprintf(stderr, "error %s, %d/%d `%s'\n",
+                        eprint(err), len, sizeof(erbuf), erbuf);
+                exit(status);
+        }
+        regprint(&re, stdout);  
+
+        if (optind >= argc) {
+                regfree(&re);
+                exit(status);
+        }
+
+        if (eopts&REG_STARTEND) {
+                subs[0].rm_so = startoff;
+                subs[0].rm_eo = strlen(argv[optind]) - endoff;
+        }
+        err = regexec(&re, argv[optind], (size_t)NS, subs, eopts);
+        if (err) {
+                len = regerror(err, &re, erbuf, sizeof(erbuf));
+                fprintf(stderr, "error %s, %d/%d `%s'\n",
+                        eprint(err), len, sizeof(erbuf), erbuf);
+                exit(status);
+        }
+        if (!(copts&REG_NOSUB)) {
+                len = (size_t)(subs[0].rm_eo - subs[0].rm_so);
+                if (subs[0].rm_so != -1) {
+                        if (len != 0)
+                                printf("match `%.*s'\n", (int)len,
+                                        argv[optind] + subs[0].rm_so);
+                        else
+                                printf("match `'@%.1s\n",
+                                        argv[optind] + subs[0].rm_so);
+                }
+                for (i = 1; i < NS; i++)
+                        if (subs[i].rm_so != -1)
+                                printf("(%d) `%.*s'\n", i,
+                                        (int)(subs[i].rm_eo - subs[i].rm_so),
+                                        argv[optind] + subs[i].rm_so);
+        }
+        exit(status);
+}
+
+/*
+ - regress - main loop of regression test
+ == void regress(FILE *in);
+ */
+void
+regress(in)
+FILE *in;
+{
+        char inbuf[1000];
+#       define  MAXF    10
+        char *f[MAXF];
+        int nf;
+        int i;
+        char erbuf[100];
+        size_t ne;
+        char *badpat = "invalid regular expression";
+#       define  SHORT   10
+        char *bpname = "REG_BADPAT";
+        regex_t re;
+
+        while (fgets(inbuf, sizeof(inbuf), in) != NULL) {
+                line++;
+                if (inbuf[0] == '#' || inbuf[0] == '\n')
+                        continue;                       /* NOTE CONTINUE */
+                inbuf[strlen(inbuf)-1] = '\0';  /* get rid of stupid \n */
+                if (debug)
+                        fprintf(stdout, "%d:\n", line);
+                nf = split(inbuf, f, MAXF, "\t\t");
+                if (nf < 3) {
+                        fprintf(stderr, "bad input, line %d\n", line);
+                        exit(1);
+                }
+                for (i = 0; i < nf; i++)
+                        if (strcmp(f[i], "\"\"") == 0)
+                                f[i] = "";
+                if (nf <= 3)
+                        f[3] = NULL;
+                if (nf <= 4)
+                        f[4] = NULL;
+                try(f[0], f[1], f[2], f[3], f[4], options('c', f[1]));
+                if (opt('&', f[1]))     /* try with either type of RE */
+                        try(f[0], f[1], f[2], f[3], f[4],
+                                        options('c', f[1]) &~ REG_EXTENDED);
+        }
+
+        ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
+        if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
+                fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
+                                                        erbuf, badpat);
+                status = 1;
+        }
+        ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
+        if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
+                                                ne != strlen(badpat)+1) {
+                fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
+                                                erbuf, SHORT-1, badpat);
+                status = 1;
+        }
+        ne = regerror(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
+        if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
+                fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
+                                                erbuf, bpname);
+                status = 1;
+        }
+        re.re_endp = bpname;
+        ne = regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
+        if (atoi(erbuf) != (int)REG_BADPAT) {
+                fprintf(stderr, "end: regerror() ATOI test gave `%s' not `%ld'\n",
+                                                erbuf, (long)REG_BADPAT);
+                status = 1;
+        } else if (ne != strlen(erbuf)+1) {
+                fprintf(stderr, "end: regerror() ATOI test len(`%s') = %ld\n",
+                                                erbuf, (long)REG_BADPAT);
+                status = 1;
+        }
+}
+
+/*
+ - try - try it, and report on problems
+ == void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
+ */
+void
+try(f0, f1, f2, f3, f4, opts)
+char *f0;
+char *f1;
+char *f2;
+char *f3;
+char *f4;
+int opts;                       /* may not match f1 */
+{
+        regex_t re;
+#       define  NSUBS   10
+        regmatch_t subs[NSUBS];
+#       define  NSHOULD 15
+        char *should[NSHOULD];
+        int nshould;
+        char erbuf[100];
+        int err;
+        int len;
+        char *type = (opts & REG_EXTENDED) ? "ERE" : "BRE";
+        register int i;
+        char *grump;
+        char f0copy[1000];
+        char f2copy[1000];
+
+        strcpy(f0copy, f0);
+        re.re_endp = (opts&REG_PEND) ? f0copy + strlen(f0copy) : NULL;
+        fixstr(f0copy);
+        err = regcomp(&re, f0copy, opts);
+        if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
+                /* unexpected error or wrong error */
+                len = regerror(err, &re, erbuf, sizeof(erbuf));
+                fprintf(stderr, "%d: %s error %s, %d/%d `%s'\n",
+                                        line, type, eprint(err), len,
+                                        sizeof(erbuf), erbuf);
+                status = 1;
+        } else if (err == 0 && opt('C', f1)) {
+                /* unexpected success */
+                fprintf(stderr, "%d: %s should have given REG_%s\n",
+                                                line, type, f2);
+                status = 1;
+                err = 1;        /* so we won't try regexec */
+        }
+
+        if (err != 0) {
+                regfree(&re);
+                return;
+        }
+
+        strcpy(f2copy, f2);
+        fixstr(f2copy);
+
+        if (options('e', f1)&REG_STARTEND) {
+                if (strchr(f2, '(') == NULL || strchr(f2, ')') == NULL)
+                        fprintf(stderr, "%d: bad STARTEND syntax\n", line);
+                subs[0].rm_so = strchr(f2, '(') - f2 + 1;
+                subs[0].rm_eo = strchr(f2, ')') - f2;
+        }
+        err = regexec(&re, f2copy, NSUBS, subs, options('e', f1));
+
+        if (err != 0 && (f3 != NULL || err != REG_NOMATCH)) {
+                /* unexpected error or wrong error */
+                len = regerror(err, &re, erbuf, sizeof(erbuf));
+                fprintf(stderr, "%d: %s exec error %s, %d/%d `%s'\n",
+                                        line, type, eprint(err), len,
+                                        sizeof(erbuf), erbuf);
+                status = 1;
+        } else if (err != 0) {
+                /* nothing more to check */
+        } else if (f3 == NULL) {
+                /* unexpected success */
+                fprintf(stderr, "%d: %s exec should have failed\n",
+                                                line, type);
+                status = 1;
+                err = 1;                /* just on principle */
+        } else if (opts&REG_NOSUB) {
+                /* nothing more to check */
+        } else if ((grump = check(f2, subs[0], f3)) != NULL) {
+                fprintf(stderr, "%d: %s %s\n", line, type, grump);
+                status = 1;
+                err = 1;
+        }
+
+        if (err != 0 || f4 == NULL) {
+                regfree(&re);
+                return;
+        }
+
+        for (i = 1; i < NSHOULD; i++)
+                should[i] = NULL;
+        nshould = split(f4, should+1, NSHOULD-1, ",");
+        if (nshould == 0) {
+                nshould = 1;
+                should[1] = "";
+        }
+        for (i = 1; i < NSUBS; i++) {
+                grump = check(f2, subs[i], should[i]);
+                if (grump != NULL) {
+                        fprintf(stderr, "%d: %s $%d %s\n", line,
+                                                        type, i, grump);
+                        status = 1;
+                        err = 1;
+                }
+        }
+
+        regfree(&re);
+}
+
+/*
+ - options - pick options out of a regression-test string
+ == int options(int type, char *s);
+ */
+int
+options(type, s)
+int type;                       /* 'c' compile, 'e' exec */
+char *s;
+{
+        register char *p;
+        register int o = (type == 'c') ? copts : eopts;
+        register char *legal = (type == 'c') ? "bisnmp" : "^$#tl";
+
+        for (p = s; *p != '\0'; p++)
+                if (strchr(legal, *p) != NULL)
+                        switch (*p) {
+                        case 'b':
+                                o &= ~REG_EXTENDED;
+                                break;
+                        case 'i':
+                                o |= REG_ICASE;
+                                break;
+                        case 's':
+                                o |= REG_NOSUB;
+                                break;
+                        case 'n':
+                                o |= REG_NEWLINE;
+                                break;
+                        case 'm':
+                                o &= ~REG_EXTENDED;
+                                o |= REG_NOSPEC;
+                                break;
+                        case 'p':
+                                o |= REG_PEND;
+                                break;
+                        case '^':
+                                o |= REG_NOTBOL;
+                                break;
+                        case '$':
+                                o |= REG_NOTEOL;
+                                break;
+                        case '#':
+                                o |= REG_STARTEND;
+                                break;
+                        case 't':       /* trace */
+                                o |= REG_TRACE;
+                                break;
+                        case 'l':       /* force long representation */
+                                o |= REG_LARGE;
+                                break;
+                        case 'r':       /* force backref use */
+                                o |= REG_BACKR;
+                                break;
+                        }
+        return(o);
+}
+
+/*
+ - opt - is a particular option in a regression string?
+ == int opt(int c, char *s);
+ */
+int                             /* predicate */
+opt(c, s)
+int c;
+char *s;
+{
+        return(strchr(s, c) != NULL);
+}
+
+/*
+ - fixstr - transform magic characters in strings
+ == void fixstr(register char *p);
+ */
+void
+fixstr(p)
+register char *p;
+{
+        if (p == NULL)
+                return;
+
+        for (; *p != '\0'; p++)
+                if (*p == 'N')
+                        *p = '\n';
+                else if (*p == 'T')
+                        *p = '\t';
+                else if (*p == 'S')
+                        *p = ' ';
+                else if (*p == 'Z')
+                        *p = '\0';
+}
+
+/*
+ - check - check a substring match
+ == char *check(char *str, regmatch_t sub, char *should);
+ */
+char *                          /* NULL or complaint */
+check(str, sub, should)
+char *str;
+regmatch_t sub;
+char *should;
+{
+        register int len;
+        register int shlen;
+        register char *p;
+        static char grump[500];
+        register char *at = NULL;
+
+        if (should != NULL && strcmp(should, "-") == 0)
+                should = NULL;
+        if (should != NULL && should[0] == '@') {
+                at = should + 1;
+                should = "";
+        }
+
+        /* check rm_so and rm_eo for consistency */
+        if (sub.rm_so > sub.rm_eo || (sub.rm_so == -1 && sub.rm_eo != -1) ||
+                                (sub.rm_so != -1 && sub.rm_eo == -1) ||
+                                (sub.rm_so != -1 && sub.rm_so < 0) ||
+                                (sub.rm_eo != -1 && sub.rm_eo < 0) ) {
+                sprintf(grump, "start %ld end %ld", (long)sub.rm_so,
+                                                        (long)sub.rm_eo);
+                return(grump);
+        }
+
+        /* check for no match */
+        if (sub.rm_so == -1 && should == NULL)
+                return(NULL);
+        if (sub.rm_so == -1)
+                return("did not match");
+
+        /* check for in range */
+        if (sub.rm_eo > strlen(str)) {
+                sprintf(grump, "start %ld end %ld, past end of string",
+                                        (long)sub.rm_so, (long)sub.rm_eo);
+                return(grump);
+        }
+
+        len = (int)(sub.rm_eo - sub.rm_so);
+        shlen = (int)strlen(should);
+        p = str + sub.rm_so;
+
+        /* check for not supposed to match */
+        if (should == NULL) {
+                sprintf(grump, "matched `%.*s'", len, p);
+                return(grump);
+        }
+
+        /* check for wrong match */
+        if (len != shlen || strncmp(p, should, (size_t)shlen) != 0) {
+                sprintf(grump, "matched `%.*s' instead", len, p);
+                return(grump);
+        }
+        if (shlen > 0)
+                return(NULL);
+
+        /* check null match in right place */
+        if (at == NULL)
+                return(NULL);
+        shlen = strlen(at);
+        if (shlen == 0)
+                shlen = 1;      /* force check for end-of-string */
+        if (strncmp(p, at, shlen) != 0) {
+                sprintf(grump, "matched null at `%.20s'", p);
+                return(grump);
+        }
+        return(NULL);
+}
+
+/*
+ - eprint - convert error number to name
+ == static char *eprint(int err);
+ */
+static char *
+eprint(err)
+int err;
+{
+        static char epbuf[100];
+        size_t len;
+
+        len = regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
+        assert(len <= sizeof(epbuf));
+        return(epbuf);
+}
+
+/*
+ - efind - convert error name to number
+ == static int efind(char *name);
+ */
+static int
+efind(name)
+char *name;
+{
+        static char efbuf[100];
+        regex_t re;
+
+        sprintf(efbuf, "REG_%s", name);
+        assert(strlen(efbuf) < sizeof(efbuf));
+        re.re_endp = efbuf;
+        (void) regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
+        return(atoi(efbuf));
+}
diff --git a/src/regress/lib/libc/regex/main.ih b/src/regress/lib/libc/regex/main.ih
new file mode 100644
index 0000000000..135e3e792d
--- /dev/null
+++ b/src/regress/lib/libc/regex/main.ih
@@ -0,0 +1,21 @@
+/*      $NetBSD: main.ih,v 1.2 1995/04/20 22:39:55 cgd Exp $    */
+
+/* ========= begin header generated by ./mkh ========= */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* === main.c === */
+void regress __P((FILE *in));
+void try __P((char *f0, char *f1, char *f2, char *f3, char *f4, int opts));
+int options __P((int type, char *s));
+int opt __P((int c, char *s));
+void fixstr __P((register char *p));
+char *check __P((char *str, regmatch_t sub, char *should));
+static char *eprint __P((int err));
+static int efind __P((char *name));
+
+#ifdef __cplusplus
+}
+#endif
+/* ========= end header generated by ./mkh ========= */
diff --git a/src/regress/lib/libc/regex/split.c b/src/regress/lib/libc/regex/split.c
new file mode 100644
index 0000000000..dd1ca14480
--- /dev/null
+++ b/src/regress/lib/libc/regex/split.c
@@ -0,0 +1,318 @@
+/*      $NetBSD: split.c,v 1.2 1995/04/20 22:39:57 cgd Exp $    */
+
+#include <stdio.h>
+#include <string.h>
+
+/*
+ - split - divide a string into fields, like awk split()
+ = int split(char *string, char *fields[], int nfields, char *sep);
+ */
+int                             /* number of fields, including overflow */
+split(string, fields, nfields, sep)
+char *string;
+char *fields[];                 /* list is not NULL-terminated */
+int nfields;                    /* number of entries available in fields[] */
+char *sep;                      /* "" white, "c" single char, "ab" [ab]+ */
+{
+        register char *p = string;
+        register char c;                        /* latest character */
+        register char sepc = sep[0];
+        register char sepc2;
+        register int fn;
+        register char **fp = fields;
+        register char *sepp;
+        register int trimtrail;
+
+        /* white space */
+        if (sepc == '\0') {
+                while ((c = *p++) == ' ' || c == '\t')
+                        continue;
+                p--;
+                trimtrail = 1;
+                sep = " \t";    /* note, code below knows this is 2 long */
+                sepc = ' ';
+        } else
+                trimtrail = 0;
+        sepc2 = sep[1];         /* now we can safely pick this up */
+
+        /* catch empties */
+        if (*p == '\0')
+                return(0);
+
+        /* single separator */
+        if (sepc2 == '\0') {
+                fn = nfields;
+                for (;;) {
+                        *fp++ = p;
+                        fn--;
+                        if (fn == 0)
+                                break;
+                        while ((c = *p++) != sepc)
+                                if (c == '\0')
+                                        return(nfields - fn);
+                        *(p-1) = '\0';
+                }
+                /* we have overflowed the fields vector -- just count them */
+                fn = nfields;
+                for (;;) {
+                        while ((c = *p++) != sepc)
+                                if (c == '\0')
+                                        return(fn);
+                        fn++;
+                }
+                /* not reached */
+        }
+
+        /* two separators */
+        if (sep[2] == '\0') {
+                fn = nfields;
+                for (;;) {
+                        *fp++ = p;
+                        fn--;
+                        while ((c = *p++) != sepc && c != sepc2)
+                                if (c == '\0') {
+                                        if (trimtrail && **(fp-1) == '\0')
+                                                fn++;
+                                        return(nfields - fn);
+                                }
+                        if (fn == 0)
+                                break;
+                        *(p-1) = '\0';
+                        while ((c = *p++) == sepc || c == sepc2)
+                                continue;
+                        p--;
+                }
+                /* we have overflowed the fields vector -- just count them */
+                fn = nfields;
+                while (c != '\0') {
+                        while ((c = *p++) == sepc || c == sepc2)
+                                continue;
+                        p--;
+                        fn++;
+                        while ((c = *p++) != '\0' && c != sepc && c != sepc2)
+                                continue;
+                }
+                /* might have to trim trailing white space */
+                if (trimtrail) {
+                        p--;
+                        while ((c = *--p) == sepc || c == sepc2)
+                                continue;
+                        p++;
+                        if (*p != '\0') {
+                                if (fn == nfields+1)
+                                        *p = '\0';
+                                fn--;
+                        }
+                }
+                return(fn);
+        }
+
+        /* n separators */
+        fn = 0;
+        for (;;) {
+                if (fn < nfields)
+                        *fp++ = p;
+                fn++;
+                for (;;) {
+                        c = *p++;
+                        if (c == '\0')
+                                return(fn);
+                        sepp = sep;
+                        while ((sepc = *sepp++) != '\0' && sepc != c)
+                                continue;
+                        if (sepc != '\0')       /* it was a separator */
+                                break;
+                }
+                if (fn < nfields)
+                        *(p-1) = '\0';
+                for (;;) {
+                        c = *p++;
+                        sepp = sep;
+                        while ((sepc = *sepp++) != '\0' && sepc != c)
+                                continue;
+                        if (sepc == '\0')       /* it wasn't a separator */
+                                break;
+                }
+                p--;
+        }
+
+        /* not reached */
+}
+
+#ifdef TEST_SPLIT
+
+
+/*
+ * test program
+ * pgm          runs regression
+ * pgm sep      splits stdin lines by sep
+ * pgm str sep  splits str by sep
+ * pgm str sep n        splits str by sep n times
+ */
+int
+main(argc, argv)
+int argc;
+char *argv[];
+{
+        char buf[512];
+        register int n;
+#       define  MNF     10
+        char *fields[MNF];
+
+        if (argc > 4)
+                for (n = atoi(argv[3]); n > 0; n--) {
+                        (void) strcpy(buf, argv[1]);
+                }
+        else if (argc > 3)
+                for (n = atoi(argv[3]); n > 0; n--) {
+                        (void) strcpy(buf, argv[1]);
+                        (void) split(buf, fields, MNF, argv[2]);
+                }
+        else if (argc > 2)
+                dosplit(argv[1], argv[2]);
+        else if (argc > 1)
+                while (fgets(buf, sizeof(buf), stdin) != NULL) {
+                        buf[strlen(buf)-1] = '\0';      /* stomp newline */
+                        dosplit(buf, argv[1]);
+                }
+        else
+                regress();
+
+        exit(0);
+}
+
+dosplit(string, seps)
+char *string;
+char *seps;
+{
+#       define  NF      5
+        char *fields[NF];
+        register int nf;
+
+        nf = split(string, fields, NF, seps);
+        print(nf, NF, fields);
+}
+
+print(nf, nfp, fields)
+int nf;
+int nfp;
+char *fields[];
+{
+        register int fn;
+        register int bound;
+
+        bound = (nf > nfp) ? nfp : nf;
+        printf("%d:\t", nf);
+        for (fn = 0; fn < bound; fn++)
+                printf("\"%s\"%s", fields[fn], (fn+1 < nf) ? ", " : "\n");
+}
+
+#define RNF     5               /* some table entries know this */
+struct {
+        char *str;
+        char *seps;
+        int nf;
+        char *fi[RNF];
+} tests[] = {
+        "",             " ",    0,      { "" },
+        " ",            " ",    2,      { "", "" },
+        "x",            " ",    1,      { "x" },
+        "xy",           " ",    1,      { "xy" },
+        "x y",          " ",    2,      { "x", "y" },
+        "abc def  g ",  " ",    5,      { "abc", "def", "", "g", "" },
+        "  a bcd",      " ",    4,      { "", "", "a", "bcd" },
+        "a b c d e f",  " ",    6,      { "a", "b", "c", "d", "e f" },
+        " a b c d ",    " ",    6,      { "", "a", "b", "c", "d " },
+
+        "",             " _",   0,      { "" },
+        " ",            " _",   2,      { "", "" },
+        "x",            " _",   1,      { "x" },
+        "x y",          " _",   2,      { "x", "y" },
+        "ab _ cd",      " _",   2,      { "ab", "cd" },
+        " a_b  c ",     " _",   5,      { "", "a", "b", "c", "" },
+        "a b c_d e f",  " _",   6,      { "a", "b", "c", "d", "e f" },
+        " a b c d ",    " _",   6,      { "", "a", "b", "c", "d " },
+
+        "",             " _~",  0,      { "" },
+        " ",            " _~",  2,      { "", "" },
+        "x",            " _~",  1,      { "x" },
+        "x y",          " _~",  2,      { "x", "y" },
+        "ab _~ cd",     " _~",  2,      { "ab", "cd" },
+        " a_b  c~",     " _~",  5,      { "", "a", "b", "c", "" },
+        "a b_c d~e f",  " _~",  6,      { "a", "b", "c", "d", "e f" },
+        "~a b c d ",    " _~",  6,      { "", "a", "b", "c", "d " },
+
+        "",             " _~-", 0,      { "" },
+        " ",            " _~-", 2,      { "", "" },
+        "x",            " _~-", 1,      { "x" },
+        "x y",          " _~-", 2,      { "x", "y" },
+        "ab _~- cd",    " _~-", 2,      { "ab", "cd" },
+        " a_b  c~",     " _~-", 5,      { "", "a", "b", "c", "" },
+        "a b_c-d~e f",  " _~-", 6,      { "a", "b", "c", "d", "e f" },
+        "~a-b c d ",    " _~-", 6,      { "", "a", "b", "c", "d " },
+
+        "",             "  ",   0,      { "" },
+        " ",            "  ",   2,      { "", "" },
+        "x",            "  ",   1,      { "x" },
+        "xy",           "  ",   1,      { "xy" },
+        "x y",          "  ",   2,      { "x", "y" },
+        "abc def  g ",  "  ",   4,      { "abc", "def", "g", "" },
+        "  a bcd",      "  ",   3,      { "", "a", "bcd" },
+        "a b c d e f",  "  ",   6,      { "a", "b", "c", "d", "e f" },
+        " a b c d ",    "  ",   6,      { "", "a", "b", "c", "d " },
+
+        "",             "",     0,      { "" },
+        " ",            "",     0,      { "" },
+        "x",            "",     1,      { "x" },
+        "xy",           "",     1,      { "xy" },
+        "x y",          "",     2,      { "x", "y" },
+        "abc def  g ",  "",     3,      { "abc", "def", "g" },
+        "\t a bcd",     "",     2,      { "a", "bcd" },
+        "  a \tb\t c ", "",     3,      { "a", "b", "c" },
+        "a b c d e ",   "",     5,      { "a", "b", "c", "d", "e" },
+        "a b\tc d e f", "",     6,      { "a", "b", "c", "d", "e f" },
+        " a b c d e f ",        "",     6,      { "a", "b", "c", "d", "e f " },
+
+        NULL,           NULL,   0,      { NULL },
+};
+
+regress()
+{
+        char buf[512];
+        register int n;
+        char *fields[RNF+1];
+        register int nf;
+        register int i;
+        register int printit;
+        register char *f;
+
+        for (n = 0; tests[n].str != NULL; n++) {
+                (void) strcpy(buf, tests[n].str);
+                fields[RNF] = NULL;
+                nf = split(buf, fields, RNF, tests[n].seps);
+                printit = 0;
+                if (nf != tests[n].nf) {
+                        printf("split `%s' by `%s' gave %d fields, not %d\n",
+                                tests[n].str, tests[n].seps, nf, tests[n].nf);
+                        printit = 1;
+                } else if (fields[RNF] != NULL) {
+                        printf("split() went beyond array end\n");
+                        printit = 1;
+                } else {
+                        for (i = 0; i < nf && i < RNF; i++) {
+                                f = fields[i];
+                                if (f == NULL)
+                                        f = "(NULL)";
+                                if (strcmp(f, tests[n].fi[i]) != 0) {
+                                        printf("split `%s' by `%s', field %d is `%s', not `%s'\n",
+                                                tests[n].str, tests[n].seps,
+                                                i, fields[i], tests[n].fi[i]);
+                                        printit = 1;
+                                }
+                        }
+                }
+                if (printit)
+                        print(nf, RNF, fields);
+        }
+}
+#endif
diff --git a/src/regress/lib/libc/regex/tests b/src/regress/lib/libc/regex/tests
new file mode 100644
index 0000000000..8e89f161b1
--- /dev/null
+++ b/src/regress/lib/libc/regex/tests
@@ -0,0 +1,477 @@
+#       $NetBSD: tests,v 1.5 1995/04/20 22:40:00 cgd Exp $
+
+# regular expression test set
+# Lines are at least three fields, separated by one or more tabs.  "" stands
+# for an empty field.  First field is an RE.  Second field is flags.  If
+# C flag given, regcomp() is expected to fail, and the third field is the
+# error name (minus the leading REG_).
+#
+# Otherwise it is expected to succeed, and the third field is the string to
+# try matching it against.  If there is no fourth field, the match is
+# expected to fail.  If there is a fourth field, it is the substring that
+# the RE is expected to match.  If there is a fifth field, it is a comma-
+# separated list of what the subexpressions should match, with - indicating
+# no match for that one.  In both the fourth and fifth fields, a (sub)field
+# starting with @ indicates that the (sub)expression is expected to match
+# a null string followed by the stuff after the @; this provides a way to
+# test where null strings match.  The character `N' in REs and strings
+# is newline, `S' is space, `T' is tab, `Z' is NUL.
+#
+# The full list of flags:
+#       -       placeholder, does nothing
+#       b       RE is a BRE, not an ERE
+#       &       try it as both an ERE and a BRE
+#       C       regcomp() error expected, third field is error name
+#       i       REG_ICASE
+#       m       ("mundane") REG_NOSPEC
+#       s       REG_NOSUB (not really testable)
+#       n       REG_NEWLINE
+#       ^       REG_NOTBOL
+#       $       REG_NOTEOL
+#       #       REG_STARTEND (see below)
+#       p       REG_PEND
+#
+# For REG_STARTEND, the start/end offsets are those of the substring
+# enclosed in ().
+
+# basics
+a               &       a       a
+abc             &       abc     abc
+abc|de          -       abc     abc
+a|b|c           -       abc     a
+
+# parentheses and perversions thereof
+a(b)c           -       abc     abc
+a\(b\)c         b       abc     abc
+a(              C       EPAREN
+a(              b       a(      a(
+a\(             -       a(      a(
+a\(             bC      EPAREN
+a\(b            bC      EPAREN
+a(b             C       EPAREN
+a(b             b       a(b     a(b
+# gag me with a right parenthesis -- 1003.2 goofed here (my fault, partly)
+a)              -       a)      a)
+)               -       )       )
+# end gagging (in a just world, those *should* give EPAREN)
+a)              b       a)      a)
+a\)             bC      EPAREN
+\)              bC      EPAREN
+a()b            -       ab      ab
+a\(\)b          b       ab      ab
+
+# anchoring and REG_NEWLINE
+^abc$           &       abc     abc
+a^b             -       a^b
+a^b             b       a^b     a^b
+a$b             -       a$b
+a$b             b       a$b     a$b
+^               &       abc     @abc
+$               &       abc     @
+^$              &       ""      @
+$^              -       ""      @
+\($\)\(^\)      b       ""      @
+# stop retching, those are legitimate (although disgusting)
+^^              -       ""      @
+$$              -       ""      @
+b$              &       abNc
+b$              &n      abNc    b
+^b$             &       aNbNc
+^b$             &n      aNbNc   b
+^$              &n      aNNb    @Nb
+^$              n       abc
+^$              n       abcN    @
+$^              n       aNNb    @Nb
+\($\)\(^\)      bn      aNNb    @Nb
+^^              n^      aNNb    @Nb
+$$              n       aNNb    @NN
+^a              ^       a
+a$              $       a
+^a              ^n      aNb
+^b              ^n      aNb     b
+a$              $n      bNa
+b$              $n      bNa     b
+a*(^b$)c*       -       b       b
+a*\(^b$\)c*     b       b       b
+
+# certain syntax errors and non-errors
+|               C       EMPTY
+|               b       |       |
+*               C       BADRPT
+*               b       *       *
++               C       BADRPT
+?               C       BADRPT
+""              &C      EMPTY
+()              -       abc     @abc
+\(\)            b       abc     @abc
+a||b            C       EMPTY
+|ab             C       EMPTY
+ab|             C       EMPTY
+(|a)b           C       EMPTY
+(a|)b           C       EMPTY
+(*a)            C       BADRPT
+(+a)            C       BADRPT
+(?a)            C       BADRPT
+({1}a)          C       BADRPT
+\(\{1\}a\)      bC      BADRPT
+(a|*b)          C       BADRPT
+(a|+b)          C       BADRPT
+(a|?b)          C       BADRPT
+(a|{1}b)        C       BADRPT
+^*              C       BADRPT
+^*              b       *       *
+^+              C       BADRPT
+^?              C       BADRPT
+^{1}            C       BADRPT
+^\{1\}          bC      BADRPT
+
+# metacharacters, backslashes
+a.c             &       abc     abc
+a[bc]d          &       abd     abd
+a\*c            &       a*c     a*c
+a\\b            &       a\b     a\b
+a\\\*b          &       a\*b    a\*b
+a\bc            &       abc     abc
+a\              &C      EESCAPE
+a\\bc           &       a\bc    a\bc
+\{              bC      BADRPT
+a\[b            &       a[b     a[b
+a[b             &C      EBRACK
+# trailing $ is a peculiar special case for the BRE code
+a$              &       a       a
+a$              &       a$
+a\$             &       a
+a\$             &       a$      a$
+a\\$            &       a
+a\\$            &       a$
+a\\$            &       a\$
+a\\$            &       a\      a\
+
+# back references, ugh
+a\(b\)\2c       bC      ESUBREG
+a\(b\1\)c       bC      ESUBREG
+a\(b*\)c\1d     b       abbcbbd abbcbbd bb
+a\(b*\)c\1d     b       abbcbd
+a\(b*\)c\1d     b       abbcbbbd
+^\(.\)\1        b       abc
+a\([bc]\)\1d    b       abcdabbd        abbd    b
+a\(\([bc]\)\2\)*d       b       abbccd  abbccd
+a\(\([bc]\)\2\)*d       b       abbcbd
+# actually, this next one probably ought to fail, but the spec is unclear
+a\(\(b\)*\2\)*d         b       abbbd   abbbd
+# here is a case that no NFA implementation does right
+\(ab*\)[ab]*\1  b       ababaaa ababaaa a
+# check out normal matching in the presence of back refs
+\(a\)\1bcd      b       aabcd   aabcd
+\(a\)\1bc*d     b       aabcd   aabcd
+\(a\)\1bc*d     b       aabd    aabd
+\(a\)\1bc*d     b       aabcccd aabcccd
+\(a\)\1bc*[ce]d b       aabcccd aabcccd
+^\(a\)\1b\(c\)*cd$      b       aabcccd aabcccd
+
+# ordinary repetitions
+ab*c            &       abc     abc
+ab+c            -       abc     abc
+ab?c            -       abc     abc
+a\(*\)b         b       a*b     a*b
+a\(**\)b        b       ab      ab
+a\(***\)b       bC      BADRPT
+*a              b       *a      *a
+**a             b       a       a
+***a            bC      BADRPT
+
+# the dreaded bounded repetitions
+{               &       {       {
+{abc            &       {abc    {abc
+{1              C       BADRPT
+{1}             C       BADRPT
+a{b             &       a{b     a{b
+a{1}b           -       ab      ab
+a\{1\}b         b       ab      ab
+a{1,}b          -       ab      ab
+a\{1,\}b        b       ab      ab
+a{1,2}b         -       aab     aab
+a\{1,2\}b       b       aab     aab
+a{1             C       EBRACE
+a\{1            bC      EBRACE
+a{1a            C       EBRACE
+a\{1a           bC      EBRACE
+a{1a}           C       BADBR
+a\{1a\}         bC      BADBR
+a{,2}           -       a{,2}   a{,2}
+a\{,2\}         bC      BADBR
+a{,}            -       a{,}    a{,}
+a\{,\}          bC      BADBR
+a{1,x}          C       BADBR
+a\{1,x\}        bC      BADBR
+a{1,x           C       EBRACE
+a\{1,x          bC      EBRACE
+a{300}          C       BADBR
+a\{300\}        bC      BADBR
+a{1,0}          C       BADBR
+a\{1,0\}        bC      BADBR
+ab{0,0}c        -       abcac   ac
+ab\{0,0\}c      b       abcac   ac
+ab{0,1}c        -       abcac   abc
+ab\{0,1\}c      b       abcac   abc
+ab{0,3}c        -       abbcac  abbc
+ab\{0,3\}c      b       abbcac  abbc
+ab{1,1}c        -       acabc   abc
+ab\{1,1\}c      b       acabc   abc
+ab{1,3}c        -       acabc   abc
+ab\{1,3\}c      b       acabc   abc
+ab{2,2}c        -       abcabbc abbc
+ab\{2,2\}c      b       abcabbc abbc
+ab{2,4}c        -       abcabbc abbc
+ab\{2,4\}c      b       abcabbc abbc
+((a{1,10}){1,10}){1,10} -       a       a       a,a
+
+# multiple repetitions
+a**             &C      BADRPT
+a++             C       BADRPT
+a??             C       BADRPT
+a*+             C       BADRPT
+a*?             C       BADRPT
+a+*             C       BADRPT
+a+?             C       BADRPT
+a?*             C       BADRPT
+a?+             C       BADRPT
+a{1}{1}         C       BADRPT
+a*{1}           C       BADRPT
+a+{1}           C       BADRPT
+a?{1}           C       BADRPT
+a{1}*           C       BADRPT
+a{1}+           C       BADRPT
+a{1}?           C       BADRPT
+a*{b}           -       a{b}    a{b}
+a\{1\}\{1\}     bC      BADRPT
+a*\{1\}         bC      BADRPT
+a\{1\}*         bC      BADRPT
+
+# brackets, and numerous perversions thereof
+a[b]c           &       abc     abc
+a[ab]c          &       abc     abc
+a[^ab]c         &       adc     adc
+a[]b]c          &       a]c     a]c
+a[[b]c          &       a[c     a[c
+a[-b]c          &       a-c     a-c
+a[^]b]c         &       adc     adc
+a[^-b]c         &       adc     adc
+a[b-]c          &       a-c     a-c
+a[b             &C      EBRACK
+a[]             &C      EBRACK
+a[1-3]c         &       a2c     a2c
+a[3-1]c         &C      ERANGE
+a[1-3-5]c       &C      ERANGE
+a[[.-.]--]c     &       a-c     a-c
+a[1-            &C      ERANGE
+a[[.            &C      EBRACK
+a[[.x           &C      EBRACK
+a[[.x.          &C      EBRACK
+a[[.x.]         &C      EBRACK
+a[[.x.]]        &       ax      ax
+a[[.x,.]]       &C      ECOLLATE
+a[[.one.]]b     &       a1b     a1b
+a[[.notdef.]]b  &C      ECOLLATE
+a[[.].]]b       &       a]b     a]b
+a[[:alpha:]]c   &       abc     abc
+a[[:notdef:]]c  &C      ECTYPE
+a[[:            &C      EBRACK
+a[[:alpha       &C      EBRACK
+a[[:alpha:]     &C      EBRACK
+a[[:alpha,:]    &C      ECTYPE
+a[[:]:]]b       &C      ECTYPE
+a[[:-:]]b       &C      ECTYPE
+a[[:alph:]]     &C      ECTYPE
+a[[:alphabet:]] &C      ECTYPE
+[[:alnum:]]+    -       -%@a0X- a0X
+[[:alpha:]]+    -       -%@aX0- aX
+[[:blank:]]+    -       aSSTb   SST
+[[:cntrl:]]+    -       aNTb    NT
+[[:digit:]]+    -       a019b   019
+[[:graph:]]+    -       Sa%bS   a%b
+[[:lower:]]+    -       AabC    ab
+[[:print:]]+    -       NaSbN   aSb
+[[:punct:]]+    -       S%-&T   %-&
+[[:space:]]+    -       aSNTb   SNT
+[[:upper:]]+    -       aBCd    BC
+[[:xdigit:]]+   -       p0f3Cq  0f3C
+a[[=b=]]c       &       abc     abc
+a[[=            &C      EBRACK
+a[[=b           &C      EBRACK
+a[[=b=          &C      EBRACK
+a[[=b=]         &C      EBRACK
+a[[=b,=]]       &C      ECOLLATE
+a[[=one=]]b     &       a1b     a1b
+
+# complexities
+a(((b)))c       -       abc     abc
+a(b|(c))d       -       abd     abd
+a(b*|c)d        -       abbd    abbd
+# just gotta have one DFA-buster, of course
+a[ab]{20}       -       aaaaabaaaabaaaabaaaab   aaaaabaaaabaaaabaaaab
+# and an inline expansion in case somebody gets tricky
+a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]       -       aaaaabaaaabaaaabaaaab   aaaaabaaaabaaaabaaaab
+# and in case somebody just slips in an NFA...
+a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)      -       aaaaabaaaabaaaabaaaabweeknights aaaaabaaaabaaaabaaaabweeknights
+# fish for anomalies as the number of states passes 32
+12345678901234567890123456789   -       a12345678901234567890123456789b 12345678901234567890123456789
+123456789012345678901234567890  -       a123456789012345678901234567890b        123456789012345678901234567890
+1234567890123456789012345678901 -       a1234567890123456789012345678901b       1234567890123456789012345678901
+12345678901234567890123456789012        -       a12345678901234567890123456789012b      12345678901234567890123456789012
+123456789012345678901234567890123       -       a123456789012345678901234567890123b     123456789012345678901234567890123
+# and one really big one, beyond any plausible word width
+1234567890123456789012345678901234567890123456789012345678901234567890  -       a1234567890123456789012345678901234567890123456789012345678901234567890b        1234567890123456789012345678901234567890123456789012345678901234567890
+# fish for problems as brackets go past 8
+[ab][cd][ef][gh][ij][kl][mn]    -       xacegikmoq      acegikm
+[ab][cd][ef][gh][ij][kl][mn][op]        -       xacegikmoq      acegikmo
+[ab][cd][ef][gh][ij][kl][mn][op][qr]    -       xacegikmoqy     acegikmoq
+[ab][cd][ef][gh][ij][kl][mn][op][q]     -       xacegikmoqy     acegikmoq
+
+# subtleties of matching
+abc             &       xabcy   abc
+a\(b\)?c\1d     b       acd
+aBc             i       Abc     Abc
+a[Bc]*d         i       abBCcd  abBCcd
+0[[:upper:]]1   &i      0a1     0a1
+0[[:lower:]]1   &i      0A1     0A1
+a[^b]c          &i      abc
+a[^b]c          &i      aBc
+a[^b]c          &i      adc     adc
+[a]b[c]         -       abc     abc
+[a]b[a]         -       aba     aba
+[abc]b[abc]     -       abc     abc
+[abc]b[abd]     -       abd     abd
+a(b?c)+d        -       accd    accd
+(wee|week)(knights|night)       -       weeknights      weeknights
+(we|wee|week|frob)(knights|night|day)   -       weeknights      weeknights
+a[bc]d          -       xyzaaabcaababdacd       abd
+a[ab]c          -       aaabc   abc
+abc             s       abc     abc
+a*              &       b       @b
+
+# Let's have some fun -- try to match a C comment.
+# first the obvious, which looks okay at first glance...
+/\*.*\*/        -       /*x*/   /*x*/
+# but...
+/\*.*\*/        -       /*x*/y/*z*/     /*x*/y/*z*/
+# okay, we must not match */ inside; try to do that...
+/\*([^*]|\*[^/])*\*/    -       /*x*/   /*x*/
+/\*([^*]|\*[^/])*\*/    -       /*x*/y/*z*/     /*x*/
+# but...
+/\*([^*]|\*[^/])*\*/    -       /*x**/y/*z*/    /*x**/y/*z*/
+# and a still fancier version, which does it right (I think)...
+/\*([^*]|\*+[^*/])*\*+/ -       /*x*/   /*x*/
+/\*([^*]|\*+[^*/])*\*+/ -       /*x*/y/*z*/     /*x*/
+/\*([^*]|\*+[^*/])*\*+/ -       /*x**/y/*z*/    /*x**/
+/\*([^*]|\*+[^*/])*\*+/ -       /*x****/y/*z*/  /*x****/
+/\*([^*]|\*+[^*/])*\*+/ -       /*x**x*/y/*z*/  /*x**x*/
+/\*([^*]|\*+[^*/])*\*+/ -       /*x***x/y/*z*/  /*x***x/y/*z*/
+
+# subexpressions
+a(b)(c)d        -       abcd    abcd    b,c
+a(((b)))c       -       abc     abc     b,b,b
+a(b|(c))d       -       abd     abd     b,-
+a(b*|c|e)d      -       abbd    abbd    bb
+a(b*|c|e)d      -       acd     acd     c
+a(b*|c|e)d      -       ad      ad      @d
+a(b?)c          -       abc     abc     b
+a(b?)c          -       ac      ac      @c
+a(b+)c          -       abc     abc     b
+a(b+)c          -       abbbc   abbbc   bbb
+a(b*)c          -       ac      ac      @c
+(a|ab)(bc([de]+)f|cde)  -       abcdef  abcdef  a,bcdef,de
+# the regression tester only asks for 9 subexpressions
+a(b)(c)(d)(e)(f)(g)(h)(i)(j)k   -       abcdefghijk     abcdefghijk     b,c,d,e,f,g,h,i,j
+a(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)l        -       abcdefghijkl    abcdefghijkl    b,c,d,e,f,g,h,i,j,k
+a([bc]?)c       -       abc     abc     b
+a([bc]?)c       -       ac      ac      @c
+a([bc]+)c       -       abc     abc     b
+a([bc]+)c       -       abcc    abcc    bc
+a([bc]+)bc      -       abcbc   abcbc   bc
+a(bb+|b)b       -       abb     abb     b
+a(bbb+|bb+|b)b  -       abb     abb     b
+a(bbb+|bb+|b)b  -       abbb    abbb    bb
+a(bbb+|bb+|b)bb -       abbb    abbb    b
+(.*).*          -       abcdef  abcdef  abcdef
+(a*)*           -       bc      @b      @b
+
+# do we get the right subexpression when it is used more than once?
+a(b|c)*d        -       ad      ad      -
+a(b|c)*d        -       abcd    abcd    c
+a(b|c)+d        -       abd     abd     b
+a(b|c)+d        -       abcd    abcd    c
+a(b|c?)+d       -       ad      ad      @d
+a(b|c?)+d       -       abcd    abcd    @d
+a(b|c){0,0}d    -       ad      ad      -
+a(b|c){0,1}d    -       ad      ad      -
+a(b|c){0,1}d    -       abd     abd     b
+a(b|c){0,2}d    -       ad      ad      -
+a(b|c){0,2}d    -       abcd    abcd    c
+a(b|c){0,}d     -       ad      ad      -
+a(b|c){0,}d     -       abcd    abcd    c
+a(b|c){1,1}d    -       abd     abd     b
+a(b|c){1,1}d    -       acd     acd     c
+a(b|c){1,2}d    -       abd     abd     b
+a(b|c){1,2}d    -       abcd    abcd    c
+a(b|c){1,}d     -       abd     abd     b
+a(b|c){1,}d     -       abcd    abcd    c
+a(b|c){2,2}d    -       acbd    acbd    b
+a(b|c){2,2}d    -       abcd    abcd    c
+a(b|c){2,4}d    -       abcd    abcd    c
+a(b|c){2,4}d    -       abcbd   abcbd   b
+a(b|c){2,4}d    -       abcbcd  abcbcd  c
+a(b|c){2,}d     -       abcd    abcd    c
+a(b|c){2,}d     -       abcbd   abcbd   b
+a(b+|((c)*))+d  -       abd     abd     @d,@d,-
+a(b+|((c)*))+d  -       abcd    abcd    @d,@d,-
+
+# check out the STARTEND option
+[abc]           &#      a(b)c   b
+[abc]           &#      a(d)c
+[abc]           &#      a(bc)d  b
+[abc]           &#      a(dc)d  c
+.               &#      a()c
+b.*c            &#      b(bc)c  bc
+b.*             &#      b(bc)c  bc
+.*c             &#      b(bc)c  bc
+
+# plain strings, with the NOSPEC flag
+abc             m       abc     abc
+abc             m       xabcy   abc
+abc             m       xyz
+a*b             m       aba*b   a*b
+a*b             m       ab
+""              mC      EMPTY
+
+# cases involving NULs
+aZb             &       a       a
+aZb             &p      a
+aZb             &p#     (aZb)   aZb
+aZ*b            &p#     (ab)    ab
+a.b             &#      (aZb)   aZb
+a.*             &#      (aZb)c  aZb
+
+# word boundaries (ick)
+[[:<:]]a        &       a       a
+[[:<:]]a        &       ba
+[[:<:]]a        &       -a      a
+a[[:>:]]        &       a       a
+a[[:>:]]        &       ab
+a[[:>:]]        &       a-      a
+[[:<:]]a.c[[:>:]]       &       axcd-dayc-dazce-abc     abc
+[[:<:]]a.c[[:>:]]       &       axcd-dayc-dazce-abc-q   abc
+[[:<:]]a.c[[:>:]]       &       axc-dayc-dazce-abc      axc
+[[:<:]]b.c[[:>:]]       &       a_bxc-byc_d-bzc-q       bzc
+[[:<:]].x..[[:>:]]      &       y_xa_-_xb_y-_xc_-axdc   _xc_
+[[:<:]]a_b[[:>:]]       &       x_a_b
+
+# past problems, and suspected problems
+(A[1])|(A[2])|(A[3])|(A[4])|(A[5])|(A[6])|(A[7])|(A[8])|(A[9])|(A[A])   -       A1      A1
+abcdefghijklmnop        i       abcdefghijklmnop        abcdefghijklmnop
+abcdefghijklmnopqrstuv  i       abcdefghijklmnopqrstuv  abcdefghijklmnopqrstuv
+(ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN])     -       CC11    CC11
+CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a    -       CC11    CC11
+Char \([a-z0-9_]*\)\[.* b       Char xyz[k      Char xyz[k      xyz
+a?b     -       ab      ab
+-\{0,1\}[0-9]*$ b       -5      -5
diff --git a/src/regress/lib/libc/setjmp/Makefile b/src/regress/lib/libc/setjmp/Makefile
new file mode 100644
index 0000000000..25bf99d4cb
--- /dev/null
+++ b/src/regress/lib/libc/setjmp/Makefile
@@ -0,0 +1,16 @@
+#       $NetBSD: Makefile,v 1.2 1995/04/20 22:40:13 cgd Exp $
+
+PROG=   setjmptest
+SRCS=   jmptest.c
+NOMAN=  noman, no way, man
+
+CFLAGS+= -DTEST_SETJMP
+
+.PATH:  ${.CURDIR}/../setjmp
+
+install:
+
+regress: ${PROG}
+        ./${PROG}
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/setjmp/jmptest.c b/src/regress/lib/libc/setjmp/jmptest.c
new file mode 100644
index 0000000000..16a482640a
--- /dev/null
+++ b/src/regress/lib/libc/setjmp/jmptest.c
@@ -0,0 +1,135 @@
+/*      $NetBSD: jmptest.c,v 1.2 1995/01/01 20:55:35 jtc Exp $  */
+
+/*
+ * Copyright (c) 1994 Christopher G. Demetriou
+ * 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 Christopher G. Demetriou
+ *      for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <err.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#if (TEST_SETJMP + TEST_U_SETJMP + TEST_SIGSETJMP) != 1
+#error one of TEST_SETJMP, TEST_U_SETJMP, or TEST_SIGSETJMP must be defined
+#endif
+
+#ifdef TEST_SETJMP
+#define BUF             jmp_buf
+#define SET(b, m)       setjmp(b)
+#define JMP(b, v)       longjmp(b, v)
+#endif
+
+#ifdef TEST_U_SETJMP
+#define BUF             jmp_buf
+#define SET(b, m)       _setjmp(b)
+#define JMP(b, v)       _longjmp(b, v)
+#endif
+
+#ifdef TEST_SIGSETJMP
+#define BUF             sigjmp_buf
+#define SET(b, m)       sigsetjmp(b, m)
+#define JMP(b, v)       siglongjmp(b, v)
+#endif
+
+int expectsignal;
+
+void
+aborthandler(signo)
+        int signo;
+{
+
+        if (expectsignal)
+                exit(0);
+        else
+                errx(1, "kill(SIGABRT) succeeded");
+}
+
+int
+main(argc, argv)
+        int argc;
+        char *argv[];
+{
+        struct sigaction sa;
+        BUF jb;
+        sigset_t ss;
+        int i, x;
+
+        i = getpid();
+
+#ifdef TEST_SETJMP
+        expectsignal = 0;
+#endif
+#ifdef TEST_U_SETJMP
+        expectsignal = 1;
+#endif
+#ifdef TEST_SIGSETJMP
+        if (argc != 2 ||
+            (strcmp(argv[1], "save") && strcmp(argv[1], "nosave"))) {
+                fprintf(stderr, "usage: %s [save|nosave]\n", argv[0]);
+                exit(1);
+        }
+        expectsignal = (strcmp(argv[1], "save") != 0);
+#endif
+
+        sa.sa_handler = aborthandler;
+        sigemptyset(&sa.sa_mask);
+        sa.sa_flags = 0;
+        if (sigaction(SIGABRT, &sa, NULL) == -1)
+                err(1, "sigaction failed");
+
+        if (sigemptyset(&ss) == -1)
+                err(1, "sigemptyset failed");
+        if (sigaddset(&ss, SIGABRT) == -1)
+                err(1, "sigaddset failed");
+        if (sigprocmask(SIG_BLOCK, &ss, NULL) == -1)
+                err(1, "sigprocmask (1) failed");
+
+        x = SET(jb, !expectsignal);
+        if (x != 0) {
+                if (x != i)
+                        errx(1, "setjmp returned wrong value");
+
+                kill(i, SIGABRT);
+                if (expectsignal)
+                        errx(1, "kill(SIGABRT) failed");
+                else
+                        exit(0);
+        }
+
+        if (sigprocmask(SIG_UNBLOCK, &ss, NULL) == -1)
+                err(1, "sigprocmask (2) failed");
+
+        JMP(jb, i);
+
+        errx(1, "jmp failed");
+}
diff --git a/src/regress/lib/libc/sigsetjmp/Makefile b/src/regress/lib/libc/sigsetjmp/Makefile
new file mode 100644
index 0000000000..41682fcb66
--- /dev/null
+++ b/src/regress/lib/libc/sigsetjmp/Makefile
@@ -0,0 +1,17 @@
+#       $NetBSD: Makefile,v 1.2 1995/04/20 22:40:40 cgd Exp $
+
+PROG=   sigsetjmptest
+SRCS=   jmptest.c
+NOMAN=  noman, no way, man
+
+CFLAGS+= -DTEST_SIGSETJMP
+
+.PATH:  ${.CURDIR}/../setjmp
+
+install:
+
+regress: ${PROG}
+        ./${PROG} save
+        ./${PROG} nosave
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
new file mode 100644
index 0000000000..3f7d48fd2e
--- /dev/null
+++ b/src/regress/lib/libssl/Makefile
@@ -0,0 +1,11 @@
+
+CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
+
+install:
+
+regress:
+        sh ${.CURDIR}/testenc.sh ${.OBJDIR} ${.CURDIR}
+        sh ${.CURDIR}/testdsa.sh ${.OBJDIR} ${.CURDIR}
+#       sh ${.CURDIR}/testrsa.sh ${.OBJDIR} ${.CURDIR}
+
+.include <bsd.prog.mk>
diff --git a/src/regress/lib/libssl/README b/src/regress/lib/libssl/README
new file mode 100644
index 0000000000..b1bab65fd1
--- /dev/null
+++ b/src/regress/lib/libssl/README
@@ -0,0 +1,8 @@
+testenc.sh tests encryption routines
+testdsa.sh tests DSA certificate generation
+test_server.sh starts a tls1 server using the above generated certificate
+test_client.sh starts a client to talk to the server.
+testrsa.sh tests RSA certificate generation - this SHOULD FAIL with the
+           version of the library in openbsd because all the RSA routines 
+           are (currently) stubbed.
+
diff --git a/src/regress/lib/libssl/ssleay.cnf b/src/regress/lib/libssl/ssleay.cnf
new file mode 100644
index 0000000000..c8439860c3
--- /dev/null
+++ b/src/regress/lib/libssl/ssleay.cnf
@@ -0,0 +1,27 @@
+#
+# SSLeay example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+# hacked by iang to do DSA certs - Server
+
+RANDFILE              = ./.rnd
+
+####################################################################
+[ req ]
+distinguished_name    = req_distinguished_name
+encrypt_rsa_key               = no
+
+[ req_distinguished_name ]
+countryName                   = Country Name (2 letter code)
+countryName_default           = CA
+countryName_value             = CA
+
+organizationName                = Organization Name (eg, company)
+organizationName_value          = Shake it Vera 
+
+0.commonName                  = Common Name (eg, YOUR name)
+0.commonName_value            = Wastelandus
+
+1.commonName                  = Common Name (eg, YOUR name)
+1.commonName_value            = Maximus
+
diff --git a/src/regress/lib/libssl/test_client.sh b/src/regress/lib/libssl/test_client.sh
new file mode 100644
index 0000000000..36a8f84532
--- /dev/null
+++ b/src/regress/lib/libssl/test_client.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo
+echo This starts a tls1 mode client to talk to the server run by 
+echo ./testserver.sh. You should start the server first. 
+echo
+echo type in this window after ssl negotiation and your output should
+echo be echoed by the server. 
+echo
+echo
+/usr/sbin/ssleay s_client -tls1
diff --git a/src/regress/lib/libssl/test_server.sh b/src/regress/lib/libssl/test_server.sh
new file mode 100644
index 0000000000..5467c52459
--- /dev/null
+++ b/src/regress/lib/libssl/test_server.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+echo This starts a tls1 mode server using the DSA certificate in ./server.pem
+echo Run ./testclient.sh in another window and type at it, you should 
+echo see the results of the ssl negotiation, and stuff you type in the client
+echo should echo in this window
+echo
+echo
+/usr/sbin/ssleay s_server -tls1 -key testdsa.key -cert testdsa.pem
diff --git a/src/regress/lib/libssl/testdsa.sh b/src/regress/lib/libssl/testdsa.sh
new file mode 100644
index 0000000000..dc5d7b97b5
--- /dev/null
+++ b/src/regress/lib/libssl/testdsa.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#Test DSA certificate generation of ssleay
+
+cd $1
+
+# Generate DSA paramter set
+ssleay dsaparam 512 -out dsa512.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Denerate a DSA certificate
+ssleay req -config $2/ssleay.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Now check the certificate
+ssleay x509 -text -in testdsa.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+exit 0
diff --git a/src/regress/lib/libssl/testenc.sh b/src/regress/lib/libssl/testenc.sh
new file mode 100644
index 0000000000..85997bfbe5
--- /dev/null
+++ b/src/regress/lib/libssl/testenc.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+testsrc=$2/ssleay.cnf
+test=$1/p
+cmd=/usr/sbin/ssleay
+
+cd $1
+
+cat $testsrc >$test;
+
+echo cat
+$cmd enc < $test > $test.cipher
+$cmd enc < $test.cipher >$test.clear
+cmp $test $test.clear
+if [ $? != 0 ]
+then
+        exit 1
+else
+        /bin/rm $test.cipher $test.clear
+fi
+echo base64
+$cmd enc -a -e < $test > $test.cipher
+$cmd enc -a -d < $test.cipher >$test.clear
+cmp $test $test.clear
+if [ $? != 0 ]
+then
+        exit 1
+else
+        /bin/rm $test.cipher $test.clear
+fi
+
+for i in rc4 \
+        des-cfb des-ede-cfb des-ede3-cfb \
+        des-ofb des-ede-ofb des-ede3-ofb \
+        des-ecb des-ede des-ede3 desx \
+        des-cbc des-ede-cbc des-ede3-cbc \
+        rc2-ecb rc2-cfb rc2-ofb rc2-cbc \
+        bf-ecb bf-cfb bf-ofb bf-cbc rc4 \
+        cast5-ecb cast5-cfb cast5-ofb cast5-cbc
+do
+        echo $i
+        $cmd $i -bufsize 113 -e -k test < $test > $test.$i.cipher
+        $cmd $i -bufsize 157 -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+
+        echo $i base64
+        $cmd $i -bufsize 113 -a -e -k test < $test > $test.$i.cipher
+        $cmd $i -bufsize 157 -a -d -k test < $test.$i.cipher >$test.$i.clear
+        cmp $test $test.$i.clear
+        if [ $? != 0 ]
+        then
+                exit 1
+        else
+                /bin/rm $test.$i.cipher $test.$i.clear
+        fi
+done
+rm -f $test
diff --git a/src/regress/lib/libssl/testrsa.sh b/src/regress/lib/libssl/testrsa.sh
new file mode 100644
index 0000000000..3f4c328acd
--- /dev/null
+++ b/src/regress/lib/libssl/testrsa.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#Test RSA certificate generation of ssleay
+
+echo 
+echo RSA paramters test - NOTE THAT THIS WILL ONLY WORK IF YOU HAVE
+echo compiled libssl with the src-patent tree, currently living in 
+echo ~ryker/src-patent.tar.gz on cvs. 
+echo
+echo This will *not* work with what\'s in the tree, rsa is not in that.
+echo
+sleep 3
+ 
+cd $1
+
+# Generate RSA private key
+ssleay genrsa -out rsakey.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Denerate an RSA certificate
+ssleay req -config $2/ssleay.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+
+# Now check the certificate
+ssleay x509 -text -in rsacert.pem
+if [ $? != 0 ]; then
+        exit 1;
+fi
+
+exit 0
diff --git a/src/usr.bin/nc/Makefile b/src/usr.bin/nc/Makefile
new file mode 100644
index 0000000000..086a9e5ee8
--- /dev/null
+++ b/src/usr.bin/nc/Makefile
@@ -0,0 +1,7 @@
+#       $OpenBSD: Makefile,v 1.2 1997/09/21 11:50:13 deraadt Exp $
+
+CFLAGS+= -DTELNET
+PROG=   nc
+SRCS=   netcat.c
+
+.include <bsd.prog.mk>
diff --git a/src/usr.bin/nc/README b/src/usr.bin/nc/README
new file mode 100644
index 0000000000..4235bc41ac
--- /dev/null
+++ b/src/usr.bin/nc/README
@@ -0,0 +1,946 @@
+Netcat 1.10
+===========                                                        /\_/\
+                                                                  / 0 0 \
+Netcat is a simple Unix utility which reads and writes data      ====v====
+across network connections, using TCP or UDP protocol.            \  W  /
+It is designed to be a reliable "back-end" tool that can          |     |     _
+be used directly or easily driven by other programs and           / ___ \    /
+scripts.  At the same time, it is a feature-rich network         / /   \ \  |
+debugging and exploration tool, since it can create almost      (((-----)))-'
+any kind of connection you would need and has several            /
+interesting built-in capabilities.  Netcat, or "nc" as the      (      ___
+actual program is named, should have been supplied long ago      \__.=|___E
+as another one of those cryptic but standard Unix tools.                /
+
+In the simplest usage, "nc host port" creates a TCP connection to the given
+port on the given target host.  Your standard input is then sent to the host,
+and anything that comes back across the connection is sent to your standard
+output.  This continues indefinitely, until the network side of the connection
+shuts down.  Note that this behavior is different from most other applications
+which shut everything down and exit after an end-of-file on the standard input.
+
+Netcat can also function as a server, by listening for inbound connections
+on arbitrary ports and then doing the same reading and writing.  With minor
+limitations, netcat doesn't really care if it runs in "client" or "server"
+mode -- it still shovels data back and forth until there isn't any more left.
+In either mode, shutdown can be forced after a configurable time of inactivity
+on the network side.
+
+And it can do this via UDP too, so netcat is possibly the "udp telnet-like"
+application you always wanted for testing your UDP-mode servers.  UDP, as the
+"U" implies, gives less reliable data transmission than TCP connections and
+some systems may have trouble sending large amounts of data that way, but it's
+still a useful capability to have.
+
+You may be asking "why not just use telnet to connect to arbitrary ports?"
+Valid question, and here are some reasons.  Telnet has the "standard input
+EOF" problem, so one must introduce calculated delays in driving scripts to
+allow network output to finish.  This is the main reason netcat stays running
+until the *network* side closes.  Telnet also will not transfer arbitrary
+binary data, because certain characters are interpreted as telnet options and
+are thus removed from the data stream.  Telnet also emits some of its
+diagnostic messages to standard output, where netcat keeps such things
+religiously separated from its *output* and will never modify any of the real
+data in transit unless you *really* want it to.  And of course telnet is
+incapable of listening for inbound connections, or using UDP instead.  Netcat
+doesn't have any of these limitations, is much smaller and faster than telnet,
+and has many other advantages.
+
+Some of netcat's major features are:
+
+        Outbound or inbound connections, TCP or UDP, to or from any ports
+        Full DNS forward/reverse checking, with appropriate warnings
+        Ability to use any local source port
+        Ability to use any locally-configured network source address
+        Built-in port-scanning capabilities, with randomizer
+        Built-in loose source-routing capability
+        Can read command line arguments from standard input
+        Slow-send mode, one line every N seconds
+        Hex dump of transmitted and received data
+        Optional ability to let another program service established connections
+        Optional telnet-options responder
+
+Efforts have been made to have netcat "do the right thing" in all its various
+modes.  If you believe that it is doing the wrong thing under whatever
+circumstances, please notify me and tell me how you think it should behave.
+If netcat is not able to do some task you think up, minor tweaks to the code
+will probably fix that.  It provides a basic and easily-modified template for
+writing other network applications, and I certainly encourage people to make
+custom mods and send in any improvements they make to it.  This is the second
+release; the overall differences from 1.00 are relatively minor and have mostly
+to do with portability and bugfixes.  Many people provided greatly appreciated
+fixes and comments on the 1.00 release.  Continued feedback from the Internet
+community is always welcome!
+
+Netcat is entirely my own creation, although plenty of other code was used as
+examples.  It is freely given away to the Internet community in the hope that
+it will be useful, with no restrictions except giving credit where it is due.
+No GPLs, Berkeley copyrights or any of that nonsense.  The author assumes NO
+responsibility for how anyone uses it.  If netcat makes you rich somehow and
+you're feeling generous, mail me a check.  If you are affiliated in any way
+with Microsoft Network, get a life.  Always ski in control.  Comments,
+questions, and patches to hobbit@avian.org.
+
+Building
+========
+
+Compiling is fairly straightforward.  Examine the Makefile for a SYSTYPE that
+matches yours, and do "make <systype>".  The executable "nc" should appear.
+If there is no relevant SYSTYPE section, try "generic".  If you create new
+sections for generic.h and Makefile to support another platform, please follow
+the given format and mail back the diffs.
+
+There are a couple of other settable #defines in netcat.c, which you can
+include as DFLAGS="-DTHIS -DTHAT" to your "make" invocation without having to
+edit the Makefile.  See the following discussions for what they are and do.
+
+If you want to link against the resolver library on SunOS [recommended] and
+you have BIND 4.9.x, you may need to change XLIBS=-lresolv in the Makefile to
+XLIBS="-lresolv -l44bsd".
+
+Linux sys/time.h does not really support presetting of FD_SETSIZE; a harmless
+warning is issued.
+
+Some systems may warn about pointer types for signal().  No problem, though.
+
+Exploration of features
+=======================
+
+Where to begin?  Netcat is at the same time so simple and versatile, it's like
+trying to describe everything you can do with your Swiss Army knife.  This will
+go over the basics; you should also read the usage examples and notes later on
+which may give you even more ideas about what this sort of tool is good for.
+
+If no command arguments are given at all, netcat asks for them, reads a line
+from standard input, and breaks it up into arguments internally.  This can be
+useful when driving netcat from certain types of scripts, with the side effect
+of hiding your command line arguments from "ps" displays.
+
+The host argument can be a name or IP address.  If -n is specified, netcat
+will only accept numeric IP addresses and do no DNS lookups for anything.  If
+-n is not given and -v is turned on, netcat will do a full forward and reverse
+name and address lookup for the host, and warn you about the all-too-common
+problem of mismatched names in the DNS.  This often takes a little longer for
+connection setup, but is useful to know about.  There are circumstances under
+which this can *save* time, such as when you want to know the name for some IP
+address and also connect there.  Netcat will just tell you all about it, saving
+the manual steps of looking up the hostname yourself.  Normally mismatch-
+checking is case-insensitive per the DNS spec, but you can define ANAL at
+compile time to make it case-sensitive -- sometimes useful for uncovering minor
+errors in your own DNS files while poking around your networks.
+
+A port argument is required for outbound connections, and can be numeric or a
+name as listed in /etc/services.  If -n is specified, only numeric arguments
+are valid.  Special syntax and/or more than one port argument cause different
+behavior -- see details below about port-scanning.
+
+The -v switch controls the verbosity level of messages sent to standard error.
+You will probably want to run netcat most of the time with -v turned on, so you
+can see info about the connections it is trying to make.  You will probably
+also want to give a smallish -w argument, which limits the time spent trying to
+make a connection.  I usually alias "nc" to "nc -v -w 3", which makes it
+function just about the same for things I would otherwise use telnet to do.
+The timeout is easily changed by a subsequent -w argument which overrides the
+earlier one.  Specifying -v more than once makes diagnostic output MORE
+verbose.  If -v is not specified at all, netcat silently does its work unless
+some error happens, whereupon it describes the error and exits with a nonzero
+status.  Refused network connections are generally NOT considered to be errors,
+unless you only asked for a single TCP port and it was refused.
+
+Note that -w also sets the network inactivity timeout.  This does not have any
+effect until standard input closes, but then if nothing further arrives from
+the network in the next <timeout> seconds, netcat tries to read the net once
+more for good measure, and then closes and exits.  There are a lot of network
+services now that accept a small amount of input and return a large amount of
+output, such as Gopher and Web servers, which is the main reason netcat was
+written to "block" on the network staying open rather than standard input.
+Handling the timeout this way gives uniform behavior with network servers that
+*don't* close by themselves until told to.
+
+UDP connections are opened instead of TCP when -u is specified.  These aren't
+really "connections" per se since UDP is a connectionless protocol, although
+netcat does internally use the "connected UDP socket" mechanism that most
+kernels support.  Although netcat claims that an outgoing UDP connection is
+"open" immediately, no data is sent until something is read from standard
+input.  Only thereafter is it possible to determine whether there really is a
+UDP server on the other end, and often you just can't tell.  Most UDP protocols
+use timeouts and retries to do their thing and in many cases won't bother
+answering at all, so you should specify a timeout and hope for the best.  You
+will get more out of UDP connections if standard input is fed from a source
+of data that looks like various kinds of server requests.
+
+To obtain a hex dump file of the data sent either way, use "-o logfile".  The
+dump lines begin with "<" or ">" to respectively indicate "from the net" or
+"to the net", and contain the total count per direction, and hex and ascii
+representations of the traffic.  Capturing a hex dump naturally slows netcat
+down a bit, so don't use it where speed is critical.
+
+Netcat can bind to any local port, subject to privilege restrictions and ports
+that are already in use.  It is also possible to use a specific local network
+source address if it is that of a network interface on your machine.  [Note:
+this does not work correctly on all platforms.]  Use "-p portarg" to grab a
+specific local port, and "-s ip-addr" or "-s name" to have that be your source
+IP address.  This is often referred to as "anchoring the socket".  Root users
+can grab any unused source port including the "reserved" ones less than 1024.
+Absence of -p will bind to whatever unused port the system gives you, just like
+any other normal client connection, unless you use -r [see below].
+
+Listen mode will cause netcat to wait for an inbound connection, and then the
+same data transfer happens.  Thus, you can do "nc -l -p 1234 < filename" and
+when someone else connects to your port 1234, the file is sent to them whether
+they wanted it or not.  Listen mode is generally used along with a local port
+argument -- this is required for UDP mode, while TCP mode can have the system
+assign one and tell you what it is if -v is turned on.  If you specify a target
+host and optional port in listen mode, netcat will accept an inbound connection
+only from that host and if you specify one, only from that foreign source port.
+In verbose mode you'll be informed about the inbound connection, including what
+address and port it came from, and since listening on "any" applies to several
+possibilities, which address it came *to* on your end.  If the system supports
+IP socket options, netcat will attempt to retrieve any such options from an
+inbound connection and print them out in hex.
+
+If netcat is compiled with -DGAPING_SECURITY_HOLE, the -e argument specifies
+a program to exec after making or receiving a successful connection.  In the
+listening mode, this works similarly to "inetd" but only for a single instance.
+Use with GREAT CARE.  This piece of the code is normally not enabled; if you
+know what you're doing, have fun.  This hack also works in UDP mode.  Note that
+you can only supply -e with the name of the program, but no arguments.  If you
+want to launch something with an argument list, write a two-line wrapper script
+or just use inetd like always.
+
+If netcat is compiled with -DTELNET, the -t argument enables it to respond
+to telnet option negotiation [always in the negative, i.e. DONT or WONT].
+This allows it to connect to a telnetd and get past the initial negotiation
+far enough to get a login prompt from the server.  Since this feature has
+the potential to modify the data stream, it is not enabled by default.  You
+have to understand why you might need this and turn on the #define yourself.
+
+Data from the network connection is always delivered to standard output as
+efficiently as possible, using large 8K reads and writes.  Standard input is
+normally sent to the net the same way, but the -i switch specifies an "interval
+time" which slows this down considerably.  Standard input is still read in
+large batches, but netcat then tries to find where line breaks exist and sends
+one line every interval time.  Note that if standard input is a terminal, data
+is already read line by line, so unless you make the -i interval rather long,
+what you type will go out at a fairly normal rate.  -i is really designed
+for use when you want to "measure out" what is read from files or pipes.
+
+Port-scanning is a popular method for exploring what's out there.  Netcat
+accepts its commands with options first, then the target host, and everything
+thereafter is interpreted as port names or numbers, or ranges of ports in M-N
+syntax.  CAVEAT: some port names in /etc/services contain hyphens -- netcat
+currently will not correctly parse those, so specify ranges using numbers if
+you can.  If more than one port is thus specified, netcat connects to *all* of
+them, sending the same batch of data from standard input [up to 8K worth] to
+each one that is successfully connected to.  Specifying multiple ports also
+suppresses diagnostic messages about refused connections, unless -v is
+specified twice for "more verbosity".  This way you normally get notified only
+about genuinely open connections.  Example: "nc -v -w 2 -z target 20-30" will
+try connecting to every port between 20 and 30 [inclusive] at the target, and
+will likely inform you about an FTP server, telnet server, and mailer along the
+way.  The -z switch prevents sending any data to a TCP connection and very
+limited probe data to a UDP connection, and is thus useful as a fast scanning
+mode just to see what ports the target is listening on.  To limit scanning
+speed if desired, -i will insert a delay between each port probe.  There are
+some pitfalls with regard to UDP scanning, described later, but in general it
+works well.
+
+For each range of ports specified, scanning is normally done downward within
+that range.  If the -r switch is used, scanning hops randomly around within
+that range and reports open ports as it finds them.  [If you want them listed
+in order regardless, pipe standard error through "sort"...]  In addition, if
+random mode is in effect, the local source ports are also randomized.  This
+prevents netcat from exhibiting any kind of regular pattern in its scanning.
+You can exert fairly fine control over your scan by judicious use of -r and
+selected port ranges to cover.  If you use -r for a single connection, the
+source port will have a random value above 8192, rather than the next one the
+kernel would have assigned you.  Note that selecting a specific local port
+with -p overrides any local-port randomization.
+
+Many people are interested in testing network connectivity using IP source
+routing, even if it's only to make sure their own firewalls are blocking
+source-routed packets.  On systems that support it, the -g switch can be used
+multiple times [up to 8] to construct a loose-source-routed path for your
+connection, and the -G argument positions the "hop pointer" within the list.
+If your network allows source-routed traffic in and out, you can test
+connectivity to your own services via remote points in the internet.  Note that
+although newer BSD-flavor telnets also have source-routing capability, it isn't
+clearly documented and the command syntax is somewhat clumsy.  Netcat's
+handling of "-g" is modeled after "traceroute".
+
+Netcat tries its best to behave just like "cat".  It currently does nothing to
+terminal input modes, and does no end-of-line conversion.  Standard input from
+a terminal is read line by line with normal editing characters in effect.  You
+can freely suspend out of an interactive connection and resume.  ^C or whatever
+your interrupt character is will make netcat close the network connection and
+exit.  A switch to place the terminal in raw mode has been considered, but so
+far has not been necessary.  You can send raw binary data by reading it out of
+a file or piping from another program, so more meaningful effort would be spent
+writing an appropriate front-end driver.
+
+Netcat is not an "arbitrary packet generator", but the ability to talk to raw
+sockets and/or nit/bpf/dlpi may appear at some point.  Such things are clearly
+useful; I refer you to Darren Reed's excellent ip_filter package, which now
+includes a tool to construct and send raw packets with any contents you want.
+
+Example uses -- the light side
+==============================
+
+Again, this is a very partial list of possibilities, but it may get you to
+think up more applications for netcat.  Driving netcat with simple shell or
+expect scripts is an easy and flexible way to do fairly complex tasks,
+especially if you're not into coding network tools in C.  My coding isn't
+particularly strong either [although undoubtedly better after writing this
+thing!], so I tend to construct bare-metal tools like this that I can trivially
+plug into other applications.  Netcat doubles as a teaching tool -- one can
+learn a great deal about more complex network protocols by trying to simulate
+them through raw connections!
+
+An example of netcat as a backend for something else is the shell-script
+Web browser, which simply asks for the relevant parts of a URL and pipes
+"GET /what/ever" into a netcat connection to the server.  I used to do this
+with telnet, and had to use calculated sleep times and other stupidity to
+kludge around telnet's limitations.  Netcat guarantees that I get the whole
+page, and since it transfers all the data unmodified, I can even pull down
+binary image files and display them elsewhere later.  Some folks may find the
+idea of a shell-script web browser silly and strange, but it starts up and
+gets me my info a hell of a lot faster than a GUI browser and doesn't hide
+any contents of links and forms and such.  This is included, as scripts/web,
+along with several other web-related examples.
+
+Netcat is an obvious replacement for telnet as a tool for talking to daemons.
+For example, it is easier to type "nc host 25", talk to someone's mailer, and
+just ^C out than having to type ^]c or QUIT as telnet would require you to do.
+You can quickly catalog the services on your network by telling netcat to
+connect to well-known services and collect greetings, or at least scan for open
+ports.  You'll probably want to collect netcat's diagnostic messages in your
+output files, so be sure to include standard error in the output using
+`>& file' in *csh or `> file 2>&1' in bourne shell.
+
+A scanning example: "echo QUIT | nc -v -w 5 target 20-250 500-600 5990-7000"
+will inform you about a target's various well-known TCP servers, including
+r-services, X, IRC, and maybe a few you didn't expect.  Sending in QUIT and
+using the timeout will almost guarantee that you see some kind of greeting or
+error from each service, which usually indicates what it is and what version.
+[Beware of the "chargen" port, though...]  SATAN uses exactly this technique to
+collect host information, and indeed some of the ideas herein were taken from
+the SATAN backend tools.  If you script this up to try every host in your
+subnet space and just let it run, you will not only see all the services,
+you'll find out about hosts that aren't correctly listed in your DNS.  Then you
+can compare new snapshots against old snapshots to see changes.  For going
+after particular services, a more intrusive example is in scripts/probe.
+
+Netcat can be used as a simple data transfer agent, and it doesn't really
+matter which end is the listener and which end is the client -- input at one
+side arrives at the other side as output.  It is helpful to start the listener
+at the receiving side with no timeout specified, and then give the sending side
+a small timeout.  That way the listener stays listening until you contact it,
+and after data stops flowing the client will time out, shut down, and take the
+listener with it.  Unless the intervening network is fraught with problems,
+this should be completely reliable, and you can always increase the timeout.  A
+typical example of something "rsh" is often used for: on one side,
+
+        nc -l -p 1234 | uncompress -c | tar xvfp -
+
+and then on the other side
+
+        tar cfp - /some/dir | compress -c | nc -w 3 othermachine 1234
+
+will transfer the contents of a directory from one machine to another, without
+having to worry about .rhosts files, user accounts, or inetd configurations
+at either end.  Again, it matters not which is the listener or receiver; the
+"tarring" machine could just as easily be running the listener instead.  One
+could conceivably use a scheme like this for backups, by having cron-jobs fire
+up listeners and backup handlers [which can be restricted to specific addresses
+and ports between each other] and pipe "dump" or "tar" on one machine to "dd
+of=/dev/tapedrive" on another as usual.  Since netcat returns a nonzero exit
+status for a denied listener connection, scripts to handle such tasks could
+easily log and reject connect attempts from third parties, and then retry.
+
+Another simple data-transfer example: shipping things to a PC that doesn't have
+any network applications yet except a TCP stack and a web browser.  Point the
+browser at an arbitrary port on a Unix server by telling it to download
+something like http://unixbox:4444/foo, and have a listener on the Unix side
+ready to ship out a file when the connect comes in.  The browser may pervert
+binary data when told to save the URL, but you can dig the raw data out of
+the on-disk cache.
+
+If you build netcat with GAPING_SECURITY_HOLE defined, you can use it as an
+"inetd" substitute to test experimental network servers that would otherwise
+run under "inetd".  A script or program will have its input and output hooked
+to the network the same way, perhaps sans some fancier signal handling.  Given
+that most network services do not bind to a particular local address, whether
+they are under "inetd" or not, it is possible for netcat avoid the "address
+already in use" error by binding to a specific address.  This lets you [as
+root, for low ports] place netcat "in the way" of a standard service, since
+inbound connections are generally sent to such specifically-bound listeners
+first and fall back to the ones bound to "any".  This allows for a one-off
+experimental simulation of some service, without having to screw around with
+inetd.conf.  Running with -v turned on and collecting a connection log from
+standard error is recommended.
+
+Netcat as well can make an outbound connection and then run a program or script
+on the originating end, with input and output connected to the same network
+port.  This "inverse inetd" capability could enhance the backup-server concept
+described above or help facilitate things such as a "network dialback" concept.
+The possibilities are many and varied here; if such things are intended as
+security mechanisms, it may be best to modify netcat specifically for the
+purpose instead of wrapping such functions in scripts.
+
+Speaking of inetd, netcat will function perfectly well *under* inetd as a TCP
+connection redirector for inbound services, like a "plug-gw" without the
+authentication step.  This is very useful for doing stuff like redirecting
+traffic through your firewall out to other places like web servers and mail
+hubs, while posing no risk to the firewall machine itself.  Put netcat behind
+inetd and tcp_wrappers, perhaps thusly:
+
+        www stream tcp nowait nobody /etc/tcpd /bin/nc -w 3 realwww 80
+
+and you have a simple and effective "application relay" with access control
+and logging.  Note use of the wait time as a "safety" in case realwww isn't
+reachable or the calling user aborts the connection -- otherwise the relay may
+hang there forever.
+
+You can use netcat to generate huge amounts of useless network data for
+various performance testing.  For example, doing
+
+        yes AAAAAAAAAAAAAAAAAAAAAA | nc -v -v -l -p 2222 > /dev/null
+
+on one side and then hitting it with
+
+        yes BBBBBBBBBBBBBBBBBBBBBB | nc othermachine 2222 > /dev/null
+
+from another host will saturate your wires with A's and B's.  The "very
+verbose" switch usage will tell you how many of each were sent and received
+after you interrupt either side.  Using UDP mode produces tremendously MORE
+trash per unit time in the form of fragmented 8 Kbyte mobygrams -- enough to
+stress-test kernels and network interfaces.  Firing random binary data into
+various network servers may help expose bugs in their input handling, which
+nowadays is a popular thing to explore.  A simple example data-generator is
+given in data/data.c included in this package, along with a small collection
+of canned input files to generate various packet contents.  This program is
+documented in its beginning comments, but of interest here is using "%r" to
+generate random bytes at well-chosen points in a data stream.  If you can
+crash your daemon, you likely have a security problem.
+
+The hex dump feature may be useful for debugging odd network protocols,
+especially if you don't have any network monitoring equipment handy or aren't
+root where you'd need to run "tcpdump" or something.  Bind a listening netcat
+to a local port, and have it run a script which in turn runs another netcat
+to the real service and captures the hex dump to a log file.  This sets up a
+transparent relay between your local port and wherever the real service is.
+Be sure that the script-run netcat does *not* use -v, or the extra info it
+sends to standard error may confuse the protocol.  Note also that you cannot
+have the "listen/exec" netcat do the data capture, since once the connection
+arrives it is no longer netcat that is running.
+
+Binding to an arbitrary local port allows you to simulate things like r-service
+clients, if you are root locally.  For example, feeding "^@root^@joe^@pwd^@"
+[where ^@ is a null, and root/joe could be any other local/remote username
+pair] into a "rsh" or "rlogin" server, FROM your port 1023 for example,
+duplicates what the server expects to receive.  Thus, you can test for insecure
+.rhosts files around your network without having to create new user accounts on
+your client machine.  The program data/rservice.c can aid this process by
+constructing the "rcmd" protocol bytes.  Doing this also prevents "rshd" from
+trying to create that separate standard-error socket and still gives you an
+input path, as opposed to the usual action of "rsh -n".  Using netcat for
+things like this can be really useful sometimes, because rsh and rlogin
+generally want a host *name* as an argument and won't accept IP addresses.  If
+your client-end DNS is hosed, as may be true when you're trying to extract
+backup sets on to a dumb client, "netcat -n" wins where normal rsh/rlogin is
+useless.
+
+If you are unsure that a remote syslogger is working, test it with netcat.
+Make a UDP connection to port 514 and type in "<0>message", which should
+correspond to "kern.emerg" and cause syslogd to scream into every file it has
+open [and possibly all over users' terminals].  You can tame this down by
+using a different number and use netcat inside routine scripts to send syslog
+messages to places that aren't configured in syslog.conf.  For example,
+"echo '<38>message' | nc -w 1 -u loggerhost 514" should send to auth.notice
+on loggerhost.  The exact number may vary; check against your syslog.h first.
+
+Netcat provides several ways for you to test your own packet filters.  If you
+bind to a port normally protected against outside access and make a connection
+to somewhere outside your own network, the return traffic will be coming to
+your chosen port from the "outside" and should be blocked.  TCP may get through
+if your filter passes all "ack syn", but it shouldn't be even doing that to low
+ports on your network.  Remember to test with UDP traffic as well!  If your
+filter passes at least outbound source-routed IP packets, bouncing a connection
+back to yourself via some gateway outside your network will create "incoming"
+traffic with your source address, which should get dropped by a correctly
+configured anti-spoofing filter.  This is a "non-test" if you're also dropping
+source-routing, but it's good to be able to test for that too.  Any packet
+filter worth its salt will be blocking source-routed packets in both
+directions, but you never know what interesting quirks you might turn up by
+playing around with source ports and addresses and watching the wires with a
+network monitor.
+
+You can use netcat to protect your own workstation's X server against outside
+access.  X is stupid enough to listen for connections on "any" and never tell
+you when new connections arrive, which is one reason it is so vulnerable.  Once
+you have all your various X windows up and running you can use netcat to bind
+just to your ethernet address and listen to port 6000.  Any new connections
+from outside the machine will hit netcat instead your X server, and you get a
+log of who's trying.  You can either tell netcat to drop the connection, or
+perhaps run another copy of itself to relay to your actual X server on
+"localhost".  This may not work for dedicated X terminals, but it may be
+possible to authorize your X terminal only for its boot server, and run a relay
+netcat over on the server that will in turn talk to your X terminal.  Since
+netcat only handles one listening connection per run, make sure that whatever
+way you rig it causes another one to run and listen on 6000 soon afterward, or
+your real X server will be reachable once again.  A very minimal script just
+to protect yourself could be
+
+        while true ; do
+          nc -v -l -s <your-addr> -p 6000 localhost 2
+        done
+
+which causes netcat to accept and then close any inbound connection to your
+workstation's normal ethernet address, and another copy is immediately run by
+the script.  Send standard error to a file for a log of connection attempts.
+If your system can't do the "specific bind" thing all is not lost; run your
+X server on display ":1" or port 6001, and netcat can still function as a probe
+alarm by listening on 6000.
+
+Does your shell-account provider allow personal Web pages, but not CGI scripts?
+You can have netcat listen on a particular port to execute a program or script
+of your choosing, and then just point to the port with a URL in your homepage.
+The listener could even exist on a completely different machine, avoiding the
+potential ire of the homepage-host administrators.  Since the script will get
+the raw browser query as input it won't look like a typical CGI script, and
+since it's running under your UID you need to write it carefully.  You may want
+to write a netcat-based script as a wrapper that reads a query and sets up
+environment variables for a regular CGI script.  The possibilities for using
+netcat and scripts to handle Web stuff are almost endless.  Again, see the
+examples under scripts/.
+
+Example uses -- the dark side
+=============================
+
+Equal time is deserved here, since a versatile tool like this can be useful
+to any Shade of Hat.  I could use my Victorinox to either fix your car or
+disassemble it, right?  You can clearly use something like netcat to attack
+or defend -- I don't try to govern anyone's social outlook, I just build tools.
+Regardless of your intentions, you should still be aware of these threats to
+your own systems.
+
+The first obvious thing is scanning someone *else's* network for vulnerable
+services.  Files containing preconstructed data, be it exploratory or
+exploitive, can be fed in as standard input, including command-line arguments
+to netcat itself to keep "ps" ignorant of your doings.  The more random the
+scanning, the less likelihood of detection by humans, scan-detectors, or
+dynamic filtering, and with -i you'll wait longer but avoid loading down the
+target's network.  Some examples for crafting various standard UDP probes are
+given in data/*.d.
+
+Some configurations of packet filters attempt to solve the FTP-data problem by
+just allowing such connections from the outside.  These come FROM port 20, TO
+high TCP ports inside -- if you locally bind to port 20, you may find yourself
+able to bypass filtering in some cases.  Maybe not to low ports "inside", but
+perhaps to TCP NFS servers, X servers, Prospero, ciscos that listen on 200x
+and 400x...  Similar bypassing may be possible for UDP [and maybe TCP too] if a
+connection comes from port 53; a filter may assume it's a nameserver response.
+
+Using -e in conjunction with binding to a specific address can enable "server
+takeover" by getting in ahead of the real ones, whereupon you can snarf data
+sent in and feed your own back out.  At the very least you can log a hex dump
+of someone else's session.  If you are root, you can certainly use -s and -e to
+run various hacked daemons without having to touch inetd.conf or the real
+daemons themselves.  You may not always have the root access to deal with low
+ports, but what if you are on a machine that also happens to be an NFS server?
+You might be able to collect some interesting things from port 2049, including
+local file handles.  There are several other servers that run on high ports
+that are likely candidates for takeover, including many of the RPC services on
+some platforms [yppasswdd, anyone?].  Kerberos tickets, X cookies, and IRC
+traffic also come to mind.  RADIUS-based terminal servers connect incoming
+users to shell-account machines on a high port, usually 1642 or thereabouts.
+SOCKS servers run on 1080.  Do "netstat -a" and get creative.
+
+There are some daemons that are well-written enough to bind separately to all
+the local interfaces, possibly with an eye toward heading off this sort of
+problem.  Named from recent BIND releases, and NTP, are two that come to mind.
+Netstat will show these listening on address.53 instead of *.53.  You won't
+be able to get in front of these on any of the real interface addresses, which
+of course is especially interesting in the case of named, but these servers
+sometimes forget about things like "alias" interface addresses or interfaces
+that appear later on such as dynamic PPP links.  There are some hacked web
+servers and versions of "inetd" floating around that specifically bind as well,
+based on a configuration file -- these generally *are* bound to alias addresses
+to offer several different address-based services from one machine.
+
+Using -e to start a remote backdoor shell is another obvious sort of thing,
+easier than constructing a file for inetd to listen on "ingreslock" or
+something, and you can access-control it against other people by specifying a
+client host and port.  Experience with this truly demonstrates how fragile the
+barrier between being "logged in" or not really is, and is further expressed by
+scripts/bsh.  If you're already behind a firewall, it may be easier to make an
+*outbound* connection and then run a shell; a small wrapper script can
+periodically try connecting to a known place and port, you can later listen
+there until the inbound connection arrives, and there's your shell.  Running
+a shell via UDP has several interesting features, although be aware that once
+"connected", the UDP stub sockets tend to show up in "netstat" just like TCP
+connections and may not be quite as subtle as you wanted.  Packets may also be
+lost, so use TCP if you need reliable connections.  But since UDP is
+connectionless, a hookup of this sort will stick around almost forever, even if
+you ^C out of netcat or do a reboot on your side, and you only need to remember
+the ports you used on both ends to reestablish.  And outbound UDP-plus-exec
+connection creates the connected socket and starts the program immediately.  On
+a listening UDP connection, the socket is created once a first packet is
+received.  In either case, though, such a "connection" has the interesting side
+effect that only your client-side IP address and [chosen?] source port will
+thereafter be able to talk to it.  Instant access control!  A non-local third
+party would have to do ALL of the following to take over such a session:
+
+        forge UDP with your source address [trivial to do; see below]
+        guess the port numbers of BOTH ends, or sniff the wire for them
+        arrange to block ICMP or UDP return traffic between it and your real
+          source, so the session doesn't die with a network write error.
+
+The companion program data/rservice.c is helpful in scripting up any sort of
+r-service username or password guessing attack.  The arguments to "rservice"
+are simply the strings that get null-terminated and passed over an "rcmd"-style
+connection, with the assumption that the client does not need a separate
+standard-error port.  Brute-force password banging is best done via "rexec" if
+it is available since it is less likely to log failed attempts.  Thus, doing
+"rservice joe joespass pwd | nc target exec" should return joe's home dir if
+the password is right, or "Permission denied."  Plug in a dictionary and go to
+town.  If you're attacking rsh/rlogin, remember to be root and bind to a port
+between 512 and 1023 on your end, and pipe in "rservice joe joe pwd" and such.
+
+Netcat can prevent inadvertently sending extra information over a telnet
+connection.  Use "nc -t" in place of telnet, and daemons that try to ask for
+things like USER and TERM environment variables will get no useful answers, as
+they otherwise would from a more recent telnet program.  Some telnetds actually
+try to collect this stuff and then plug the USER variable into "login" so that
+the caller is then just asked for a password!  This mechanism could cause a
+login attempt as YOUR real username to be logged over there if you use a
+Borman-based telnet instead of "nc -t".
+
+Got an unused network interface configured in your kernel [e.g. SLIP], or
+support for alias addresses?  Ifconfig one to be any address you like, and bind
+to it with -s to enable all sorts of shenanigans with bogus source addresses.
+The interface probably has to be UP before this works; some SLIP versions
+need a far-end address before this is true.  Hammering on UDP services is then
+a no-brainer.  What you can do to an unfiltered syslog daemon should be fairly
+obvious; trimming the conf file can help protect against it.  Many routers out
+there still blindly believe what they receive via RIP and other routing
+protocols.  Although most UDP echo and chargen servers check if an incoming
+packet was sent from *another* "internal" UDP server, there are many that still
+do not, any two of which [or many, for that matter] could keep each other
+entertained for hours at the expense of bandwidth.  And you can always make
+someone wonder why she's being probed by nsa.gov.
+
+Your TCP spoofing possibilities are mostly limited to destinations you can
+source-route to while locally bound to your phony address.  Many sites block
+source-routed packets these days for precisely this reason.  If your kernel
+does oddball things when sending source-routed packets, try moving the pointer
+around with -G.  You may also have to fiddle with the routing on your own
+machine before you start receiving packets back.  Warning: some machines still
+send out traffic using the source address of the outbound interface, regardless
+of your binding, especially in the case of localhost.  Check first.  If you can
+open a connection but then get no data back from it, the target host is
+probably killing the IP options on its end [this is an option inside TCP
+wrappers and several other packages], which happens after the 3-way handshake
+is completed.  If you send some data and observe the "send-q" side of "netstat"
+for that connection increasing but never getting sent, that's another symptom.
+Beware: if Sendmail 8.7.x detects a source-routed SMTP connection, it extracts
+the hop list and sticks it in the Received: header!
+
+SYN bombing [sometimes called "hosing"] can disable many TCP servers, and if
+you hit one often enough, you can keep it unreachable for days.  As is true of
+many other denial-of-service attacks, there is currently no defense against it
+except maybe at the human level.  Making kernel SOMAXCONN considerably larger
+than the default and the half-open timeout smaller can help, and indeed some
+people running large high-performance web servers have *had* to do that just to
+handle normal traffic.  Taking out mailers and web servers is sociopathic, but
+on the other hand it is sometimes useful to be able to, say, disable a site's
+identd daemon for a few minutes.  If someone realizes what is going on,
+backtracing will still be difficult since the packets have a phony source
+address, but calls to enough ISP NOCs might eventually pinpoint the source.
+It is also trivial for a clueful ISP to watch for or even block outgoing
+packets with obviously fake source addresses, but as we know many of them are
+not clueful or willing to get involved in such hassles.  Besides, outbound
+packets with an [otherwise unreachable] source address in one of their net
+blocks would look fairly legitimate.
+
+Notes
+=====
+
+A discussion of various caveats, subtleties, and the design of the innards.
+
+As of version 1.07 you can construct a single file containing command arguments
+and then some data to transfer.  Netcat is now smart enough to pick out the
+first line and build the argument list, and send any remaining data across the
+net to one or multiple ports.  The first release of netcat had trouble with
+this -- it called fgets() for the command line argument, which behind the
+scenes does a large read() from standard input, perhaps 4096 bytes or so, and
+feeds that out to the fgets() library routine.  By the time netcat 1.00 started
+directly read()ing stdin for more data, 4096 bytes of it were gone.  It now
+uses raw read() everywhere and does the right thing whether reading from files,
+pipes, or ttys.  If you use this for multiple-port connections, the single
+block of data will now be a maximum of 8K minus the first line.  Improvements
+have been made to the logic in sending the saved chunk to each new port.  Note
+that any command-line arguments hidden using this mechanism could still be
+extracted from a core dump.
+
+When netcat receives an inbound UDP connection, it creates a "connected socket"
+back to the source of the connection so that it can also send out data using
+normal write().  Using this mechanism instead of recvfrom/sendto has several
+advantages -- the read/write select loop is simplified, and ICMP errors can in
+effect be received by non-root users.  However, it has the subtle side effect
+that if further UDP packets arrive from the caller but from different source
+ports, the listener will not receive them.  UDP listen mode on a multihomed
+machine may have similar quirks unless you specifically bind to one of its
+addresses.  It is not clear that kernel support for UDP connected sockets
+and/or my understanding of it is entirely complete here, so experiment...
+
+You should be aware of some subtleties concerning UDP scanning.  If -z is on,
+netcat attempts to send a single null byte to the target port, twice, with a
+small time in between.  You can either use the -w timeout, or netcat will try
+to make a "sideline" TCP connection to the target to introduce a small time
+delay equal to the round-trip time between you and the target.  Note that if
+you have a -w timeout and -i timeout set, BOTH take effect and you wait twice
+as long.  The TCP connection is to a normally refused port to minimize traffic,
+but if you notice a UDP fast-scan taking somewhat longer than it should, it
+could be that the target is actually listening on the TCP port.  Either way,
+any ICMP port-unreachable messages from the target should have arrived in the
+meantime.  The second single-byte UDP probe is then sent.  Under BSD kernels,
+the ICMP error is delivered to the "connected socket" and the second write
+returns an error, which tells netcat that there is NOT a UDP service there.
+While Linux seems to be a fortunate exception, under many SYSV derived kernels
+the ICMP is not delivered, and netcat starts reporting that *all* the ports are
+"open" -- clearly wrong.  [Some systems may not even *have* the "udp connected
+socket" concept, and netcat in its current form will not work for UDP at all.]
+If -z is specified and only one UDP port is probed, netcat's exit status
+reflects whether the connection was "open" or "refused" as with TCP.
+
+It may also be that UDP packets are being blocked by filters with no ICMP error
+returns, in which case everything will time out and return "open".  This all
+sounds backwards, but that's how UDP works.  If you're not sure, try "echo
+w00gumz | nc -u -w 2 target 7" to see if you can reach its UDP echo port at
+all.  You should have no trouble using a BSD-flavor system to scan for UDP
+around your own network, although flooding a target with the high activity that
+-z generates will cause it to occasionally drop packets and indicate false
+"opens".  A more "correct" way to do this is collect and analyze the ICMP
+errors, as does SATAN's "udp_scan" backend, but then again there's no guarantee
+that the ICMP gets back to you either.  Udp_scan also does the zero-byte
+probes but is excruciatingly careful to calculate its own round-trip timing
+average and dynamically set its own response timeouts along with decoding any
+ICMP received.  Netcat uses a much sleazier method which is nonetheless quite
+effective.  Cisco routers are known to have a "dead time" in between ICMP
+responses about unreachable UDP ports, so a fast scan of a cisco will show
+almost everything "open".  If you are looking for a specific UDP service, you
+can construct a file containing the right bytes to trigger a response from the
+other end and send that as standard input.  Netcat will read up to 8K of the
+file and send the same data to every UDP port given.  Note that you must use a
+timeout in this case [as would any other UDP client application] since the
+two-write probe only happens if -z is specified.
+
+Many telnet servers insist on a specific set of option negotiations before
+presenting a login banner.  On a raw connection you will see this as small
+amount of binary gook.  My attempts to create fixed input bytes to make a
+telnetd happy worked some places but failed against newer BSD-flavor ones,
+possibly due to timing problems, but there are a couple of much better
+workarounds.  First, compile with -DTELNET and use -t if you just want to get
+past the option negotiation and talk to something on a telnet port.  You will
+still see the binary gook -- in fact you'll see a lot more of it as the options
+are responded to behind the scenes.  The telnet responder does NOT update the
+total byte count, or show up in the hex dump -- it just responds negatively to
+any options read from the incoming data stream.  If you want to use a normal
+full-blown telnet to get to something but also want some of netcat's features
+involved like settable ports or timeouts, construct a tiny "foo" script:
+
+        #! /bin/sh
+        exec nc -otheroptions targethost 23
+
+and then do
+
+        nc -l -p someport -e foo localhost &
+        telnet localhost someport
+
+and your telnet should connect transparently through the exec'ed netcat to
+the target, using whatever options you supplied in the "foo" script.  Don't
+use -t inside the script, or you'll wind up sending *two* option responses.
+
+I've observed inconsistent behavior under some Linuxes [perhaps just older
+ones?] when binding in listen mode.  Sometimes netcat binds only to "localhost"
+if invoked with no address or port arguments, and sometimes it is unable to
+bind to a specific address for listening if something else is already listening
+on "any".  The former problem can be worked around by specifying "-s 0.0.0.0",
+which will do the right thing despite netcat claiming that it's listening on
+[127.0.0.1].  This is a known problem -- for example, there's a mention of it
+in the makefile for SOCKS.  On the flip side, binding to localhost and sending
+packets to some other machine doesn't work as you'd expect -- they go out with
+the source address of the sending interface instead.  The Linux kernel contains
+a specific check to ensure that packets from 127.0.0.1 are never sent to the
+wire; other kernels may contain similar code.  Linux, of course, *still*
+doesn't support source-routing, but they claim that it and many other network
+improvements are at least breathing hard.
+
+There are several possible errors associated with making TCP connections, but
+to specifically see anything other than "refused", one must wait the full
+kernel-defined timeout for a connection to fail.  Netcat's mechanism of
+wrapping an alarm timer around the connect prevents the *real* network error
+from being returned -- "errno" at that point indicates "interrupted system
+call" since the connect attempt was interrupted.  Some old 4.3 BSD kernels
+would actually return things like "host unreachable" immediately if that was
+the case, but most newer kernels seem to wait the full timeout and *then* pass
+back the real error.  Go figure.  In this case, I'd argue that the old way was
+better, despite those same kernels generally being the ones that tear down
+*established* TCP connections when ICMP-bombed.
+
+Incoming socket options are passed to applications by the kernel in the
+kernel's own internal format.  The socket-options structure for source-routing
+contains the "first-hop" IP address first, followed by the rest of the real
+options list.  The kernel uses this as is when sending reply packets -- the
+structure is therefore designed to be more useful to the kernel than to humans,
+but the hex dump of it that netcat produces is still useful to have.
+
+Kernels treat source-routing options somewhat oddly, but it sort of makes sense
+once one understands what's going on internally.  The options list of addresses
+must contain hop1, hop2, ..., destination.  When a source-routed packet is sent
+by the kernel [at least BSD], the actual destination address becomes irrelevant
+because it is replaced with "hop1", "hop1" is removed from the options list,
+and all the other addresses in the list are shifted up to fill the hole.  Thus
+the outbound packet is sent from your chosen source address to the first
+*gateway*, and the options list now contains hop2, ..., destination.  During
+all this address shuffling, the kernel does NOT change the pointer value, which
+is why it is useful to be able to set the pointer yourself -- you can construct
+some really bizarre return paths, and send your traffic fairly directly to the
+target but around some larger loop on the way back.  Some Sun kernels seem to
+never flip the source-route around if it contains less than three hops, never
+reset the pointer anyway, and tries to send the packet [with options containing
+a "completed" source route!!] directly back to the source.  This is way broken,
+of course.  [Maybe ipforwarding has to be on?  I haven't had an opportunity to
+beat on it thoroughly yet.]
+
+"Credits" section: The original idea for netcat fell out of a long-standing
+desire and fruitless search for a tool resembling it and having the same
+features.  After reading some other network code and realizing just how many
+cool things about sockets could be controlled by the calling user, I started
+on the basics and the rest fell together pretty quickly.  Some port-scanning
+ideas were taken from Venema/Farmer's SATAN tool kit, and Pluvius' "pscan"
+utility.  Healthy amounts of BSD kernel source were perused in an attempt to
+dope out socket options and source-route handling; additional help was obtained
+from Dave Borman's telnet sources.  The select loop is loosely based on fairly
+well-known code from "rsh" and Richard Stevens' "sock" program [which itself is
+sort of a "netcat" with more obscure features], with some more paranoid
+sanity-checking thrown in to guard against the distinct likelihood that there
+are subtleties about such things I still don't understand.  I found the
+argument-hiding method cleanly implemented in Barrett's "deslogin"; reading the
+line as input allows greater versatility and is much less prone to cause
+bizarre problems than the more common trick of overwriting the argv array.
+After the first release, several people contributed portability fixes; they are
+credited in generic.h and the Makefile.  Lauren Burka inspired the ascii art
+for this revised document.  Dean Gaudet at Wired supplied a precursor to
+the hex-dump code, and mudge@l0pht.com originally experimented with and
+supplied code for the telnet-options responder.  Outbound "-e <prog>" resulted
+from a need to quietly bypass a firewall installation.  Other suggestions and
+patches have rolled in for which I am always grateful, but there are only 26
+hours per day and a discussion of feature creep near the end of this document.
+
+Netcat was written with the Russian railroad in mind -- conservatively built
+and solid, but it *will* get you there.  While the coding style is fairly
+"tight", I have attempted to present it cleanly [keeping *my* lines under 80
+characters, dammit] and put in plenty of comments as to why certain things
+are done.  Items I know to be questionable are clearly marked with "XXX".
+Source code was made to be modified, but determining where to start is
+difficult with some of the tangles of spaghetti code that are out there.
+Here are some of the major points I feel are worth mentioning about netcat's
+internal design, whether or not you agree with my approach.
+
+Except for generic.h, which changes to adapt more platforms, netcat is a single
+source file.  This has the distinct advantage of only having to include headers
+once and not having to re-declare all my functions in a billion different
+places.  I have attempted to contain all the gross who's-got-what-.h-file
+things in one small dumping ground.  Functions are placed "dependencies-first",
+such that when the compiler runs into the calls later, it already knows the
+type and arguments and won't complain.  No function prototyping -- not even the
+__P(()) crock -- is used, since it is more portable and a file of this size is
+easy enough to check manually.  Each function has a standard-format comment
+ahead of it, which is easily found using the regexp " :$".  I freely use gotos.
+Loops and if-clauses are made as small and non-nested as possible, and the ends
+of same *marked* for clarity [I wish everyone would do this!!].
+
+Large structures and buffers are all malloc()ed up on the fly, slightly larger
+than the size asked for and zeroed out.  This reduces the chances of damage
+from those "end of the buffer" fencepost errors or runaway pointers escaping
+off the end.  These things are permanent per run, so nothing needs to be freed
+until the program exits.
+
+File descriptor zero is always expected to be standard input, even if it is
+closed.  If a new network descriptor winds up being zero, a different one is
+asked for which will be nonzero, and fd zero is simply left kicking around
+for the rest of the run.  Why?  Because everything else assumes that stdin is
+always zero and "netfd" is always positive.  This may seem silly, but it was a
+lot easier to code.  The new fd is obtained directly as a new socket, because
+trying to simply dup() a new fd broke subsequent socket-style use of the new fd
+under Solaris' stupid streams handling in the socket library.
+
+The catch-all message and error handlers are implemented with an ample list of
+phoney arguments to get around various problems with varargs.  Varargs seems
+like deliberate obfuscation in the first place, and using it would also
+require use of vfprintf() which not all platforms support.  The trailing
+sleep in bail() is to allow output to flush, which is sometimes needed if
+netcat is already on the other end of a network connection.
+
+The reader may notice that the section that does DNS lookups seems much
+gnarlier and more confusing than other parts.  This is NOT MY FAULT.  The
+sockaddr and hostent abstractions are an abortion that forces the coder to
+deal with it.  Then again, a lot of BSD kernel code looks like similar
+struct-pointer hell.  I try to straighten it out somewhat by defining my own
+HINF structure, containing names, ascii-format IP addresses, and binary IP
+addresses.  I fill this structure exactly once per host argument, and squirrel
+everything safely away and handy for whatever wants to reference it later.
+
+Where many other network apps use the FIONBIO ioctl to set non-blocking I/O
+on network sockets, netcat uses straightforward blocking I/O everywhere.
+This makes everything very lock-step, relying on the network and filesystem
+layers to feed in data when needed.  Data read in is completely written out
+before any more is fetched.  This may not be quite the right thing to do under
+some OSes that don't do timed select() right, but this remains to be seen.
+
+The hexdump routine is written to be as fast as possible, which is why it does
+so much work itself instead of just sprintf()ing everything together.  Each
+dump line is built into a single buffer and atomically written out using the
+lowest level I/O calls.  Further improvements could undoubtedly be made by
+using writev() and eliminating all sprintf()s, but it seems to fly right along
+as is.  If both exec-a-prog mode and a hexdump file is asked for, the hexdump
+flag is deliberately turned off to avoid creating random zero-length files.
+Files are opened in "truncate" mode; if you want "append" mode instead, change
+the open flags in main().
+
+main() may look a bit hairy, but that's only because it has to go down the
+argv list and handle multiple ports, random mode, and exit status.  Efforts
+have been made to place a minimum of code inside the getopt() loop.  Any real
+work is sent off to functions in what is hopefully a straightforward way.
+
+Obligatory vendor-bash: If "nc" had become a standard utility years ago,
+the commercial vendors would have likely packaged it setuid root and with
+-DGAPING_SECURITY_HOLE turned on but not documented.  It is hoped that netcat
+will aid people in finding and fixing the no-brainer holes of this sort that
+keep appearing, by allowing easier experimentation with the "bare metal" of
+the network layer.
+
+It could be argued that netcat already has too many features.  I have tried
+to avoid "feature creep" by limiting netcat's base functionality only to those
+things which are truly relevant to making network connections and the everyday
+associated DNS lossage we're used to.  Option switches already have slightly
+overloaded functionality.  Random port mode is sort of pushing it.  The
+hex-dump feature went in later because it *is* genuinely useful.  The
+telnet-responder code *almost* verges on the gratuitous, especially since it
+mucks with the data stream, and is left as an optional piece.  Many people have
+asked for example "how 'bout adding encryption?" and my response is that such
+things should be separate entities that could pipe their data *through* netcat
+instead of having their own networking code.  I am therefore not completely
+enthusiastic about adding any more features to this thing, although you are
+still free to send along any mods you think are useful.
+
+Nonetheless, at this point I think of netcat as my tcp/ip swiss army knife,
+and the numerous companion programs and scripts to go with it as duct tape.
+Duct tape of course has a light side and a dark side and binds the universe
+together, and if I wrap enough of it around what I'm trying to accomplish,
+it *will* work.  Alternatively, if netcat is a large hammer, there are many
+network protocols that are increasingly looking like nails by now...
+
+_H* 960320 v1.10 RELEASE -- happy spring!
diff --git a/src/usr.bin/nc/data/Makefile b/src/usr.bin/nc/data/Makefile
new file mode 100644
index 0000000000..65cf185358
--- /dev/null
+++ b/src/usr.bin/nc/data/Makefile
@@ -0,0 +1,10 @@
+all:    data rservice xor
+
+data:   data.c
+        cc -s -O -o data data.c
+rservice:       rservice.c
+        cc -s -O -o rservice rservice.c
+xor:    xor.c
+        cc -s -O -o xor xor.c
+clean:
+        rm -f *.o data rservice xor
diff --git a/src/usr.bin/nc/data/README b/src/usr.bin/nc/data/README
new file mode 100644
index 0000000000..7e4b9fbf63
--- /dev/null
+++ b/src/usr.bin/nc/data/README
@@ -0,0 +1,9 @@
+For now, read the header comments inside each of these for documentation.
+The programs are simple enough that they don't really need a Makefile any more
+complex than the one given; ymmv.  Data and xor may also be useful on DOS,
+which is why there are hooks for it in the code.
+
+data.c          a primitive atob / btoa byte generator
+*.d             example input to "data -g"
+rservice.c      a utility for scripting up rsh/rexec attacks
+xor.c           generic xor handler
diff --git a/src/usr.bin/nc/data/data.c b/src/usr.bin/nc/data/data.c
new file mode 100644
index 0000000000..56c167fd96
--- /dev/null
+++ b/src/usr.bin/nc/data/data.c
@@ -0,0 +1,274 @@
+/* primitive arbitrary-data frontend for netcat.  0.9 960226
+   only handles one value per ascii line, but at least parses 0xNN too
+   an input line containing "%r" during "-g" generates a random byte
+
+   todo:
+        make work on msloss jus' for kicks [workin' on it...]
+
+   syntax: data -X [limit]
+   where X is one of
+        d: dump raw bytes to ascii format
+        g: generate raw bytes from ascii input
+        c: generate ??? of value -- NOTYET
+        r: generate all random bytes
+   and limit is how many bytes to generate or dump [unspecified = infinite]
+
+   *Hobbit*, started 951004 or so and randomly screwed around with since */
+
+#include <stdio.h>
+
+#ifdef MSDOS                            /* for MSC only at the moment... */
+#include <fcntl.h>
+#else /* MSDOS */
+#include <sys/file.h>
+#define HAVE_RANDOM                     /* XXX: might have to change */
+#endif /* MSDOS */
+
+static char buf_in [128];
+static char buf_raw [8192];
+static char surveysez[] = "survey sez... XXX\n";
+
+/* fgetss :
+   wrapper for fgets, that yanks trailing newlines.  Doing the work ourselves
+   instead of calling strchr/strlen/whatever */
+char * fgetss (buf, len, from)
+  char * buf;
+  size_t len;
+  FILE * from;
+{
+  register int x;
+  register char * p, * q;
+  p = fgets (buf, len, from);           /* returns ptr to buf */
+  if (! p)
+    return (NULL);
+  q = p;
+  for (x = 0; x < len; x++) {
+    *p = (*p & 0x7f);                   /* rip parity, just in case */
+    switch (*p) {
+      case '\n':
+      case '\r':
+      case '\0':
+        *p = '\0';
+        return (q);
+    } /* switch */
+    p++;
+  } /* for */
+} /* fgetss */
+
+/* randint:
+   swiped from rndb.c.  Generates an INT, you have to mask down to char. */
+int randint()
+{
+  register int q;
+  register int x;
+
+#ifndef HAVE_RANDOM
+  q = rand();
+#else
+  q = random();
+#endif
+  x = ((q >> 8) & 0xff);        /* perturb low byte using some higher bits */
+  x = q ^ x;
+  return (x);
+}
+
+main (argc, argv)
+  int argc;
+  char ** argv;
+{
+  register unsigned char * p;
+  register char * q;
+  register int x;
+  int bc = 0;
+  int limit = 0;                /* num to gen, or 0 = infinite */
+  register int xlimit;          /* running limit */
+  FILE * txt;                   /* line-by-line ascii file */
+  int raw;                      /* raw bytes fd */
+  int dumping = 0;              /* cmd flags ... */
+  int genning = 0;
+  int randing = 0;
+
+  memset (buf_in, 0, sizeof (buf_in));
+  memset (buf_raw, 0, sizeof (buf_raw));
+
+  xlimit = 1;                           /* doubles as "exit flag" */
+  bc = 1;                               /* preload, assuming "dump" */
+  x = getpid() + 687319;
+/* if your library doesnt have srandom/random, use srand/rand. [from rnd.c] */
+#ifndef HAVE_RANDOM
+  srand (time(0) + x);
+#else
+  srandom (time(0) + x);
+#endif
+
+#ifdef O_BINARY
+/* DOS stupidity */
+/* Aha: *here's* where that setmode() lib call conflict in ?BSD came from */
+  x = setmode (0, O_BINARY);            /* make stdin raw */
+  if (x < 0) {
+    fprintf (stderr, "stdin binary setmode oops: %d\n", x);
+    exit (1);
+  }
+  x = setmode (1, O_BINARY);            /* make stdout raw */
+  if (x < 0) {
+    fprintf (stderr, "stdout binary setmode oops: %d\n", x);
+    exit (1);
+  }
+#endif /* O_BINARY */
+
+  if (argv[1]) {
+    p = argv[1];                /* shit-simple single arg parser... */
+    if (*p == '-')              /* dash is optional, we'll deal */
+      p++;
+    if (*p == 'd')
+      dumping++;
+    if (*p == 'g')
+      genning++;
+    if (*p == 'r')
+      randing++;
+  } /* if argv 1 */
+
+/* optional second argument: limit # of bytes shoveled either way */
+  if (argv[2]) {
+    x = atoi (argv[2]);
+    if (x)
+      limit = x;
+    else
+      goto wrong;
+    xlimit = limit;
+  }
+
+/* Since this prog would likely best be written in assmbler, I'm gonna
+   write it *like* assembler.  So there. */
+
+  if (randing)
+    goto do_rand;
+
+nextbuf:                                /* loop sleaze */
+
+  if (dumping) {                        /* switch off to wherever */
+    if (genning)
+      goto wrong;
+    goto do_dump;
+  }
+  if (genning)
+    goto do_gen;
+wrong:
+  fprintf (stderr, surveysez);          /* if both or neither */
+  exit (1);
+
+do_gen:
+/* here if genning -- original functionality */
+  q = buf_raw;
+  bc = 0;
+/* suck up lines until eof or buf_raw is full */
+  while (1) {
+    p = fgetss (buf_in, 120, stdin);
+    if (! p)
+      break;                            /* EOF */
+/* super-primitive version first: one thingie per line */
+    if (*p == '#')                      /* comment */
+      continue;
+    if (*p == '\0')                     /* blank line */
+      continue;
+    if (*p == '%') {                    /* escape char? */
+      p++;
+      if (*p == 'r') {                  /* random byte */
+        x = randint();
+        goto stuff;
+      } /* %r */
+    } /* if "%" escape */
+    if (*p == '0')
+      if (*(p+1) == 'x')                /* 0x?? */
+        goto hex;
+    x = atoi (p);                       /* reg'lar decimal number */
+    goto stuff;
+
+hex:
+/* A 65   a 97 */
+/* xxx: use a conversion table for this or something.  Since we ripped the
+   parity bit, we only need a preset array of 128 with downconversion factors
+   loaded in *once*.   maybe look at scanf... */
+    p++; p++;                           /* point at hex-chars */
+    x = 0;
+    if ((*p > 96) && (*p < 123))        /* a-z */
+      *p = (*p - 32);                   /* this is massively clumsy */
+    if ((*p > 64) && (*p < 71))         /* A-F */
+      x = (*p - 55);
+    if ((*p > 47) && (*p < 58))         /* digits */
+      x = (*p - 48);
+    p++;
+    if (*p)                             /* another digit? */
+      x = (x << 4);                     /* shift to hi half */
+    if ((*p > 96) && (*p < 123))        /* a-z */
+      *p = (*p - 32);
+    if ((*p > 64) && (*p < 71))         /* A-F */
+      x = (x | (*p - 55));              /* lo half */
+    if ((*p > 47) && (*p < 58))         /* digits */
+      x = (x | (*p - 48));
+
+/* fall thru */
+stuff:                                  /* cvt to byte and add to buffer */
+    *q = (x & 0xff);
+    q++;
+    bc++;
+    if (limit) {
+      xlimit--;
+      if (xlimit == 0)                  /* max num reached */
+        break;
+    } /* limit */
+    if (bc >= sizeof (buf_raw))         /* buffer full */
+      break;
+  } /* while 1 */
+
+/* now in theory we have our buffer formed; shovel it out */
+  x = write (1, buf_raw, bc);
+  if (x <= 0) {
+    fprintf (stderr, "write oops: %d\n", x);
+    exit (1);
+  }
+  if (xlimit && p)
+    goto nextbuf;                       /* go get some more */
+  exit (0);
+
+do_dump:
+/* here if dumping raw stuff into an ascii file */
+/* gad, this is *so* much simpler!  can we say "don't rewrite printf"? */
+  x = read (0, buf_raw, 8192);
+  if (x <= 0)
+    exit (0);
+  q = buf_raw;
+  for ( ; x > 0; x--) {
+    p = q;
+    printf ("%-3.3d # 0x%-2.2x # ", *p, *p);
+    if ((*p > 31) && (*p < 127))
+      printf ("%c %d\n", *p, bc);
+    else
+      printf (". %d\n", bc);
+    q++;
+    bc++;
+    if (limit) {
+      xlimit--;
+      if (xlimit == 0) {
+        fflush (stdout);
+        exit (0);
+      }
+    } /* limit */
+  } /* for */
+  goto nextbuf;
+
+do_rand:
+/* here if generating all-random bytes.  Stays in this loop */
+  p = buf_raw;
+  while (1) {
+    *p = (randint() & 0xff);
+    write (1, p, 1);                    /* makes very slow! */
+    if (limit) {
+      xlimit--;
+      if (xlimit == 0)
+        break;
+    }
+  } /* while */
+  exit (0);
+
+} /* main */
diff --git a/src/usr.bin/nc/data/dns-any.d b/src/usr.bin/nc/data/dns-any.d
new file mode 100644
index 0000000000..77b014cf70
--- /dev/null
+++ b/src/usr.bin/nc/data/dns-any.d
@@ -0,0 +1,36 @@
+# dns "any for ." query, to udp 53
+# if tcp: precede with 2 bytes of len:
+# 0
+# 17
+# you should get at least *one* record back out
+
+# HEADER:
+0       # query id = 2
+2
+
+1       # flags/opcodes = query, dorecurse
+0
+
+0       # qdcount, i.e. nqueries: 1
+1
+
+0       # ancount: answers, 0
+0
+
+0       # nscount: 0
+0
+
+0       # addl records: 0
+0
+
+# end of fixed header
+
+0       # name-len: 0 for ".", lenbyte plus name-bytes otherwise
+
+0       # type: any, 255
+0xff
+
+0       # class: IN
+1
+
+# i think that's it..
diff --git a/src/usr.bin/nc/data/nfs-0.d b/src/usr.bin/nc/data/nfs-0.d
new file mode 100644
index 0000000000..0360938227
--- /dev/null
+++ b/src/usr.bin/nc/data/nfs-0.d
@@ -0,0 +1,59 @@
+# UDP NFS null-proc call; finds active NFS listeners on port 2049.
+# If you get *something* back, there's an NFS server there.
+
+000     # XID: 4 trash bytes
+001
+002
+003
+
+000     # CALL: 0
+000
+000
+000
+
+000     # RPC version: 2
+000
+000
+002
+
+000     # nfs: 100003
+001
+0x86
+0xa3
+
+000     # version: 1
+000
+000
+001
+
+000     # procedure number: 0
+000
+000
+000
+
+000     # port: junk
+000
+000
+000
+
+000     # auth trash
+000
+000
+000
+
+000     # auth trash
+000
+000
+000
+
+000     # auth trash
+000
+000
+000
+
+000     # extra auth trash?  probably not needed
+000
+000
+000
+
+# that's it!
diff --git a/src/usr.bin/nc/data/pm.d b/src/usr.bin/nc/data/pm.d
new file mode 100644
index 0000000000..fe327693a9
--- /dev/null
+++ b/src/usr.bin/nc/data/pm.d
@@ -0,0 +1,8 @@
+# obligatory duplicate of dr delete's Livingston portmaster crash, aka
+# telnet break.  Fire into its telnet listener.  An *old* bug by now, but
+# consider the small window one might obtain from a slightly out-of-rev PM
+# used as a firewall, that starts routing IP traffic BEFORE its filter sets
+# are fully loaded...
+
+255 # 0xff # . 1
+243 # 0xf3 # . 2
diff --git a/src/usr.bin/nc/data/pmap-dump.d b/src/usr.bin/nc/data/pmap-dump.d
new file mode 100644
index 0000000000..bc6b63277d
--- /dev/null
+++ b/src/usr.bin/nc/data/pmap-dump.d
@@ -0,0 +1,60 @@
+# portmap dump request: like "rpcinfo -p" but via UDP instead
+# send to UDP 111 and hope it's not a logging portmapper!
+# split into longwords, since rpc apparently only deals with them
+
+001 # 0x01 # .  # XID: 4 trash bytes
+002 # 0x02 # .
+003 # 0x03 # .
+004 # 0x04 # .
+
+000 # 0x00 # .  # MSG: int 0=call, 1=reply
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # pmap call body: rpc version=2
+000 # 0x00 # .
+000 # 0x00 # .
+002 # 0x02 # .
+
+000 # 0x00 # .  # pmap call body: prog=PMAP, 100000
+001 # 0x01 # .
+134 # 0x86 # .
+160 # 0xa0 # .
+
+000 # 0x00 # .  # pmap call body: progversion=2
+000 # 0x00 # .
+000 # 0x00 # .
+002 # 0x02 # .
+
+000 # 0x00 # .  # pmap call body: proc=DUMP, 4
+000 # 0x00 # .
+000 # 0x00 # .
+004 # 0x04 # .
+
+# with AUTH_NONE, there are 4 zero integers [16 bytes] here
+
+000 # 0x00 # .  # auth junk: cb_cred: auth_unix = 1; NONE = 0
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # auth junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # auth junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # auth junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+# The reply you get back contains your XID, int 1 if "accepted", and
+# a whole mess of gobbledygook containing program numbers, versions,
+# and ports that rpcinfo knows how to decode.  For the moment, you get
+# to wade through it yourself...
diff --git a/src/usr.bin/nc/data/pmap-mnt.d b/src/usr.bin/nc/data/pmap-mnt.d
new file mode 100644
index 0000000000..00588ba41f
--- /dev/null
+++ b/src/usr.bin/nc/data/pmap-mnt.d
@@ -0,0 +1,78 @@
+# portmap request for mountd [or whatever; see where prog=MOUNT]
+# send to UDP 111 and hope it's not a logging portmapper!
+# split into longwords, since rpc apparently only deals with them
+
+001 # 0x01 # .  # XID: 4 trash bytes
+002 # 0x02 # .
+003 # 0x03 # .
+004 # 0x04 # .
+
+000 # 0x00 # .  # MSG: int 0=call, 1=reply
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # pmap call body: rpc version=2
+000 # 0x00 # .
+000 # 0x00 # .
+002 # 0x02 # .
+
+000 # 0x00 # .  # pmap call body: prog=PMAP, 100000
+001 # 0x01 # .
+134 # 0x86 # .
+160 # 0xa0 # .
+
+000 # 0x00 # .  # pmap call body: progversion=2
+000 # 0x00 # .
+000 # 0x00 # .
+002 # 0x02 # .
+
+000 # 0x00 # .  # pmap call body: proc=GETPORT, 3
+000 # 0x00 # .
+000 # 0x00 # .
+003 # 0x03 # .
+
+# with AUTH_NONE, there are 4 zero integers [16 bytes] here
+
+000 # 0x00 # .  # auth junk: cb_cred: auth_unix = 1; NONE = 0
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # auth junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # auth junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # auth junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+000 # 0x00 # .  # prog=MOUNT, 100005
+001 # 0x01 # .
+134 # 0x86 # .
+165 # 0xa5 # .
+
+000 # 0x00 # .  # progversion=1
+000 # 0x00 # .
+000 # 0x00 # .
+001 # 0x01 # .
+
+000 # 0x00 # .  # protocol=udp, 17
+000 # 0x00 # .
+000 # 0x00 # .
+017 # 0x11 # .
+
+000 # 0x00 # .  # proc num = junk
+000 # 0x00 # .
+000 # 0x00 # .
+000 # 0x00 # .
+
+# The reply you get back contains your XID, int 1 if "accepted", and
+# mountd's port number at the end or 0 if not registered.
diff --git a/src/usr.bin/nc/data/rip.d b/src/usr.bin/nc/data/rip.d
new file mode 100644
index 0000000000..da505e2143
--- /dev/null
+++ b/src/usr.bin/nc/data/rip.d
@@ -0,0 +1,52 @@
+# struct netinfo {
+#       struct  sockaddr rip_dst;       /* destination net/host */
+#       int     rip_metric;             /* cost of route */
+# };
+# struct rip {
+#       u_char  rip_cmd;                /* request/response */
+#       u_char  rip_vers;               /* protocol version # */
+#       u_char  rip_res1[2];            /* pad to 32-bit boundary */
+#       union {
+#               struct  netinfo ru_nets[1];     /* variable length... */
+#               char    ru_tracefile[1];        /* ditto ... */
+#       } ripun;
+#define rip_nets        ripun.ru_nets
+#define rip_tracefile   ripun.ru_tracefile
+#define RIPCMD_REQUEST          1       /* want info */
+#define RIPCMD_RESPONSE         2       /* responding to request */
+#define RIPCMD_TRACEON          3       /* turn tracing on */
+#define RIPCMD_TRACEOFF         4       /* turn it off */
+#define HOPCNT_INFINITY         16      /* per Xerox NS */
+#define MAXPACKETSIZE           512     /* max broadcast size */
+
+### RIP packet redux
+### UDP send FROM clued-rtr/520 to target/520
+2       # RIPCMD_RESPONSE
+1       # version
+0       # padding
+0
+
+# sockaddr-plus-metric  structs begin, as many as necessary...
+0       # len
+2       # AF_INET
+0       # port
+0
+# addr bytes:
+X
+Y
+Z
+Q
+0       # filler, out to 16 bytes [sizeof (sockaddr)] ...
+0
+0
+0
+0
+0
+0
+0
+0       # metric: net-order integer
+0
+0
+1
+
+## that's it
diff --git a/src/usr.bin/nc/data/rservice.c b/src/usr.bin/nc/data/rservice.c
new file mode 100644
index 0000000000..1085d9cb78
--- /dev/null
+++ b/src/usr.bin/nc/data/rservice.c
@@ -0,0 +1,68 @@
+/* generate ^@string1^@string2^@cmd^@ input to netcat, for scripting up
+   rsh/rexec attacks.  Needs to be a prog because shells strip out nulls.
+
+   args:
+        locuser remuser [cmd]
+        remuser passwd [cmd]
+
+   cmd defaults to "pwd".
+
+   ... whatever.  _H*/
+
+#include <stdio.h>
+
+/* change if you like; "id" is a good one for figuring out if you won too */
+static char cmd[] = "pwd";
+
+static char buf [256];
+
+main(argc, argv)
+  int argc;
+  char * argv[];
+{
+  register int x;
+  register int y;
+  char * p;
+  char * q;
+
+  p = buf;
+  memset (buf, 0, 256);
+
+  p++;                          /* first null */
+  y = 1;
+
+  if (! argv[1])
+    goto wrong;
+  x = strlen (argv[1]);
+  memcpy (p, argv[1], x);       /* first arg plus another null */
+  x++;
+  p += x;
+  y += x;
+
+  if (! argv[2])
+    goto wrong;
+  x = strlen (argv[2]);
+  memcpy (p, argv[2], x);       /* second arg plus null */
+  x++;
+  p += x;
+  y += x;
+
+  q = cmd;
+  if (argv[3])
+    q = argv[3];
+  x = strlen (q);               /* not checked -- bfd */
+  memcpy (p, q, x);             /* the command, plus final null */
+  x++;
+  p += x;
+  y += x;
+
+  memcpy (p, "\n", 1);          /* and a newline, so it goes */
+  y++;
+
+  write (1, buf, y);            /* zot! */
+  exit (0);
+
+wrong:
+  fprintf (stderr, "wrong!  needs 2 or more args.\n");
+  exit (1);
+}
diff --git a/src/usr.bin/nc/data/showmount.d b/src/usr.bin/nc/data/showmount.d
new file mode 100644
index 0000000000..499794bc8a
--- /dev/null
+++ b/src/usr.bin/nc/data/showmount.d
@@ -0,0 +1,63 @@
+# UDP mountd call.  Use as input to find mount daemons and avoid portmap.
+# Useful proc numbers are 2, 5, and 6.
+# UDP-scan around between 600-800 to find most mount daemons.
+# Using this with "2", plugged into "nc -u -v -w 2 victim X-Y" will
+# directly scan *and* dump the current exports when mountd is hit.
+# combine stdout *and* stderr thru "strings" or something to clean it up
+
+000     # XID: 4 trash bytes
+001
+002
+003
+
+000     # CALL: 0
+000
+000
+000
+
+000     # RPC version: 2
+000
+000
+002
+
+000     # mount: 100005
+001
+0x86
+0xa5
+
+000     # mount version: 1
+000
+000
+001
+
+000     # procedure number -- put what you need here:
+000     #       2 = dump  [showmount -e]
+000     #       5 = exportlist [showmount -a]
+xxx     # "sed s/xxx/$1/ | data -g | nc ..."  or some such...
+
+000     # port: junk
+000
+000
+000
+
+000     # auth trash
+000
+000
+000
+
+000     # auth trash
+000
+000
+000
+
+000     # auth trash
+000
+000
+000
+
+000     # extra auth trash?  probably not needed
+000
+000
+000
+
+# that's it!
diff --git a/src/usr.bin/nc/data/xor.c b/src/usr.bin/nc/data/xor.c
new file mode 100644
index 0000000000..9feead0cba
--- /dev/null
+++ b/src/usr.bin/nc/data/xor.c
@@ -0,0 +1,92 @@
+/* Generic xor handler.
+
+   With no args, xors stdin against 0xFF to stdout.  A single argument is a
+   file to read xor-bytes out of.  Any zero in the xor-bytes array is treated
+   as the end; if you need to xor against a string that *includes* zeros,
+   you're on your own.
+
+   The indirect file can be generated easily with data.c.
+
+   Written because there are so many lame schemes for "masking" plaintext
+   passwords and the like floating around, and it's handy to just run an
+   obscure binary-format configuration file through this and look for strings.
+
+   *Hobbit*, 960208 */
+
+#include <stdio.h>
+#include <fcntl.h>
+
+char buf[8192];
+char bytes[256];
+char * py;
+
+/* do the xor, in place.  Uses global ptr "py" to maintain "bytes" state */
+xorb (buf, len)
+  char * buf;
+  int len;
+{
+  register int x;
+  register char * pb;
+
+  pb = buf;
+  x = len;
+  while (x > 0) {
+    *pb = (*pb ^ *py);
+    pb++;
+    py++;
+    if (! *py)
+      py = bytes;
+    x--;
+  }
+} /* xorb */
+
+/* blah */
+main (argc, argv)
+  int argc;
+  char ** argv;
+{
+  register int x = 0;
+  register int y;
+
+/* manually preload; xor-with-0xFF is all too common */
+  memset (bytes, 0, sizeof (bytes));
+  bytes[0] = 0xff;
+
+/* if file named in any arg, reload from that */
+#ifdef O_BINARY                         /* DOS shit... */
+  x = setmode (0, O_BINARY);            /* make stdin raw */
+  if (x < 0) {
+    fprintf (stderr, "stdin binary setmode oops: %d\n", x);
+    exit (1);
+  }
+  x = setmode (1, O_BINARY);            /* make stdout raw */
+  if (x < 0) {
+    fprintf (stderr, "stdout binary setmode oops: %d\n", x);
+    exit (1);
+  }
+#endif /* O_BINARY */
+  
+  if (argv[1])
+#ifdef O_BINARY
+    x = open (argv[1], O_RDONLY | O_BINARY);
+#else
+    x = open (argv[1], O_RDONLY);
+#endif
+  if (x > 0) {
+    read (x, bytes, 250);               /* nothin' fancy here */
+    close (x);
+  }
+  py = bytes;
+  x = 1;
+  while (x > 0) {
+    x = read (0, buf, sizeof (buf));
+    if (x <= 0)
+      break;
+    xorb (buf, x);
+    y = write (1, buf, x);
+    if (y <= 0)
+      exit (1);
+  }
+  exit (0);
+}
+
diff --git a/src/usr.bin/nc/generic.h b/src/usr.bin/nc/generic.h
new file mode 100644
index 0000000000..b3dd5f5dc6
--- /dev/null
+++ b/src/usr.bin/nc/generic.h
@@ -0,0 +1,377 @@
+/* generic.h -- anything you don't #undef at the end remains in effect.
+   The ONLY things that go in here are generic indicator flags; it's up
+   to your programs to declare and call things based on those flags.
+
+   You should only need to make changes via a minimal system-specific section
+   at the end of this file.  To build a new section, rip through this and
+   check everything it mentions on your platform, and #undef that which needs
+   it.  If you generate a system-specific section you didn't find in here,
+   please mail me a copy so I can update the "master".
+
+   I realize I'm probably inventing another pseudo-standard here, but
+   goddamnit, everybody ELSE has already, and I can't include all of their
+   hairball schemes too.  HAVE_xx conforms to the gnu/autoconf usage and
+   seems to be the most common format.  In fact, I dug a lot of these out
+   of autoconf and tried to common them all together using "stupidh" to
+   collect data from platforms.
+
+   In disgust...  _H*  940910, 941115, 950511.  Pseudo-version: 1.3
+
+   Updated 951104 with many patches from netcat feedback, and properly
+   closed a lot of slop in open-ended comments: version 1.4
+   960217 + nextstep: version 1.5
+*/
+
+#ifndef GENERIC_H               /* only run through this once */
+#define GENERIC_H
+
+/* =============================== */
+/* System calls, lib routines, etc */
+/* =============================== */
+
+/* How does your system declare malloc, void or char?  Usually void, but go
+   ask the SunOS people why they had to be different... */
+#define VOID_MALLOC
+
+/* notably from fwtk/firewall.h: posix locking? */
+#define HAVE_FLOCK              /* otherwise it's lockf() */
+
+/* if you don't have setsid(), you might have setpgrp(). */
+#define HAVE_SETSID
+
+/* random() is generally considered better than rand() */
+#define HAVE_RANDOM
+
+/* the srand48/lrand48/etc family is s'posedly even better */
+#define HAVE_RAND48
+/* bmc@telebase and others have suggested these macros if a box *does* have
+   rand48.  Will consider for later if we're doing something that really
+   requires stronger random numbers, but netcat and such certainly doesn't.
+#define srandom(seed) srand48((long) seed)
+#define random()      lrand48() */
+
+/* if your machine doesn't have lstat(), it should have stat() [dos...] */
+#define HAVE_LSTAT
+
+/* different kinds of term ioctls.  How to recognize them, very roughly:
+   sysv/POSIX_ME_HARDER:  termio[s].h, struct termio[s], tty.c_*[]
+   bsd/old stuff:  sgtty.h, ioctl(TIOCSETP), sgttyb.sg_*, tchars.t_*  */
+#define HAVE_TERMIOS
+
+/* dbm vs ndbm */
+#define HAVE_NDBM
+
+/* extended utmp/wtmp stuff.  MOST machines still do NOT have this SV-ism */
+#define UTMPX
+
+/* some systems have nice() which takes *relative* values... [resource.h] */
+#define HAVE_SETPRIORITY
+
+/* a sysvism, I think, but ... */
+#define HAVE_SYSINFO
+
+/* ============= */
+/* Include files */
+/* ============= */
+
+/* Presence of these can be determined via a script that sniffs them
+   out if you aren't sure.  See "stupidh"... */
+
+/* stdlib comes with most modern compilers, but ya never know */
+#define HAVE_STDLIB_H
+
+/* not on a DOS box! */
+#define HAVE_UNISTD_H
+
+/* stdarg is a weird one */
+#define HAVE_STDARG_H
+
+/* dir.h or maybe ndir.h otherwise. */
+#define HAVE_DIRENT_H
+
+/* string or strings */
+#define HAVE_STRINGS_H
+
+/* if you don't have lastlog.h, what you want might be in login.h */
+#define HAVE_LASTLOG_H
+
+/* predefines for _PATH_various */
+#define HAVE_PATHS_H
+
+/* some SV-flavors break select stuff out separately */
+#define HAVE_SELECT_H
+
+/* assorted others */
+#define HAVE_PARAM_H            /* in sys/ */
+#define HAVE_SYSMACROS_H        /* in sys/ */
+#define HAVE_TTYENT_H           /* securetty et al */
+
+/* ==================== */
+
+/* Still maybe have to do something about the following, if it's even
+   worth it.  I just grepped a lot of these out of various code, without
+   looking them up yet:
+
+#define HAVE_EINPROGRESS
+#define HAVE_F_SETOWN
+HAVE_FILIO_H ... fionbio, fiosetown, etc... will need for hairier
+  select loops.
+#define HAVE_SETENV ... now *there's* a hairy one; **environ is portable
+#define BIG_ENDIAN/little_endian ... *please* try to avoid this stupidity
+   and LSBFIRST/MSBFIRST
+#define HAVE_GETUSERSHELL ... you could always pull it out of getpwent()
+#define HAVE_SETE[UG]ID ... lib or syscall, it varies on diff platforms
+#define HAVE_STRCHR ... should actually be handled by string/strings
+#define HAVE_PSTAT
+#define HAVE_ST_BLKSIZE ... a stat() thing?
+#define HAVE_IP_TOS
+#define HAVE_STRFTIME ... screw this, we'll just INCLUDE one for lame
+   old boxes that don't have it [sunos 3.x, early 4.x?]
+#define HAVE_VFPRINTF
+#define HAVE_SHADOW_PASSWD  ... in its multitudinous schemes?? ... how
+   about sumpin' like #define SHADOW_PASSWD_TYPE ... could get grody.
+   ... looks like sysv /etc/shadow, getspent() family is common.
+#define SIG*  ... what a swamp, punt for now; should all be in signal.h
+#define HAVE_STRCSPN  ... see larry wall's comment in the fwtk regex code
+#define ULTRIX_AUTH  ... bwahaha.
+#define HAVE_YP  or NIS or whatever you wanna call it this week
+randomness about VARARGS??
+--- later stuff to be considered ---
+#define UINT4 ... u-int on alpha/osf, i.e. __alpha/__osf__, ulong elsewhere?
+   dont name it that, though, it'll conflict with extant .h files like md5
+randomness about machine/endian.h, machine/inline.h -- bsdi, net/2
+randomness about _PATH_WTMP vs WTMP_FILE and where they even live!!
+#define HAVE_SYS_ERRLIST ... whether it's in stdio.h or not [bsd 4.4]
+--- still more stuff
+#define HAVE_SETENV
+#define _PATH_UTMP vs UTMP_FILE, a la deslogind?!
+#define HAVE_DAEMON
+#define HAVE_INETADDR  [vixie bind?]
+lseek: SEEK_SET vs L_SET and associated lossage [epi-notes, old 386Mach]
+bsdi: ioctl_compat.h ?
+--- takin' some ifdefs from CNS krb:
+F_GETOWN/F_SETOWN
+CRAY: long = 8 bytes, etc  [class with alpha?]
+CGETENT
+SIGINFO
+SIGTSTP SIGTTOU SIGWINCH
+SPX?
+SYSV_TERMIO -- covered elsewhere, I hope
+TIOCEXT TIOCFLUSH TIOC[GS]WINSIZ 
+NEWINIT: something about init cleaning up dead login processes [telnet?]
+PARENT_DOES_UTMP, too  [telnet]
+VDISCARD
+VEOL/VEOL2/VLNEXT VREPRINT -- termios stuff?, and related...
+STREAMSPTY/STREAMSPTYEM
+AF_INET/AF_UNSPEC, PF_*
+ECHOCTL/ECHOKE
+F_ULOCK [?!]
+setpgrp/getpgrp() ONEARG business..
+HAVE_ALLOCA
+HAVE_GETUTENT
+HAVE_SYS_SELECT_H  [irix!]
+HAVE_DIRENT  [old 386mach has *direct.h*!]
+HAVE_SIGSET
+HAVE_VFORK_H and HAVE_VFORK
+HAVE_VHANGUP
+HAVE_VSPRINTF
+HAVE_IPTOS_*
+HAVE_STRCASECMP, STRNCASECMP
+HAVE_SYS_FCNTL_H
+HAVE_SYS_TIME_H
+HAVE_UTIMES
+NOTTYENT [?]
+HAVE_FCHMOD
+HAVE_GETUSERSHELL
+HAVE_SIGCONTEXT  [stack hair, very machine-specific]
+YYLINENO?
+POSIX_SIGNALS
+POSIX_TERMIOS
+SETPROCTITLE -- breaks some places, like fbsd sendmail
+SIG* -- actual signal names?  some are missing
+SIOCGIFCONF
+SO_BROADCAST
+SHMEM  [krb tickets]
+VARARGS, or HAVE_VARARGS
+CBAUD
+... and B300, B9600, etc etc
+HAVE_BZERO  vs  memset/memcpy
+HAVE_SETVBUF
+HAVE_STRDUP
+HAVE_GETENV
+HAVE_STRSAVE
+HAVE_STBLKSIZE  [stat?]
+HAVE_STREAM_H -- in sys/, ref sendmail 8.7 for IP_SRCROUTE
+FCHMOD
+INITGROUPS -- most machines seem to *have*
+SETREUID
+SNPRINTF
+SETPGRP semantics bsd vs. sys5 style
+
+There's also the issue about WHERE various .h files live, sys/ or otherwise.
+There's a BIG swamp lurking where network code of any sort lives.
+*/
+
+/* ======================== */
+/* System-specific sections */
+/* ======================== */
+
+/* By turning OFF various bits of the above,  you can customize for
+   a given platform.  Yes, we're ignoring the stock compiler predefines
+   and using our own plugged in via the Makefile. */
+
+/* DOS boxes, with MSC; you may need to adapt to a different compiler. */
+/* looks like later ones *do* have dirent.h, for example */
+#ifdef MSDOS
+#undef HAVE_FLOCK
+#undef HAVE_RANDOM
+#undef HAVE_LSTAT
+#undef HAVE_TERMIOS
+#undef UTMPX
+#undef HAVE_SYSINFO
+#undef HAVE_UNISTD_H
+#undef HAVE_DIRENT_H    /* unless you have the k00l little wrapper from L5!! */
+#undef HAVE_STRINGS_H
+#undef HAVE_LASTLOG_H
+#undef HAVE_PATHS_H
+#undef HAVE_PARAM_H
+#undef HAVE_SYSMACROS_H
+#undef HAVE_SELECT_H
+#undef HAVE_TTYENT_H
+#endif /* MSDOS */
+
+/* buglix 4.x; dunno about 3.x on down.  should be bsd4.2 */
+#ifdef ULTRIX
+#undef UTMPX
+#undef HAVE_PATHS_H
+#undef HAVE_SYSMACROS_H
+#undef HAVE_SELECT_H
+#endif /* buglix */
+
+/* some of this might still be broken on older sunoses */
+#ifdef SUNOS
+#undef VOID_MALLOC
+#undef UTMPX
+#undef HAVE_PATHS_H
+#undef HAVE_SELECT_H
+#endif /* sunos */
+
+/* "contact your vendor for a fix" */
+#ifdef SOLARIS
+/* has UTMPX */
+#undef HAVE_RANDOM
+#undef HAVE_SETPRIORITY
+#undef HAVE_STRINGS_H   /* this is genuinely the case, go figure */
+#undef HAVE_PATHS_H
+#undef HAVE_SELECT_H
+#undef HAVE_TTYENT_H
+#endif /* SOLARIS */
+
+/* whatever aix variant MIT had at the time; 3.2.x?? */
+#ifdef AIX
+#undef UTMPX
+#undef HAVE_LASTLOG_H
+#define HAVE_LOGIN_H    /* "special", in the educational sense */
+#endif /* aix */
+
+/* linux, which is trying as desperately as the gnu folks can to be
+   POSIXLY_CORRECT.  I think I'm gonna hurl... */
+#ifdef LINUX
+#undef UTMPX
+#undef HAVE_SYSINFO
+#undef HAVE_SELECT_H
+#undef HAVE_TTYENT_H
+#endif /* linux */
+
+/* irix 5.x; may not be correct for earlier ones */
+#ifdef IRIX
+/* wow, does irix really have everything?! */
+#endif /* irix */
+
+/* osf on alphas */
+#ifdef OSF
+#undef UTMPX
+#undef HAVE_SELECT_H
+#endif /* osf */
+
+/* they's some FUCKED UP paths in this one! */
+#ifdef FREEBSD
+#undef UTMPX
+#undef HAVE_SYSINFO
+#undef HAVE_LASTLOG_H
+#undef HAVE_SYSMACROS_H
+#undef HAVE_SELECT_H    /* actually a lie, but only for kernel */
+#endif /* freebsd */
+
+/* Originally from the sidewinder site, of all places, but subsequently
+   checked further under a more normal bsdi 2.0 */
+#ifdef BSDI
+#undef UTMPX
+#undef HAVE_LASTLOG_H
+#undef HAVE_SYSMACROS_H
+/* and their malloc.h was in sys/ ?! */
+#undef HAVE_SELECT_H
+#endif /* bsdi */
+
+/* netbsd/44lite, jives with amiga-netbsd from cactus */
+#ifdef NETBSD
+#undef UTMPX
+#undef HAVE_SYSINFO
+#undef HAVE_LASTLOG_H
+#undef HAVE_SELECT_H
+#endif /* netbsd */
+
+/* Hpux 9.0x, from BBN and various patches sent in */
+#ifdef HPUX
+#undef HAVE_RANDOM      /* but *does* have ?rand48 -- need to consider.. */
+#undef HAVE_UTMPX
+#undef HAVE_LASTLOG_H   /* has utmp/wtmp/btmp nonsense, and pututline() */
+#undef HAVE_PATHS_H
+#undef HAVE_SELECT_H
+#undef HAVE_TTYENT_H
+#endif /* hockeypux */
+
+/* Unixware [a loose definition of "unix", to be sure], 1.1.2 [at least]
+   from Brian Clapper.  He wasn't sure about 2.0... */
+#ifdef UNIXWARE
+/* has UTMPX */
+#undef HAVE_SETPRIORITY
+/* NOTE: UnixWare does provide the BSD stuff, in "/usr/ucbinclude" (headers)
+   and "/usr/ucblib" (libraries).  However, I've run into problems linking
+   stuff out of that version of the C library, when objects are also coming
+   out of the "regular" C library.  My advice: Avoid the BSD compatibility
+   stuff wherever possible.  Brian Clapper <bmc@telebase.com> */
+#undef HAVE_STRINGS_H
+#undef HAVE_PATHS_H
+#undef HAVE_TTYENT_H
+#endif /* UNIXWARE */
+
+/* A/UX 3.1.x from darieb@sandia.gov */
+#ifdef AUX
+#undef HAVE_RANDOM
+#undef HAVE_SELECT_H    /* xxx: untested */
+#endif /* a/ux */
+
+/* NeXTSTEP 3.2 motorola mudge@l0pht.com xxx should also work with
+   white hardware and Sparc/HPPA. Should work with 3.3 too as it's
+   4.3 / 4.4 bsd wrapped around mach */
+#ifdef NEXT
+#undef UTMPX
+#undef HAVE_SELECT_X
+#endif /* NeXTSTEP 3.2 motorola */
+
+/* Make some "generic" assumptions if all else fails */
+#ifdef GENERIC
+#undef HAVE_FLOCK
+#if defined(SYSV) && (SYSV < 4)  /* TW leftover: old SV doesnt have symlinks */
+#undef HAVE_LSTAT
+#endif /* old SYSV */
+#undef HAVE_TERMIOS
+#undef UTMPX
+#undef HAVE_PATHS_H
+#undef HAVE_SELECT_H
+#endif /* generic */
+
+/* ================ */
+#endif /* GENERIC_H */
+
diff --git a/src/usr.bin/nc/nc.1 b/src/usr.bin/nc/nc.1
new file mode 100644
index 0000000000..8d87051c73
--- /dev/null
+++ b/src/usr.bin/nc/nc.1
@@ -0,0 +1,215 @@
+.\"     $OpenBSD: nc.1,v 1.5 1998/09/28 06:57:35 millert Exp $
+.\"
+.\" Copyright (c) 1996 David Sacerdote
+.\" 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. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd August 1, 1996
+.Dt NC 1
+.Os
+.Sh NAME
+.Nm nc
+.Nd "arbitrary TCP and UDP connections and listens"
+.Sh SYNOPSIS
+.Nm nc
+.Op Fl e Ar command
+.Op Fl g Ar intermediates
+.Op Fl G Ar hopcount
+.Op Fl i Ar interval
+.Op Fl lnrtuvz
+.Op Fl o Ar filename
+.Op Fl p Ar source port 
+.Op Fl s Ar ip address
+.Op Fl w Ar timeout 
+.Op Ar hostname
+.Op Ar port[s...]
+.Sh DESCRIPTION
+The
+.Nm nc
+(or
+.Nm netcat )
+utility is used for just about anything under the sun
+involving TCP or UDP.  It can open TCP connections, send UDP packets,
+listen on arbitrary TCP and UDP ports, do port scanning, and source
+routing.  Unlike
+.Xr telnet 1 ,
+.Nm nc
+scripts nicely, and separates error messages onto standard error instead
+of sending them to standard output, as 
+.Xr telnet 1  
+does with some.  
+.Pp
+Destination ports can be single integers, names as listed in
+.Xr services 5 ,
+or ranges.  Ranges are in the form nn-mm, and several separate ports and/or
+ranges may be specified on the command line.
+.Pp
+Common uses include:
+.Bl -bullet 
+.It
+simple TCP proxies
+.It
+shell\-script based HTTP clients and servers
+.It
+network daemon testing
+.It
+source routing based connectivity testing
+.It
+and much, much more
+.El
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl e Ar command
+Execute the specified command, using data from the network for stdin,
+and sending stdout and stderr to the network.  This option is only present if
+.Nm nc
+was compiled with the GAPING_SECURITY_HOLE compile time option, since it
+allows users to make arbitrary programs available to anyone on the network.
+.It Fl g Ar intermediate-host
+Specifies a hop along a loose source routed path.  Can be used more than
+once to build a chain of hop points.
+.It Fl G Ar pointer
+Positions the "hop counter" within the list of machines in the path of
+a source routed packet.  Must be a multiple of 4.
+.It Fl i Ar seconds
+Specifies a delay time interval between lines of text sent and received.
+Also causes a delay time between connections to multiple ports.
+.It Fl l
+Is used to specify that
+.Nm nc
+should listen for an incoming connection, rather than initiate a
+connection to a remote host.  Any hostname/IP address and port arguments
+restrict the source of inbound connections to only that address and
+source port.
+.It Fl n
+Do not do DNS lookups on any of the specified addresses or hostnames, or
+names of port numbers from /etc/services.
+.It Fl o Ar filename
+Create a hexadecimal log of data transferred in the specified file.
+Each line begins with ``<'' or ``>''.  ``<'' means "from the net" and ``>''
+means "to the net".
+.It Fl p Ar port
+Specifies the source port
+.Nm nc
+should use, subject to privilege restrictions and availability.
+.It Fl r
+Specifies that source and/or destination ports should be chosen semi-randomly
+instead of sequentially within a range or in the order that the
+system assigns.
+.It Fl s Ar hostname/ip-address
+Specifies the IP of the interface which is used to send the packets.
+On some platforms, this can be used for UDP spoofing by using
+.Xr ifconfig 8
+to bring up a dummy interface with the desired source IP address.
+.It Fl t
+Causes
+.Nm nc
+to send RFC854 DON'T and WON'T responses to RFC854 DO
+and WILL requests.  This makes it possible to use
+.Nm nc
+to script telnet sessions.  The presence of this option can be
+enabled or disabled as a compile-time option.
+.It Fl u
+Use UDP instead of TCP. 
+On most platforms,
+.Nm nc
+will behave as if a connection is established until it receives an
+ICMP packet indicating that there is no program listening to what it
+sends.
+.It Fl v
+Verbose.  Cause
+.Nm nc
+to display connection information.  Using
+.Fl v
+more than once will cause
+.Nm nc
+to become even more verbose.
+.It Fl w Ar timeout
+Specifies the number of seconds
+.Nm nc
+should wait before deciding that
+an attempt to establish a connection is hopeless.
+Also used to specify how long to wait for more network data after standard
+input closes.
+.It Fl z
+Specifies that
+.Nm nc
+should just scan for listening
+daemons, without sending any data to them.  Diagnostic messages about refused
+connections will not be
+displayed unless
+.Fl v
+is specified twice.
+.Sh EXAMPLES
+.Bl -tag -width x
+.It Li "nc"
+Wait for the user to type what would normally be command-line
+arguments in at stdin.
+.It Li "nc example.host 42"
+Open a TCP connection to port 42 of example.host.  If the connection
+fails, do not display any error messages, but simply exit.
+.It Li "nc -p 31337 example.host 42"
+Open a TCP connection to port 42 of example.host, and use port 31337
+as the source port.
+.It Li "nc -w 5 example.host 42"
+Open a TCP connection to port 42 of example.host, and time out after
+five seconds while attempting to connect.
+.It Li "nc -u example.host 53"
+Send any data from stdin
+to UDP port 53 of example.host, and display any data returned.
+.It Li "nc -s 10.1.2.3 example.host 42"
+Open a TCP connection to port 42 of example.host using 10.1.2.3 as the
+IP for the local end of the connection.
+.It Li "nc -v example.host 42"
+Open a TCP connection to port 42 of example.host, displaying some
+diagnostic messages on stderr.
+.It Li "nc -v -v example.host 42"
+Open a TCP connection to port 42 of example.host, displaying all
+diagnostic messages on stderr.
+.It Li "nc -v -z example.host 20-30"
+Attempt to open TCP connections to ports 20 through 30 of
+example.host, and report which ones
+.Nm nc
+was able to connect to.
+.It Li "nc -v -u -z -w 3 example.host 20-30"
+Send UDP packets to ports 20-30 of example.host, and report which ones
+did not respond with an ICMP packet after three seconds.
+.It Li "nc -l -p 3000"
+Listen on TCP port 3000, and once there is a connection, send stdin to
+the remote host, and send data from the remote host to stdout.
+.It Li "echo foobar | nc example.host 1000"
+Connect to port 1000 of example.host, send the string "foobar"
+followed by a newline, and move data from port 1000 of example.host to
+stdout until example.host closes the connection.
+.El
+.Sh SEE ALSO
+.Xr cat 1 ,
+.Xr telnet 1
+.Pp
+The
+.Nm netcat
+.Pa README .
+.Sh AUTHOR
+*Hobbit*  [hobbit@avian.org]
diff --git a/src/usr.bin/nc/netcat.blurb b/src/usr.bin/nc/netcat.blurb
new file mode 100644
index 0000000000..2c540ad9dc
--- /dev/null
+++ b/src/usr.bin/nc/netcat.blurb
@@ -0,0 +1,61 @@
+Netcat 1.10 is an updated release of Netcat, a simple Unix utility which reads
+and writes data across network connections using TCP or UDP protocol.  It is
+designed to be a reliable "back-end" tool that can be used directly or easily
+driven by other programs and scripts.  At the same time it is a feature-rich
+network debugging and exploration tool, since it can create almost any kind of
+connection you would need and has several interesting built-in capabilities.
+
+Some of netcat's major features are:
+
+        Outbound or inbound connections, TCP or UDP, to or from any ports
+        Full DNS forward/reverse checking, with appropriate warnings
+        Ability to use any local source port
+        Ability to use any locally-configured network source address
+        Built-in port-scanning capabilities, with randomizer
+        Built-in loose source-routing capability
+        Can read command line arguments from standard input
+        Slow-send mode, one line every N seconds
+        Hex dump of transmitted and received data
+        Optional ability to let another program service established connections
+        Optional telnet-options responder
+
+A very short list of potential uses:
+
+        Script backends
+        Scanning ports and inventorying services, automated probes
+        Backup handlers
+        File transfers
+        Server testing, simulation, debugging, and hijacking
+        Firewall testing
+        Proxy gatewaying
+        Network performance testing
+        Address spoofing tests
+        Protecting X servers
+        1001 other uses you'll likely come up with
+
+Changes between the 1.00 release and this release:
+
+        Better portability -- updated generic.h and Makefile [thanx folks!]
+        Indication of local-end interface address on inbound connections
+        That's *Dave* Borman's telnet, not Paul Borman...
+        Better indication of DNS errors
+        Total byte counts printed if -v -v is used
+        A bunch of front-end driver companion programs and scripts
+        Better handling of stdin arguments-plus-data
+        Hex-dump feature
+        Telnet responder
+        Program exec works inbound or outbound now
+
+Netcat and the associated package is a product of Avian Research, and is freely
+available in full source form with no restrictions save an obligation to give
+credit where due.  Get it via anonymous FTP at avian.org:/src/hacks/nc110.tgz
+which is a gzipped tar file and not to be confused with its version 1.00
+precursor, nc100.tgz.  Other distribution formats can be accomodated upon
+request.  Netcat is also mirrored at the following [faster] sites:
+
+        zippy.telcom.arizona.edu:/pub/mirrors/avian.org/hacks/nc110.tgz
+        ftp.sterling.com:/mirrors/avian.org/src/hacks/nc110.tgz
+        coast.cs.purdue.edu:/pub/tools/unix/netcat/nc110.tgz
+        ftp.rge.com:/pub/security/coast/mirrors/avian.org/netcat/nc110.tgz
+
+_H* 960320
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
new file mode 100644
index 0000000000..bb0b30749d
--- /dev/null
+++ b/src/usr.bin/nc/netcat.c
@@ -0,0 +1,1670 @@
+/* Netcat 1.10 RELEASE 960320
+
+   A damn useful little "backend" utility begun 950915 or thereabouts,
+   as *Hobbit*'s first real stab at some sockets programming.  Something that
+   should have and indeed may have existed ten years ago, but never became a
+   standard Unix utility.  IMHO, "nc" could take its place right next to cat,
+   cp, rm, mv, dd, ls, and all those other cryptic and Unix-like things.
+
+   Read the README for the whole story, doc, applications, etc.
+
+   Layout:
+        conditional includes:
+        includes:
+        handy defines:
+        globals:
+        malloced globals:
+        cmd-flag globals:
+        support routines:
+        readwrite select loop:
+        main:
+
+  bluesky:
+        parse ranges of IP address as well as ports, perhaps
+        RAW mode!
+        backend progs to grab a pty and look like a real telnetd?!
+        backend progs to do various encryption modes??!?!
+*/
+
+#include "generic.h"            /* same as with L5, skey, etc */
+
+/* conditional includes -- a very messy section which you may have to dink
+   for your own architecture [and please send diffs...]: */
+/* #undef _POSIX_SOURCE         /* might need this for something? */
+#define HAVE_BIND               /* ASSUMPTION -- seems to work everywhere! */
+#define HAVE_HELP               /* undefine if you dont want the help text */
+/* #define ANAL                 /* if you want case-sensitive DNS matching */
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#ifdef HAVE_SELECT_H            /* random SV variants need this */
+#include <sys/select.h>
+#endif
+
+/* have to do this *before* including types.h. xxx: Linux still has it wrong */
+#ifdef FD_SETSIZE               /* should be in types.h, butcha never know. */
+#undef FD_SETSIZE               /* if we ever need more than 16 active */
+#endif                          /* fd's, something is horribly wrong! */
+#define FD_SETSIZE 16           /* <-- this'll give us a long anyways, wtf */
+#include <sys/types.h>          /* *now* do it.  Sigh, this is broken */
+
+#ifdef HAVE_RANDOM              /* aficionados of ?rand48() should realize */
+#define SRAND srandom           /* that this doesn't need *strong* random */
+#define RAND random             /* numbers just to mix up port numbers!! */
+#else
+#define SRAND srand
+#define RAND rand
+#endif /* HAVE_RANDOM */
+
+/* includes: */
+#include <sys/time.h>           /* timeval, time_t */
+#include <setjmp.h>             /* jmp_buf et al */
+#include <sys/socket.h>         /* basics, SO_ and AF_ defs, sockaddr, ... */
+#include <netinet/in.h>         /* sockaddr_in, htons, in_addr */
+#include <netinet/in_systm.h>   /* misc crud that netinet/ip.h references */
+#include <netinet/ip.h>         /* IPOPT_LSRR, header stuff */
+#include <netdb.h>              /* hostent, gethostby*, getservby* */
+#include <arpa/inet.h>          /* inet_ntoa */
+#include <stdio.h>
+#include <string.h>             /* strcpy, strchr, yadda yadda */
+#include <errno.h>
+#include <signal.h>
+#include <fcntl.h>              /* O_WRONLY et al */
+
+/* handy stuff: */
+#define SA struct sockaddr      /* socket overgeneralization braindeath */
+#define SAI struct sockaddr_in  /* ... whoever came up with this model */
+#define IA struct in_addr       /* ... should be taken out and shot, */
+                                /* ... not that TLI is any better.  sigh.. */
+#define SLEAZE_PORT 31337       /* for UDP-scan RTT trick, change if ya want */
+#define USHORT unsigned short   /* use these for options an' stuff */
+#define BIGSIZ 8192             /* big buffers */
+
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
+struct host_poop {
+  char name[MAXHOSTNAMELEN];    /* dns name */
+  char addrs[8][24];            /* ascii-format IP addresses */
+  struct in_addr iaddrs[8];     /* real addresses: in_addr.s_addr: ulong */
+};
+#define HINF struct host_poop
+
+struct port_poop {
+  char name [64];               /* name in /etc/services */
+  char anum [8];                /* ascii-format number */
+  USHORT num;                   /* real host-order number */
+};
+#define PINF struct port_poop
+
+/* globals: */
+jmp_buf jbuf;                   /* timer crud */
+int jval = 0;                   /* timer crud */
+int netfd = -1;
+int ofd = 0;                    /* hexdump output fd */
+static char unknown[] = "(UNKNOWN)";
+static char p_tcp[] = "tcp";    /* for getservby* */
+static char p_udp[] = "udp";
+#ifdef HAVE_BIND
+extern int h_errno;
+/* stolen almost wholesale from bsd herror.c */
+static char * h_errs[] = {
+  "Error 0",                            /* but we *don't* use this */
+  "Unknown host",                       /* 1 HOST_NOT_FOUND */
+  "Host name lookup failure",           /* 2 TRY_AGAIN */
+  "Unknown server error",               /* 3 NO_RECOVERY */
+  "No address associated with name",    /* 4 NO_ADDRESS */
+};
+#else
+int h_errno;                    /* just so we *do* have it available */
+#endif /* HAVE_BIND */
+int gatesidx = 0;               /* LSRR hop count */
+int gatesptr = 4;               /* initial LSRR pointer, settable */
+USHORT Single = 1;              /* zero if scanning */
+unsigned int insaved = 0;       /* stdin-buffer size for multi-mode */
+unsigned int wrote_out = 0;     /* total stdout bytes */
+unsigned int wrote_net = 0;     /* total net bytes */
+static char wrote_txt[] = " sent %d, rcvd %d";
+static char hexnibs[20] = "0123456789abcdef  ";
+
+/* will malloc up the following globals: */
+struct timeval * timer1 = NULL;
+struct timeval * timer2 = NULL;
+SAI * lclend = NULL;            /* sockaddr_in structs */
+SAI * remend = NULL;
+HINF ** gates = NULL;           /* LSRR hop hostpoop */
+char * optbuf = NULL;           /* LSRR or sockopts */
+char * bigbuf_in;               /* data buffers */
+char * bigbuf_net;
+fd_set * ding1;                 /* for select loop */
+fd_set * ding2;
+PINF * portpoop = NULL;         /* for getportpoop / getservby* */
+unsigned char * stage = NULL;   /* hexdump line buffer */
+
+/* global cmd flags: */
+USHORT o_alla = 0;
+unsigned int o_interval = 0;
+USHORT o_listen = 0;
+USHORT o_nflag = 0;
+USHORT o_wfile = 0;
+USHORT o_random = 0;
+USHORT o_udpmode = 0;
+USHORT o_verbose = 0;
+unsigned int o_wait = 0;
+USHORT o_zero = 0;
+/* o_tn in optional section */
+
+/* Debug macro: squirt whatever message and sleep a bit so we can see it go
+   by.  need to call like Debug ((stuff)) [with no ; ] so macro args match!
+   Beware: writes to stdOUT... */
+#ifdef DEBUG
+#define Debug(x) printf x; printf ("\n"); fflush (stdout); sleep (1);
+#else
+#define Debug(x)        /* nil... */
+#endif
+
+
+/* support routines -- the bulk of this thing.  Placed in such an order that
+   we don't have to forward-declare anything: */
+
+/* holler :
+   fake varargs -- need to do this way because we wind up calling through
+   more levels of indirection than vanilla varargs can handle, and not all
+   machines have vfprintf/vsyslog/whatever!  6 params oughta be enough. */
+void holler (str, p1, p2, p3, p4, p5, p6)
+  char * str;
+  char * p1, * p2, * p3, * p4, * p5, * p6;
+{
+  if (o_verbose) {
+    fprintf (stderr, str, p1, p2, p3, p4, p5, p6);
+#ifdef HAVE_BIND
+    if (h_errno) {              /* if host-lookup variety of error ... */
+      if (h_errno > 4)          /* oh no you don't, either */
+        fprintf (stderr, "preposterous h_errno: %d", h_errno);
+      else
+        fprintf (stderr, h_errs[h_errno]);      /* handle it here */
+      h_errno = 0;                              /* and reset for next call */
+    }
+#endif
+    if (errno) {                /* this gives funny-looking messages, but */
+      perror (" ");             /* it's more portable than sys_errlist[]... */
+    } else                      /* xxx: do something better?  */
+      fprintf (stderr, "\n");
+    fflush (stderr);
+  }
+} /* holler */
+
+/* bail :
+   error-exit handler, callable from anywhere */
+void bail (str, p1, p2, p3, p4, p5, p6)
+  char * str;
+  char * p1, * p2, * p3, * p4, * p5, * p6;
+{
+  o_verbose = 1;
+  holler (str, p1, p2, p3, p4, p5, p6);
+  close (netfd);
+  sleep (1);
+  exit (1);
+} /* bail */
+
+/* catch :
+   no-brainer interrupt handler */
+void catch ()
+{
+  errno = 0;
+  if (o_verbose > 1)            /* normally we don't care */
+    bail (wrote_txt, wrote_net, wrote_out);
+  bail (" punt!");
+}
+
+/* timeout and other signal handling cruft */
+void tmtravel ()
+{
+  signal (SIGALRM, SIG_IGN);
+  alarm (0);
+  if (jval == 0)
+    bail ("spurious timer interrupt!");
+  longjmp (jbuf, jval);
+}
+
+/* arm :
+   set the timer.  Zero secs arg means unarm */
+void arm (num, secs)
+  unsigned int num;
+  unsigned int secs;
+{
+  if (secs == 0) {                      /* reset */
+    signal (SIGALRM, SIG_IGN);
+    alarm (0);
+    jval = 0;
+  } else {                              /* set */
+    signal (SIGALRM, tmtravel);
+    alarm (secs);
+    jval = num;
+  } /* if secs */
+} /* arm */
+
+/* Hmalloc :
+   malloc up what I want, rounded up to *4, and pre-zeroed.  Either succeeds
+   or bails out on its own, so that callers don't have to worry about it. */
+char * Hmalloc (size)
+  unsigned int size;
+{
+  unsigned int s = (size + 4) & 0xfffffffc;     /* 4GB?! */
+  char * p = malloc (s);
+  if (p != NULL)
+    memset (p, 0, s);
+  else
+    bail ("Hmalloc %d failed", s);
+  return (p);
+} /* Hmalloc */
+
+/* findline :
+   find the next newline in a buffer; return inclusive size of that "line",
+   or the entire buffer size, so the caller knows how much to then write().
+   Not distinguishing \n vs \r\n for the nonce; it just works as is... */
+unsigned int findline (buf, siz)
+  char * buf;
+  unsigned int siz;
+{
+  register char * p;
+  register int x;
+  if (! buf)                    /* various sanity checks... */
+    return (0);
+  if (siz > BIGSIZ)
+    return (0);
+  x = siz;
+  for (p = buf; x > 0; x--) {
+    if (*p == '\n') {
+      x = (int) (p - buf);
+      x++;                      /* 'sokay if it points just past the end! */
+Debug (("findline returning %d", x))
+      return (x);
+    }
+    p++;
+  } /* for */
+Debug (("findline returning whole thing: %d", siz))
+  return (siz);
+} /* findline */
+
+/* comparehosts :
+   cross-check the host_poop we have so far against new gethostby*() info,
+   and holler about mismatches.  Perhaps gratuitous, but it can't hurt to
+   point out when someone's DNS is fukt.  Returns 1 if mismatch, in case
+   someone else wants to do something about it. */
+int comparehosts (poop, hp)
+  HINF * poop;
+  struct hostent * hp;
+{
+  errno = 0;
+  h_errno = 0;
+/* The DNS spec is officially case-insensitive, but for those times when you
+   *really* wanna see any and all discrepancies, by all means define this. */
+#ifdef ANAL                     
+  if (strcmp (poop->name, hp->h_name) != 0) {           /* case-sensitive */
+#else
+  if (strcasecmp (poop->name, hp->h_name) != 0) {       /* normal */
+#endif
+    holler ("DNS fwd/rev mismatch: %s != %s", poop->name, hp->h_name);
+    return (1);
+  }
+  return (0);
+/* ... do we need to do anything over and above that?? */
+} /* comparehosts */
+
+/* gethostpoop :
+   resolve a host 8 ways from sunday; return a new host_poop struct with its
+   info.  The argument can be a name or [ascii] IP address; it will try its
+   damndest to deal with it.  "numeric" governs whether we do any DNS at all,
+   and we also check o_verbose for what's appropriate work to do. */
+HINF * gethostpoop (name, numeric)
+  char * name;
+  USHORT numeric;
+{
+  struct hostent * hostent;
+  struct in_addr iaddr;
+  register HINF * poop = NULL;
+  register int x;
+
+/* I really want to strangle the twit who dreamed up all these sockaddr and
+   hostent abstractions, and then forced them all to be incompatible with
+   each other so you *HAVE* to do all this ridiculous casting back and forth.
+   If that wasn't bad enough, all the doc insists on referring to local ports
+   and addresses as "names", which makes NO sense down at the bare metal.
+
+   What an absolutely horrid paradigm, and to think of all the people who
+   have been wasting significant amounts of time fighting with this stupid
+   deliberate obfuscation over the last 10 years... then again, I like
+   languages wherein a pointer is a pointer, what you put there is your own
+   business, the compiler stays out of your face, and sheep are nervous.
+   Maybe that's why my C code reads like assembler half the time... */
+
+/* If we want to see all the DNS stuff, do the following hair --
+   if inet_addr, do reverse and forward with any warnings; otherwise try
+   to do forward and reverse with any warnings.  In other words, as long
+   as we're here, do a complete DNS check on these clowns.  Yes, it slows
+   things down a bit for a first run, but once it's cached, who cares? */
+
+  errno = 0;
+  h_errno = 0;
+  if (name)
+    poop = (HINF *) Hmalloc (sizeof (HINF));
+  if (! poop)
+    bail ("gethostpoop fuxored");
+  strcpy (poop->name, unknown);         /* preload it */
+/* see wzv:workarounds.c for dg/ux return-a-struct inet_addr lossage */
+  iaddr.s_addr = inet_addr (name);
+
+  if (iaddr.s_addr == INADDR_NONE) {    /* here's the great split: names... */
+    if (numeric)
+      bail ("Can't parse %s as an IP address", name);
+    hostent = gethostbyname (name);
+    if (! hostent)
+/* failure to look up a name is fatal, since we can't do anything with it */
+      bail ("%s: forward host lookup failed: ", name);
+    strncpy (poop->name, hostent->h_name, MAXHOSTNAMELEN - 1);
+    poop->name[MAXHOSTNAMELEN - 1] = '\0';
+    for (x = 0; hostent->h_addr_list[x] && (x < 8); x++) {
+      memcpy (&poop->iaddrs[x], hostent->h_addr_list[x], sizeof (IA));
+      strncpy (poop->addrs[x], inet_ntoa (poop->iaddrs[x]),
+        sizeof (poop->addrs[0])-1);
+      poop->addrs[x][sizeof (poop->addrs[0]) - 1] = '\0';
+    } /* for x -> addrs, part A */
+    if (! o_verbose)                    /* if we didn't want to see the */
+      return (poop);                    /* inverse stuff, we're done. */
+/* do inverse lookups in separate loop based on our collected forward addrs,
+   since gethostby* tends to crap into the same buffer over and over */
+    for (x = 0; poop->iaddrs[x].s_addr && (x < 8); x++) {
+      hostent = gethostbyaddr ((char *)&poop->iaddrs[x],
+                                sizeof (IA), AF_INET);
+      if ((! hostent) || (! hostent-> h_name))
+        holler ("Warning: inverse host lookup failed for %s: ",
+          poop->addrs[x]);
+      else
+        (void) comparehosts (poop, hostent);
+    } /* for x -> addrs, part B */
+
+  } else {  /* not INADDR_NONE: numeric addresses... */
+    memcpy (poop->iaddrs, &iaddr, sizeof (IA));
+    strncpy (poop->addrs[0], inet_ntoa (iaddr), sizeof (poop->addrs)-1);
+    poop->addrs[0][sizeof (poop->addrs)-1] = '\0';
+    if (numeric)                        /* if numeric-only, we're done */
+      return (poop);
+    if (! o_verbose)                    /* likewise if we don't want */
+      return (poop);                    /* the full DNS hair */
+    hostent = gethostbyaddr ((char *) &iaddr, sizeof (IA), AF_INET);
+/* numeric or not, failure to look up a PTR is *not* considered fatal */
+    if (! hostent)
+        holler ("%s: inverse host lookup failed: ", name);
+    else {
+        strncpy (poop->name, hostent->h_name, MAXHOSTNAMELEN - 1);
+        poop->name[MAXHOSTNAMELEN-1] = '\0';
+        hostent = gethostbyname (poop->name);
+        if ((! hostent) || (! hostent->h_addr_list[0]))
+          holler ("Warning: forward host lookup failed for %s: ",
+                poop->name);
+        else
+          (void) comparehosts (poop, hostent);
+    } /* if hostent */
+  } /* INADDR_NONE Great Split */
+
+/* whatever-all went down previously, we should now have a host_poop struct
+   with at least one IP address in it. */
+  h_errno = 0;
+  return (poop);
+} /* gethostpoop */
+
+/* getportpoop :
+   Same general idea as gethostpoop -- look up a port in /etc/services, fill
+   in global port_poop, but return the actual port *number*.  Pass ONE of:
+        pstring to resolve stuff like "23" or "exec";
+        pnum to reverse-resolve something that's already a number.
+   If o_nflag is on, fill in what we can but skip the getservby??? stuff.
+   Might as well have consistent behavior here, and it *is* faster. */
+USHORT getportpoop (pstring, pnum)
+  char * pstring;
+  unsigned int pnum;
+{
+  struct servent * servent;
+  register int x;
+  register int y;
+  char * whichp = p_tcp;
+  if (o_udpmode)
+    whichp = p_udp;
+  portpoop->name[0] = '?';              /* fast preload */
+  portpoop->name[1] = '\0';
+
+/* case 1: reverse-lookup of a number; placed first since this case is much
+   more frequent if we're scanning */
+  if (pnum) {
+    if (pstring)                        /* one or the other, pleeze */
+      return (0);
+    x = pnum;
+    if (o_nflag)                        /* go faster, skip getservbyblah */
+      goto gp_finish;
+    y = htons (x);                      /* gotta do this -- see Fig.1 below */
+    servent = getservbyport (y, whichp);
+    if (servent) {
+      y = ntohs (servent->s_port);
+      if (x != y)                       /* "never happen" */
+        holler ("Warning: port-bynum mismatch, %d != %d", x, y);
+      strncpy (portpoop->name, servent->s_name, sizeof (portpoop->name)-1);
+      portpoop->name[sizeof (portpoop->name)-1] = '\0';
+    } /* if servent */
+    goto gp_finish;
+  } /* if pnum */
+
+/* case 2: resolve a string, but we still give preference to numbers instead
+   of trying to resolve conflicts.  None of the entries in *my* extensive
+   /etc/services begins with a digit, so this should "always work" unless
+   you're at 3com and have some company-internal services defined... */
+  if (pstring) {
+    if (pnum)                           /* one or the other, pleeze */
+      return (0);
+    x = atoi (pstring);
+    if (x)
+      return (getportpoop (NULL, x));   /* recurse for numeric-string-arg */
+    if (o_nflag)                        /* can't use names! */
+      return (0);
+    servent = getservbyname (pstring, whichp);
+    if (servent) {
+      strncpy (portpoop->name, servent->s_name, sizeof (portpoop->name)-1);
+      portpoop->name[sizeof (portpoop->name)-1] = '\0';
+      x = ntohs (servent->s_port);
+      goto gp_finish;
+    } /* if servent */
+  } /* if pstring */
+
+  return (0);                           /* catches any problems so far */
+
+/* Obligatory netdb.h-inspired rant: servent.s_port is supposed to be an int.
+   Despite this, we still have to treat it as a short when copying it around.
+   Not only that, but we have to convert it *back* into net order for
+   getservbyport to work.  Manpages generally aren't clear on all this, but
+   there are plenty of examples in which it is just quietly done.  More BSD
+   lossage... since everything getserv* ever deals with is local to our own
+   host, why bother with all this network-order/host-order crap at all?!
+   That should be saved for when we want to actually plug the port[s] into
+   some real network calls -- and guess what, we have to *re*-convert at that
+   point as well.  Fuckheads. */
+
+gp_finish:
+/* Fall here whether or not we have a valid servent at this point, with
+   x containing our [host-order and therefore useful, dammit] port number */
+  sprintf (portpoop->anum, "%d", x);    /* always load any numeric specs! */
+  portpoop->num = (x & 0xffff);         /* ushort, remember... */
+  return (portpoop->num);
+} /* getportpoop */
+
+/* nextport :
+   Come up with the next port to try, be it random or whatever.  "block" is
+   a ptr to randports array, whose bytes [so far] carry these meanings:
+        0       ignore
+        1       to be tested
+        2       tested [which is set as we find them here]
+   returns a USHORT random port, or 0 if all the t-b-t ones are used up. */
+USHORT nextport (block)
+  char * block;
+{
+  register unsigned int x;
+  register unsigned int y;
+
+  y = 70000;                    /* high safety count for rnd-tries */
+  while (y > 0) {
+    x = (RAND() & 0xffff);
+    if (block[x] == 1) {        /* try to find a not-done one... */
+      block[x] = 2;
+      break;
+    }
+    x = 0;                      /* bummer. */
+    y--;
+  } /* while y */
+  if (x)
+    return (x);
+
+  y = 65535;                    /* no random one, try linear downsearch */
+  while (y > 0) {               /* if they're all used, we *must* be sure! */
+    if (block[y] == 1) {
+      block[y] = 2;
+      break;
+    }
+    y--;
+  } /* while y */
+  if (y)
+    return (y);                 /* at least one left */
+
+  return (0);                   /* no more left! */
+} /* nextport */
+
+/* loadports :
+   set "to be tested" indications in BLOCK, from LO to HI.  Almost too small
+   to be a separate routine, but makes main() a little cleaner... */
+void loadports (block, lo, hi)
+  char * block;
+  USHORT lo;
+  USHORT hi;
+{
+  USHORT x;
+
+  if (! block)
+    bail ("loadports: no block?!");
+  if ((! lo) || (! hi))
+    bail ("loadports: bogus values %d, %d", lo, hi);
+  x = hi;
+  while (lo <= x) {
+    block[x] = 1;
+    x--;
+  }
+} /* loadports */
+
+#ifdef GAPING_SECURITY_HOLE
+char * pr00gie = NULL;                  /* global ptr to -e arg */
+
+/* doexec :
+   fiddle all the file descriptors around, and hand off to another prog.  Sort
+   of like a one-off "poor man's inetd".  This is the only section of code
+   that would be security-critical, which is why it's ifdefed out by default.
+   Use at your own hairy risk; if you leave shells lying around behind open
+   listening ports you deserve to lose!! */
+doexec (fd)
+  int fd;
+{
+  register char * p;
+
+  dup2 (fd, 0);                         /* the precise order of fiddlage */
+  close (fd);                           /* is apparently crucial; this is */
+  dup2 (0, 1);                          /* swiped directly out of "inetd". */
+  dup2 (0, 2);
+  p = strrchr (pr00gie, '/');           /* shorter argv[0] */
+  if (p)
+    p++;
+  else
+    p = pr00gie;
+Debug (("gonna exec %s as %s...", pr00gie, p))
+  execl (pr00gie, p, NULL);
+  bail ("exec %s failed", pr00gie);     /* this gets sent out.  Hmm... */
+} /* doexec */
+#endif /* GAPING_SECURITY_HOLE */
+
+/* doconnect :
+   do all the socket stuff, and return an fd for one of
+        an open outbound TCP connection
+        a UDP stub-socket thingie
+   with appropriate socket options set up if we wanted source-routing, or
+        an unconnected TCP or UDP socket to listen on.
+   Examines various global o_blah flags to figure out what-all to do. */
+int doconnect (rad, rp, lad, lp)
+  IA * rad;
+  USHORT rp;
+  IA * lad;
+  USHORT lp;
+{
+  register int nnetfd;
+  register int rr;
+  int x, y;
+  errno = 0;
+
+/* grab a socket; set opts */
+newskt:
+  if (o_udpmode)
+    nnetfd = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+  else
+    nnetfd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (nnetfd < 0)
+    bail ("Can't get socket");
+  if (nnetfd == 0)              /* if stdin was closed this might *be* 0, */
+    goto newskt;                /* so grab another.  See text for why... */
+  x = 1;
+  rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x));
+  if (rr == -1)
+    holler ("nnetfd reuseaddr failed");         /* ??? */
+#ifdef SO_REUSEPORT     /* doesnt exist everywhere... */
+  rr = setsockopt (nnetfd, SOL_SOCKET, SO_REUSEPORT, &x, sizeof (x));
+  if (rr == -1)
+    holler ("nnetfd reuseport failed");         /* ??? */
+#endif
+#if 0
+/* If you want to screw with RCVBUF/SNDBUF, do it here.  Liudvikas Bukys at
+   Rochester sent this example, which would involve YET MORE options and is
+   just archived here in case you want to mess with it.  o_xxxbuf are global
+   integers set in main() getopt loop, and check for rr == 0 afterward. */
+  rr = setsockopt(nnetfd, SOL_SOCKET, SO_RCVBUF, &o_rcvbuf, sizeof o_rcvbuf);
+  rr = setsockopt(nnetfd, SOL_SOCKET, SO_SNDBUF, &o_sndbuf, sizeof o_sndbuf);
+#endif
+  
+  /* fill in all the right sockaddr crud */
+    lclend->sin_family = AF_INET;
+
+/* fill in all the right sockaddr crud */
+  lclend->sin_family = AF_INET;
+  remend->sin_family = AF_INET;
+
+/* if lad/lp, do appropriate binding */
+  if (lad)
+    memcpy (&lclend->sin_addr.s_addr, lad, sizeof (IA));
+  if (lp)
+    lclend->sin_port = htons (lp);
+  rr = 0;
+  if (lad || lp) {
+    x = (int) lp;
+/* try a few times for the local bind, a la ftp-data-port... */
+    for (y = 4; y > 0; y--) {
+      rr = bind (nnetfd, (SA *)lclend, sizeof (SA));
+      if (rr == 0)
+        break;
+      if (errno != EADDRINUSE)
+        break;
+      else {
+        holler ("retrying local %s:%d", inet_ntoa (lclend->sin_addr), lp);
+        sleep (2);
+        errno = 0;                      /* clear from sleep */
+      } /* if EADDRINUSE */
+    } /* for y counter */
+  } /* if lad or lp */
+  if (rr)
+    bail ("Can't grab %s:%d with bind",
+        inet_ntoa(lclend->sin_addr), lp);
+
+  if (o_listen)
+    return (nnetfd);                    /* thanks, that's all for today */
+
+  memcpy (&remend->sin_addr.s_addr, rad, sizeof (IA));
+  remend->sin_port = htons (rp);
+
+/* rough format of LSRR option and explanation of weirdness.
+Option comes after IP-hdr dest addr in packet, padded to *4, and ihl > 5.
+IHL is multiples of 4, i.e. real len = ip_hl << 2.
+        type 131        1       ; 0x83: copied, option class 0, number 3
+        len             1       ; of *whole* option!
+        pointer         1       ; nxt-hop-addr; 1-relative, not 0-relative
+        addrlist...     var     ; 4 bytes per hop-addr
+        pad-to-32       var     ; ones, i.e. "NOP"
+
+If we want to route A -> B via hops C and D, we must add C, D, *and* B to the
+options list.  Why?  Because when we hand the kernel A -> B with list C, D, B
+the "send shuffle" inside the kernel changes it into A -> C with list D, B and
+the outbound packet gets sent to C.  If B wasn't also in the hops list, the
+final destination would have been lost at this point.
+
+When C gets the packet, it changes it to A -> D with list C', B where C' is
+the interface address that C used to forward the packet.  This "records" the
+route hop from B's point of view, i.e. which address points "toward" B.  This
+is to make B better able to return the packets.  The pointer gets bumped by 4,
+so that D does the right thing instead of trying to forward back to C.
+
+When B finally gets the packet, it sees that the pointer is at the end of the
+LSRR list and is thus "completed".  B will then try to use the packet instead
+of forwarding it, i.e. deliver it up to some application.
+
+Note that by moving the pointer yourself, you could send the traffic directly
+to B but have it return via your preconstructed source-route.  Playing with
+this and watching "tcpdump -v" is the best way to understand what's going on.
+
+Only works for TCP in BSD-flavor kernels.  UDP is a loss; udp_input calls
+stripoptions() early on, and the code to save the srcrt is notdef'ed.
+Linux is also still a loss at 1.3.x it looks like; the lsrr code is { }...
+*/
+
+/* if any -g arguments were given, set up source-routing.  We hit this after
+   the gates are all looked up and ready to rock, any -G pointer is set,
+   and gatesidx is now the *number* of hops */
+  if (gatesidx) {               /* if we wanted any srcrt hops ... */
+/* don't even bother compiling if we can't do IP options here! */
+#ifdef IP_OPTIONS
+    if (! optbuf) {             /* and don't already *have* a srcrt set */
+      char * opp;               /* then do all this setup hair */
+      optbuf = Hmalloc (48);
+      opp = optbuf;
+      *opp++ = IPOPT_LSRR;                                      /* option */
+      *opp++ = (char)
+        (((gatesidx + 1) * sizeof (IA)) + 3) & 0xff;            /* length */
+      *opp++ = gatesptr;                                        /* pointer */
+/* opp now points at first hop addr -- insert the intermediate gateways */
+      for ( x = 0; x < gatesidx; x++) {
+        memcpy (opp, gates[x]->iaddrs, sizeof (IA));
+        opp += sizeof (IA);
+      }
+/* and tack the final destination on the end [needed!] */
+      memcpy (opp, rad, sizeof (IA));
+      opp += sizeof (IA);
+      *opp = IPOPT_NOP;                 /* alignment filler */
+    } /* if empty optbuf */
+/* calculate length of whole option mess, which is (3 + [hops] + [final] + 1),
+   and apply it [have to do this every time through, of course] */
+    x = ((gatesidx + 1) * sizeof (IA)) + 4;
+    rr = setsockopt (nnetfd, IPPROTO_IP, IP_OPTIONS, optbuf, x);
+    if (rr == -1)
+      bail ("srcrt setsockopt fuxored");
+#else /* IP_OPTIONS */
+    holler ("Warning: source routing unavailable on this machine, ignoring");
+#endif /* IP_OPTIONS*/
+  } /* if gatesidx */
+
+/* wrap connect inside a timer, and hit it */
+  arm (1, o_wait);
+  if (setjmp (jbuf) == 0) {
+    rr = connect (nnetfd, (SA *)remend, sizeof (SA));
+  } else {                              /* setjmp: connect failed... */
+    rr = -1;
+    errno = ETIMEDOUT;                  /* fake it */
+  }
+  arm (0, 0);
+  if (rr == 0)
+    return (nnetfd);
+  close (nnetfd);                       /* clean up junked socket FD!! */
+  return (-1);
+} /* doconnect */
+
+/* dolisten :
+   just like doconnect, and in fact calls a hunk of doconnect, but listens for
+   incoming and returns an open connection *from* someplace.  If we were
+   given host/port args, any connections from elsewhere are rejected.  This
+   in conjunction with local-address binding should limit things nicely... */
+int dolisten (rad, rp, lad, lp)
+  IA * rad;
+  USHORT rp;
+  IA * lad;
+  USHORT lp;
+{
+  register int nnetfd;
+  register int rr;
+  HINF * whozis = NULL;
+  int x;
+  char * cp;
+  USHORT z;
+  errno = 0;
+
+/* Pass everything off to doconnect, who in o_listen mode just gets a socket */
+  nnetfd = doconnect (rad, rp, lad, lp);
+  if (nnetfd <= 0)
+    return (-1);
+  if (o_udpmode) {                      /* apparently UDP can listen ON */
+    if (! lp)                           /* "port 0",  but that's not useful */
+      bail ("UDP listen needs -p arg");
+  } else {
+    rr = listen (nnetfd, 1);            /* gotta listen() before we can get */
+    if (rr < 0)                         /* our local random port.  sheesh. */
+      bail ("local listen fuxored");
+  }
+
+/* Various things that follow temporarily trash bigbuf_net, which might contain
+   a copy of any recvfrom()ed packet, but we'll read() another copy later. */
+
+/* I can't believe I have to do all this to get my own goddamn bound address
+   and port number.  It should just get filled in during bind() or something.
+   All this is only useful if we didn't say -p for listening, since if we
+   said -p we *know* what port we're listening on.  At any rate we won't bother
+   with it all unless we wanted to see it, although listening quietly on a
+   random unknown port is probably not very useful without "netstat". */
+  if (o_verbose) {
+    x = sizeof (SA);            /* how 'bout getsockNUM instead, pinheads?! */
+    rr = getsockname (nnetfd, (SA *) lclend, &x);
+    if (rr < 0)
+      holler ("local getsockname failed");
+    strcpy (bigbuf_net, "listening on [");      /* buffer reuse... */
+    if (lclend->sin_addr.s_addr)
+      strcat (bigbuf_net, inet_ntoa (lclend->sin_addr));
+    else
+      strcat (bigbuf_net, "any");
+    strcat (bigbuf_net, "] %d ...");
+    z = ntohs (lclend->sin_port);
+    holler (bigbuf_net, z);
+  } /* verbose -- whew!! */
+
+/* UDP is a speeeeecial case -- we have to do I/O *and* get the calling
+   party's particulars all at once, listen() and accept() don't apply.
+   At least in the BSD universe, however, recvfrom/PEEK is enough to tell
+   us something came in, and we can set things up so straight read/write
+   actually does work after all.  Yow.  YMMV on strange platforms!  */
+  if (o_udpmode) {
+    x = sizeof (SA);            /* retval for recvfrom */
+    arm (2, o_wait);            /* might as well timeout this, too */
+    if (setjmp (jbuf) == 0) {   /* do timeout for initial connect */
+      rr = recvfrom             /* and here we block... */
+        (nnetfd, bigbuf_net, BIGSIZ, MSG_PEEK, (SA *) remend, &x);
+Debug (("dolisten/recvfrom ding, rr = %d, netbuf %s ", rr, bigbuf_net))
+    } else
+      goto dol_tmo;             /* timeout */
+    arm (0, 0);
+/* I'm not completely clear on how this works -- BSD seems to make UDP
+   just magically work in a connect()ed context, but we'll undoubtedly run
+   into systems this deal doesn't work on.  For now, we apparently have to
+   issue a connect() on our just-tickled socket so we can write() back.
+   Again, why the fuck doesn't it just get filled in and taken care of?!
+   This hack is anything but optimal.  Basically, if you want your listener
+   to also be able to send data back, you need this connect() line, which
+   also has the side effect that now anything from a different source or even a
+   different port on the other end won't show up and will cause ICMP errors.
+   I guess that's what they meant by "connect".
+   Let's try to remember what the "U" is *really* for, eh? */
+    rr = connect (nnetfd, (SA *)remend, sizeof (SA));
+    goto whoisit;
+  } /* o_udpmode */
+
+/* fall here for TCP */
+  x = sizeof (SA);              /* retval for accept */
+  arm (2, o_wait);              /* wrap this in a timer, too; 0 = forever */
+  if (setjmp (jbuf) == 0) {
+    rr = accept (nnetfd, (SA *)remend, &x);
+  } else
+    goto dol_tmo;               /* timeout */
+  arm (0, 0);
+  close (nnetfd);               /* dump the old socket */
+  nnetfd = rr;                  /* here's our new one */
+
+whoisit:
+  if (rr < 0)
+    goto dol_err;               /* bail out if any errors so far */
+
+/* If we can, look for any IP options.  Useful for testing the receiving end of
+   such things, and is a good exercise in dealing with it.  We do this before
+   the connect message, to ensure that the connect msg is uniformly the LAST
+   thing to emerge after all the intervening crud.  Doesn't work for UDP on
+   any machines I've tested, but feel free to surprise me. */
+#ifdef IP_OPTIONS
+  if (! o_verbose)                      /* if we wont see it, we dont care */
+    goto dol_noop;
+  optbuf = Hmalloc (40);
+  x = 40;
+  rr = getsockopt (nnetfd, IPPROTO_IP, IP_OPTIONS, optbuf, &x);
+  if (rr < 0)
+    holler ("getsockopt failed");
+Debug (("ipoptions ret len %d", x))
+  if (x) {                              /* we've got options, lessee em... */
+    unsigned char * q = (unsigned char *) optbuf;
+    char * p = bigbuf_net;              /* local variables, yuk! */
+    char * pp = &bigbuf_net[128];       /* get random space farther out... */
+    memset (bigbuf_net, 0, 256);        /* clear it all first */
+    while (x > 0) {
+        sprintf (pp, "%2.2x ", *q);     /* clumsy, but works: turn into hex */
+        strcat (p, pp);                 /* and build the final string */
+        q++; p++;
+        x--;
+    }
+    holler ("IP options: %s", bigbuf_net);
+  } /* if x, i.e. any options */
+dol_noop:
+#endif /* IP_OPTIONS */
+
+/* find out what address the connection was *to* on our end, in case we're
+   doing a listen-on-any on a multihomed machine.  This allows one to
+   offer different services via different alias addresses, such as the
+   "virtual web site" hack. */
+  memset (bigbuf_net, 0, 64);
+  cp = &bigbuf_net[32];
+  x = sizeof (SA);
+  rr = getsockname (nnetfd, (SA *) lclend, &x);
+  if (rr < 0)
+    holler ("post-rcv getsockname failed");
+  strcpy (cp, inet_ntoa (lclend->sin_addr));
+
+/* now check out who it is.  We don't care about mismatched DNS names here,
+   but any ADDR and PORT we specified had better fucking well match the caller.
+   Converting from addr to inet_ntoa and back again is a bit of a kludge, but
+   gethostpoop wants a string and there's much gnarlier code out there already,
+   so I don't feel bad.
+   The *real* question is why BFD sockets wasn't designed to allow listens for
+   connections *from* specific hosts/ports, instead of requiring the caller to
+   accept the connection and then reject undesireable ones by closing.  In
+   other words, we need a TCP MSG_PEEK. */
+  z = ntohs (remend->sin_port);
+  strcpy (bigbuf_net, inet_ntoa (remend->sin_addr));
+  whozis = gethostpoop (bigbuf_net, o_nflag);
+  errno = 0;
+  x = 0;                                /* use as a flag... */
+  if (rad)      /* xxx: fix to go down the *list* if we have one? */
+    if (memcmp (rad, whozis->iaddrs, sizeof (SA)))
+      x = 1;
+  if (rp)
+    if (z != rp)
+      x = 1;
+  if (x)                                        /* guilty! */
+    bail ("invalid connection to [%s] from %s [%s] %d",
+        cp, whozis->name, whozis->addrs[0], z);
+  holler ("connect to [%s] from %s [%s] %d",            /* oh, you're okay.. */
+        cp, whozis->name, whozis->addrs[0], z);
+  return (nnetfd);                              /* open! */
+
+dol_tmo:
+  errno = ETIMEDOUT;                    /* fake it */
+dol_err:
+  close (nnetfd);
+  return (-1);
+} /* dolisten */
+
+/* udptest :
+   fire a couple of packets at a UDP target port, just to see if it's really
+   there.  On BSD kernels, ICMP host/port-unreachable errors get delivered to
+   our socket as ECONNREFUSED write errors.  On SV kernels, we lose; we'll have
+   to collect and analyze raw ICMP ourselves a la satan's probe_udp_ports
+   backend.  Guess where one could swipe the appropriate code from...
+
+   Use the time delay between writes if given, otherwise use the "tcp ping"
+   trick for getting the RTT.  [I got that idea from pluvius, and warped it.]
+   Return either the original fd, or clean up and return -1. */
+udptest (fd, where)
+  int fd;
+  IA * where;
+{
+  register int rr;
+
+  rr = write (fd, bigbuf_in, 1);
+  if (rr != 1)
+    holler ("udptest first write failed?! errno %d", errno);
+  if (o_wait)
+    sleep (o_wait);
+  else {
+/* use the tcp-ping trick: try connecting to a normally refused port, which
+   causes us to block for the time that SYN gets there and RST gets back.
+   Not completely reliable, but it *does* mostly work. */
+    o_udpmode = 0;                      /* so doconnect does TCP this time */
+/* Set a temporary connect timeout, so packet filtration doesnt cause
+   us to hang forever, and hit it */
+    o_wait = 5;                         /* enough that we'll notice?? */
+    rr = doconnect (where, SLEAZE_PORT, 0, 0);
+    if (rr > 0)
+      close (rr);                       /* in case it *did* open */
+    o_wait = 0;                         /* reset it */
+    o_udpmode++;                        /* we *are* still doing UDP, right? */
+  } /* if o_wait */
+  errno = 0;                            /* clear from sleep */
+  rr = write (fd, bigbuf_in, 1);
+  if (rr == 1)                          /* if write error, no UDP listener */
+    return (fd);
+  close (fd);                           /* use it or lose it! */
+  return (-1);
+} /* udptest */
+
+/* oprint :
+   Hexdump bytes shoveled either way to a running logfile, in the format:
+D offset       -  - - - --- 16 bytes --- - - -  -     # .... ascii .....
+   where "which" sets the direction indicator, D:
+        0 -- sent to network, or ">"
+        1 -- rcvd and printed to stdout, or "<"
+   and "buf" and "n" are data-block and length.  If the current block generates
+   a partial line, so be it; we *want* that lockstep indication of who sent
+   what when.  Adapted from dgaudet's original example -- but must be ripping
+   *fast*, since we don't want to be too disk-bound... */
+void oprint (which, buf, n)
+  int which;
+  char * buf;
+  int n;
+{
+  int bc;                       /* in buffer count */
+  int obc;                      /* current "global" offset */
+  int soc;                      /* stage write count */
+  register unsigned char * p;   /* main buf ptr; m.b. unsigned here */
+  register unsigned char * op;  /* out hexdump ptr */
+  register unsigned char * a;   /* out asc-dump ptr */
+  register int x;
+  register unsigned int y;
+
+  if (! ofd)
+    bail ("oprint called with no open fd?!");
+  if (n == 0)
+    return;
+
+  op = stage;
+  if (which) {
+    *op = '<';
+    obc = wrote_out;            /* use the globals! */
+  } else {
+    *op = '>';
+    obc = wrote_net;
+  }
+  op++;                         /* preload "direction" */
+  *op = ' ';
+  p = (unsigned char *) buf;
+  bc = n;
+  stage[59] = '#';              /* preload separator */
+  stage[60] = ' ';
+
+  while (bc) {                  /* for chunk-o-data ... */
+    x = 16;
+    soc = 78;                   /* len of whole formatted line */
+    if (bc < x) {
+      soc = soc - 16 + bc;      /* fiddle for however much is left */
+      x = (bc * 3) + 11;        /* 2 digits + space per, after D & offset */
+      op = &stage[x];
+      x = 16 - bc;
+      while (x) {
+        *op++ = ' ';            /* preload filler spaces */
+        *op++ = ' ';
+        *op++ = ' ';
+        x--;
+      }
+      x = bc;                   /* re-fix current linecount */
+    } /* if bc < x */
+
+    bc -= x;                    /* fix wrt current line size */
+    sprintf (&stage[2], "%8.8x ", obc);         /* xxx: still slow? */
+    obc += x;                   /* fix current offset */
+    op = &stage[11];            /* where hex starts */
+    a = &stage[61];             /* where ascii starts */
+
+    while (x) {                 /* for line of dump, however long ... */
+      y = (int)(*p >> 4);       /* hi half */
+      *op = hexnibs[y];
+      op++;
+      y = (int)(*p & 0x0f);     /* lo half */
+      *op = hexnibs[y];
+      op++;
+      *op = ' ';
+      op++;
+      if ((*p > 31) && (*p < 127))
+        *a = *p;                /* printing */
+      else
+        *a = '.';               /* nonprinting, loose def */
+      a++;
+      p++;
+      x--;
+    } /* while x */
+    *a = '\n';                  /* finish the line */
+    x = write (ofd, stage, soc);
+    if (x < 0)
+      bail ("ofd write err");
+  } /* while bc */
+} /* oprint */
+
+#ifdef TELNET
+USHORT o_tn = 0;                /* global -t option */
+
+/* atelnet :
+   Answer anything that looks like telnet negotiation with don't/won't.
+   This doesn't modify any data buffers, update the global output count,
+   or show up in a hexdump -- it just shits into the outgoing stream.
+   Idea and codebase from Mudge@l0pht.com. */
+void atelnet (buf, size)
+  unsigned char * buf;          /* has to be unsigned here! */
+  unsigned int size;
+{
+  static unsigned char obuf [4];  /* tiny thing to build responses into */
+  register int x;
+  register unsigned char y;
+  register unsigned char * p;
+
+  y = 0;
+  p = buf;
+  x = size;
+  while (x > 0) {
+    if (*p != 255)                      /* IAC? */
+      goto notiac;
+    obuf[0] = 255;
+    p++; x--;
+    if ((*p == 251) || (*p == 252))     /* WILL or WONT */
+      y = 254;                          /* -> DONT */
+    if ((*p == 253) || (*p == 254))     /* DO or DONT */
+      y = 252;                          /* -> WONT */
+    if (y) {
+      obuf[1] = y;
+      p++; x--;
+      obuf[2] = *p;                     /* copy actual option byte */
+      (void) write (netfd, obuf, 3);
+/* if one wanted to bump wrote_net or do a hexdump line, here's the place */
+      y = 0;
+    } /* if y */
+notiac:
+    p++; x--;
+  } /* while x */
+} /* atelnet */
+#endif /* TELNET */
+
+/* readwrite :
+   handle stdin/stdout/network I/O.  Bwahaha!! -- the select loop from hell.
+   In this instance, return what might become our exit status. */
+int readwrite (fd)
+  int fd;
+{
+  register int rr;
+  register char * zp;           /* stdin buf ptr */
+  register char * np;           /* net-in buf ptr */
+  unsigned int rzleft;
+  unsigned int rnleft;
+  USHORT netretry;              /* net-read retry counter */
+  USHORT wretry;                /* net-write sanity counter */
+  USHORT wfirst;                /* one-shot flag to skip first net read */
+
+/* if you don't have all this FD_* macro hair in sys/types.h, you'll have to
+   either find it or do your own bit-bashing: *ding1 |= (1 << fd), etc... */
+  if (fd > FD_SETSIZE) {
+    holler ("Preposterous fd value %d", fd);
+    return (1);
+  }
+  FD_SET (fd, ding1);           /* global: the net is open */
+  netretry = 2;
+  wfirst = 0;
+  rzleft = rnleft = 0;
+  if (insaved) {
+    rzleft = insaved;           /* preload multi-mode fakeouts */
+    zp = bigbuf_in;
+    wfirst = 1;
+    if (Single)                 /* if not scanning, this is a one-off first */
+      insaved = 0;              /* buffer left over from argv construction, */
+    else {
+      FD_CLR (0, ding1);        /* OR we've already got our repeat chunk, */
+      close (0);                /* so we won't need any more stdin */
+    } /* Single */
+  } /* insaved */
+  if (o_interval)
+    sleep (o_interval);         /* pause *before* sending stuff, too */
+  errno = 0;                    /* clear from sleep, close, whatever */
+
+/* and now the big ol' select shoveling loop ... */
+  while (FD_ISSET (fd, ding1)) {        /* i.e. till the *net* closes! */
+    wretry = 8200;                      /* more than we'll ever hafta write */
+    if (wfirst) {                       /* any saved stdin buffer? */
+      wfirst = 0;                       /* clear flag for the duration */
+      goto shovel;                      /* and go handle it first */
+    }
+    *ding2 = *ding1;                    /* FD_COPY ain't portable... */
+/* some systems, notably linux, crap into their select timers on return, so
+   we create a expendable copy and give *that* to select.  *Fuck* me ... */
+    if (timer1)
+      memcpy (timer2, timer1, sizeof (struct timeval));
+    rr = select (16, ding2, 0, 0, timer2);      /* here it is, kiddies */
+    if (rr < 0) {
+        if (errno != EINTR) {           /* might have gotten ^Zed, etc ?*/
+          holler ("select fuxored");
+          close (fd);
+          return (1);
+        }
+    } /* select fuckup */
+/* if we have a timeout AND stdin is closed AND we haven't heard anything
+   from the net during that time, assume it's dead and close it too. */
+    if (rr == 0) {
+        if (! FD_ISSET (0, ding1))
+          netretry--;                   /* we actually try a coupla times. */
+        if (! netretry) {
+          if (o_verbose > 1)            /* normally we don't care */
+            holler ("net timeout");
+          close (fd);
+          return (0);                   /* not an error! */
+        }
+    } /* select timeout */
+/* xxx: should we check the exception fds too?  The read fds seem to give
+   us the right info, and none of the examples I found bothered. */
+
+/* Ding!!  Something arrived, go check all the incoming hoppers, net first */
+    if (FD_ISSET (fd, ding2)) {         /* net: ding! */
+        rr = read (fd, bigbuf_net, BIGSIZ);
+        if (rr <= 0) {
+          FD_CLR (fd, ding1);           /* net closed, we'll finish up... */
+          rzleft = 0;                   /* can't write anymore: broken pipe */
+        } else {
+          rnleft = rr;
+          np = bigbuf_net;
+#ifdef TELNET
+          if (o_tn)
+            atelnet (np, rr);           /* fake out telnet stuff */
+#endif /* TELNET */
+        } /* if rr */
+Debug (("got %d from the net, errno %d", rr, errno))
+    } /* net:ding */
+
+/* if we're in "slowly" mode there's probably still stuff in the stdin
+   buffer, so don't read unless we really need MORE INPUT!  MORE INPUT! */
+    if (rzleft)
+        goto shovel;
+
+/* okay, suck more stdin */
+    if (FD_ISSET (0, ding2)) {          /* stdin: ding! */
+        rr = read (0, bigbuf_in, BIGSIZ);
+/* Considered making reads here smaller for UDP mode, but 8192-byte
+   mobygrams are kinda fun and exercise the reassembler. */
+        if (rr <= 0) {                  /* at end, or fukt, or ... */
+          FD_CLR (0, ding1);            /* disable and close stdin */
+          close (0);
+        } else {
+          rzleft = rr;
+          zp = bigbuf_in;
+/* special case for multi-mode -- we'll want to send this one buffer to every
+   open TCP port or every UDP attempt, so save its size and clean up stdin */
+          if (! Single) {               /* we might be scanning... */
+            insaved = rr;               /* save len */
+            FD_CLR (0, ding1);          /* disable further junk from stdin */
+            close (0);                  /* really, I mean it */
+          } /* Single */
+        } /* if rr/read */
+    } /* stdin:ding */
+
+shovel:
+/* now that we've dingdonged all our thingdings, send off the results.
+   Geez, why does this look an awful lot like the big loop in "rsh"? ...
+   not sure if the order of this matters, but write net -> stdout first. */
+
+/* sanity check.  Works because they're both unsigned... */
+    if ((rzleft > 8200) || (rnleft > 8200)) {
+        holler ("Bogus buffers: %d, %d", rzleft, rnleft);
+        rzleft = rnleft = 0;
+    }
+/* net write retries sometimes happen on UDP connections */
+    if (! wretry) {                     /* is something hung? */
+        holler ("too many output retries");
+        return (1);
+    }
+    if (rnleft) {
+        rr = write (1, np, rnleft);
+        if (rr > 0) {
+          if (o_wfile)
+            oprint (1, np, rr);         /* log the stdout */
+          np += rr;                     /* fix up ptrs and whatnot */
+          rnleft -= rr;                 /* will get sanity-checked above */
+          wrote_out += rr;              /* global count */
+        }
+Debug (("wrote %d to stdout, errno %d", rr, errno))
+    } /* rnleft */
+    if (rzleft) {
+        if (o_interval)                 /* in "slowly" mode ?? */
+          rr = findline (zp, rzleft);
+        else
+          rr = rzleft;
+        rr = write (fd, zp, rr);        /* one line, or the whole buffer */
+        if (rr > 0) {
+          if (o_wfile)
+            oprint (0, zp, rr);         /* log what got sent */
+          zp += rr;
+          rzleft -= rr;
+          wrote_net += rr;              /* global count */
+        }
+Debug (("wrote %d to net, errno %d", rr, errno))
+    } /* rzleft */
+    if (o_interval) {                   /* cycle between slow lines, or ... */
+        sleep (o_interval);
+        errno = 0;                      /* clear from sleep */
+        continue;                       /* ...with hairy select loop... */
+    }
+    if ((rzleft) || (rnleft)) {         /* shovel that shit till they ain't */
+        wretry--;                       /* none left, and get another load */
+        goto shovel;
+    }
+  } /* while ding1:netfd is open */
+
+/* XXX: maybe want a more graceful shutdown() here, or screw around with
+   linger times??  I suspect that I don't need to since I'm always doing
+   blocking reads and writes and my own manual "last ditch" efforts to read
+   the net again after a timeout.  I haven't seen any screwups yet, but it's
+   not like my test network is particularly busy... */
+  close (fd);
+  return (0);
+} /* readwrite */
+
+/* main :
+   now we pull it all together... */
+main (argc, argv)
+  int argc;
+  char ** argv;
+{
+#ifndef HAVE_GETOPT
+  extern char * optarg;
+  extern int optind, optopt;
+#endif
+  register int x;
+  register char *cp;
+  HINF * gp;
+  HINF * whereto = NULL;
+  HINF * wherefrom = NULL;
+  IA * ouraddr = NULL;
+  IA * themaddr = NULL;
+  USHORT o_lport = 0;
+  USHORT ourport = 0;
+  USHORT loport = 0;            /* for scanning stuff */
+  USHORT hiport = 0;
+  USHORT curport = 0;
+  char * randports = NULL;
+
+#ifdef HAVE_BIND
+/* can *you* say "cc -yaddayadda netcat.c -lresolv -l44bsd" on SunLOSs? */
+  res_init();
+#endif
+/* I was in this barbershop quartet in Skokie IL ... */
+/* round up the usual suspects, i.e. malloc up all the stuff we need */
+  lclend = (SAI *) Hmalloc (sizeof (SA));
+  remend = (SAI *) Hmalloc (sizeof (SA));
+  bigbuf_in = Hmalloc (BIGSIZ);
+  bigbuf_net = Hmalloc (BIGSIZ);
+  ding1 = (fd_set *) Hmalloc (sizeof (fd_set));
+  ding2 = (fd_set *) Hmalloc (sizeof (fd_set));
+  portpoop = (PINF *) Hmalloc (sizeof (PINF));
+
+  errno = 0;
+  gatesptr = 4;
+  h_errno = 0;
+
+/* catch a signal or two for cleanup */
+  signal (SIGINT, catch);
+  signal (SIGQUIT, catch);
+  signal (SIGTERM, catch);
+/* and suppress others... */
+#ifdef SIGURG
+  signal (SIGURG, SIG_IGN);
+#endif
+#ifdef SIGPIPE
+  signal (SIGPIPE, SIG_IGN);            /* important! */
+#endif
+
+/* if no args given at all, get 'em from stdin, construct an argv, and hand
+   anything left over to readwrite(). */
+  if (argc == 1) {
+    cp = argv[0];
+    argv = (char **) Hmalloc (128 * sizeof (char *));   /* XXX: 128? */
+    argv[0] = cp;                       /* leave old prog name intact */
+    cp = Hmalloc (BIGSIZ);
+    argv[1] = cp;                       /* head of new arg block */
+    fprintf (stderr, "Cmd line: ");
+    fflush (stderr);            /* I dont care if it's unbuffered or not! */
+    insaved = read (0, cp, BIGSIZ);     /* we're gonna fake fgets() here */
+    if (insaved <= 0)
+      bail ("wrong");
+    x = findline (cp, insaved);
+    if (x)
+      insaved -= x;             /* remaining chunk size to be sent */
+    if (insaved)                /* which might be zero... */
+      memcpy (bigbuf_in, &cp[x], insaved);
+    cp = strchr (argv[1], '\n');
+    if (cp)
+      *cp = '\0';
+    cp = strchr (argv[1], '\r');        /* look for ^M too */
+    if (cp)
+      *cp = '\0';
+
+/* find and stash pointers to remaining new "args" */
+    cp = argv[1];
+    cp++;                               /* skip past first char */
+    x = 2;                              /* we know argv 0 and 1 already */
+    for (; *cp != '\0'; cp++) {
+      if (*cp == ' ') {
+        *cp = '\0';                     /* smash all spaces */
+        continue;
+      } else {
+        if (*(cp-1) == '\0') {
+          argv[x] = cp;
+          x++;
+        }
+      } /* if space */
+    } /* for cp */
+    argc = x;
+  } /* if no args given */
+
+/* If your shitbox doesn't have getopt, step into the nineties already. */
+/* optarg, optind = next-argv-component [i.e. flag arg]; optopt = last-char */
+  while ((x = getopt (argc, argv, "ae:g:G:hi:lno:p:rs:tuvw:z")) != -1) {
+/* Debug (("in go: x now %c, optarg %x optind %d", x, optarg, optind)) */
+    switch (x) {
+      case 'a':
+        bail ("all-A-records NIY");
+        o_alla++; break;
+#ifdef GAPING_SECURITY_HOLE
+      case 'e':                         /* prog to exec */
+        pr00gie = optarg;
+        break;
+#endif
+      case 'G':                         /* srcrt gateways pointer val */
+        x = atoi (optarg);
+        if ((x) && (x == (x & 0x1c)))   /* mask off bits of fukt values */
+          gatesptr = x;
+        else
+          bail ("invalid hop pointer %d, must be multiple of 4 <= 28", x);
+        break;
+      case 'g':                         /* srcroute hop[s] */
+        if (gatesidx > 8)
+          bail ("too many -g hops");
+        if (gates == NULL)              /* eat this, Billy-boy */
+          gates = (HINF **) Hmalloc (sizeof (HINF *) * 10);
+        gp = gethostpoop (optarg, o_nflag);
+        if (gp)
+          gates[gatesidx] = gp;
+        gatesidx++;
+        break;
+      case 'h':
+        errno = 0;
+#ifdef HAVE_HELP
+        helpme();                       /* exits by itself */
+#else
+        bail ("no help available, dork -- RTFS");
+#endif
+      case 'i':                         /* line-interval time */
+        o_interval = atoi (optarg) & 0xffff;
+        if (! o_interval)
+          bail ("invalid interval time %s", optarg);
+        break;
+      case 'l':                         /* listen mode */
+        o_listen++; break;
+      case 'n':                         /* numeric-only, no DNS lookups */
+        o_nflag++; break;
+      case 'o':                         /* hexdump log */
+        stage = (unsigned char *) optarg;
+        o_wfile++; break;
+      case 'p':                         /* local source port */
+        o_lport = getportpoop (optarg, 0);
+        if (o_lport == 0)
+          bail ("invalid local port %s", optarg);
+        break;
+      case 'r':                         /* randomize various things */
+        o_random++; break;
+      case 's':                         /* local source address */
+/* do a full lookup [since everything else goes through the same mill],
+   unless -n was previously specified.  In fact, careful placement of -n can
+   be useful, so we'll still pass o_nflag here instead of forcing numeric.  */
+        wherefrom = gethostpoop (optarg, o_nflag);
+        ouraddr = &wherefrom->iaddrs[0];
+        break;
+#ifdef TELNET
+      case 't':                         /* do telnet fakeout */
+        o_tn++; break;
+#endif /* TELNET */
+      case 'u':                         /* use UDP */
+        o_udpmode++; break;
+      case 'v':                         /* verbose */
+        o_verbose++; break;
+      case 'w':                         /* wait time */
+        o_wait = atoi (optarg);
+        if (o_wait <= 0)
+          bail ("invalid wait-time %s", optarg);
+        timer1 = (struct timeval *) Hmalloc (sizeof (struct timeval));
+        timer2 = (struct timeval *) Hmalloc (sizeof (struct timeval));
+        timer1->tv_sec = o_wait;        /* we need two.  see readwrite()... */
+        break;
+      case 'z':                         /* little or no data xfer */
+        o_zero++;
+        break;
+      default:
+        errno = 0;
+        bail ("nc -h for help");
+    } /* switch x */
+  } /* while getopt */
+
+/* other misc initialization */
+Debug (("fd_set size %d", sizeof (*ding1)))     /* how big *is* it? */
+  FD_SET (0, ding1);                    /* stdin *is* initially open */
+  if (o_random) {
+    SRAND (time (0));
+    randports = Hmalloc (65536);        /* big flag array for ports */
+  }
+#ifdef GAPING_SECURITY_HOLE
+  if (pr00gie) {
+    close (0);                          /* won't need stdin */
+    o_wfile = 0;                        /* -o with -e is meaningless! */
+    ofd = 0;
+  }
+#endif /* G_S_H */
+  if (o_wfile) {
+    ofd = open (stage, O_WRONLY | O_CREAT | O_TRUNC, 0664);
+    if (ofd <= 0)                       /* must be > extant 0/1/2 */
+      bail ("can't open %s", stage);
+    stage = (unsigned char *) Hmalloc (100);
+  }
+
+/* optind is now index of first non -x arg */
+Debug (("after go: x now %c, optarg %x optind %d", x, optarg, optind))
+/* Debug (("optind up to %d at host-arg %s", optind, argv[optind])) */
+/* gonna only use first addr of host-list, like our IQ was normal; if you wanna
+   get fancy with addresses, look up the list yourself and plug 'em in for now.
+   unless we finally implement -a, that is. */
+  if (argv[optind])
+    whereto = gethostpoop (argv[optind], o_nflag);
+  if (whereto && whereto->iaddrs)
+    themaddr = &whereto->iaddrs[0];
+  if (themaddr)
+    optind++;                           /* skip past valid host lookup */
+  errno = 0;
+  h_errno = 0;
+
+/* Handle listen mode here, and exit afterward.  Only does one connect;
+   this is arguably the right thing to do.  A "persistent listen-and-fork"
+   mode a la inetd has been thought about, but not implemented.  A tiny
+   wrapper script can handle such things... */
+  if (o_listen) {
+    curport = 0;                        /* rem port *can* be zero here... */
+    if (argv[optind]) {                 /* any rem-port-arg? */
+      curport = getportpoop (argv[optind], 0);
+      if (curport == 0)                 /* if given, demand correctness */
+        bail ("invalid port %s", argv[optind]);
+    } /* if port-arg */
+    netfd = dolisten (themaddr, curport, ouraddr, o_lport);
+/* dolisten does its own connect reporting, so we don't holler anything here */
+    if (netfd > 0) {
+#ifdef GAPING_SECURITY_HOLE
+      if (pr00gie)                      /* -e given? */
+        doexec (netfd);
+#endif /* GAPING_SECURITY_HOLE */
+      x = readwrite (netfd);            /* it even works with UDP! */
+      if (o_verbose > 1)                /* normally we don't care */
+        holler (wrote_txt, wrote_net, wrote_out);
+      exit (x);                         /* "pack out yer trash" */
+    } else /* if no netfd */
+      bail ("no connection");
+  } /* o_listen */
+
+/* fall thru to outbound connects.  Now we're more picky about args... */
+  if (! themaddr)
+    bail ("no destination");
+  if (argv[optind] == NULL)
+    bail ("no port[s] to connect to");
+  if (argv[optind + 1])         /* look ahead: any more port args given? */
+    Single = 0;                         /* multi-mode, case A */
+  ourport = o_lport;                    /* which can be 0 */
+
+/* everything from here down is treated as as ports and/or ranges thereof, so
+   it's all enclosed in this big ol' argv-parsin' loop.  Any randomization is
+   done within each given *range*, but in separate chunks per each succeeding
+   argument, so we can control the pattern somewhat. */
+  while (argv[optind]) {
+    hiport = loport = 0;
+    cp = strchr (argv[optind], '-');    /* nn-mm range? */
+    if (cp) {
+      *cp = '\0';
+      cp++;
+      hiport = getportpoop (cp, 0);
+      if (hiport == 0)
+        bail ("invalid port %s", cp);
+    } /* if found a dash */
+    loport = getportpoop (argv[optind], 0);
+    if (loport == 0)
+      bail ("invalid port %s", argv[optind]);
+    if (hiport > loport) {              /* was it genuinely a range? */
+      Single = 0;                       /* multi-mode, case B */
+      curport = hiport;                 /* start high by default */
+      if (o_random) {                   /* maybe populate the random array */
+        loadports (randports, loport, hiport);
+        curport = nextport (randports);
+      }
+    } else                      /* not a range, including args like "25-25" */
+      curport = loport;
+Debug (("Single %d, curport %d", Single, curport))
+
+/* Now start connecting to these things.  curport is already preloaded. */
+    while (loport <= curport) {
+      if ((! o_lport) && (o_random)) {  /* -p overrides random local-port */
+        ourport = (RAND() & 0xffff);    /* random local-bind -- well above */
+        if (ourport < 8192)             /* resv and any likely listeners??? */
+          ourport += 8192;              /* if it *still* conflicts, use -s. */
+      }
+      curport = getportpoop (NULL, curport);
+      netfd = doconnect (themaddr, curport, ouraddr, ourport);
+Debug (("netfd %d from port %d to port %d", netfd, ourport, curport))
+      if (netfd > 0)
+        if (o_zero && o_udpmode)        /* if UDP scanning... */
+          netfd = udptest (netfd, themaddr);
+      if (netfd > 0) {                  /* Yow, are we OPEN YET?! */
+        x = 0;                          /* pre-exit status */
+        holler ("%s [%s] %d (%s) open",
+          whereto->name, whereto->addrs[0], curport, portpoop->name);
+#ifdef GAPING_SECURITY_HOLE
+        if (pr00gie)                    /* exec is valid for outbound, too */
+          doexec (netfd);
+#endif /* GAPING_SECURITY_HOLE */
+        if (! o_zero)
+          x = readwrite (netfd);        /* go shovel shit */
+      } else { /* no netfd... */
+        x = 1;                          /* preload exit status for later */
+/* if we're scanning at a "one -v" verbosity level, don't print refusals.
+   Give it another -v if you want to see everything. */
+        if ((Single || (o_verbose > 1)) || (errno != ECONNREFUSED))
+          holler ("%s [%s] %d (%s)",
+            whereto->name, whereto->addrs[0], curport, portpoop->name);
+      } /* if netfd */
+      close (netfd);                    /* just in case we didn't already */
+      if (o_interval)
+        sleep (o_interval);             /* if -i, delay between ports too */
+      if (o_random)
+        curport = nextport (randports);
+      else
+        curport--;                      /* just decrement... */
+    } /* while curport within current range */
+    optind++;
+  } /* while remaining port-args -- end of big argv-ports loop*/
+
+  errno = 0;
+  if (o_verbose > 1)            /* normally we don't care */
+    holler (wrote_txt, wrote_net, wrote_out);
+  if (Single)
+    exit (x);                   /* give us status on one connection */
+  exit (0);                     /* otherwise, we're just done */
+} /* main */
+
+#ifdef HAVE_HELP                /* unless we wanna be *really* cryptic */
+/* helpme :
+   the obvious */
+helpme()
+{
+  o_verbose = 1;
+  holler ("[v1.10]\n\
+connect to somewhere:   nc [-options] hostname port[s] [ports] ... \n\
+listen for inbound:     nc -l -p port [-options] [hostname] [port]\n\
+options:");
+/* sigh, this necessarily gets messy.  And the trailing \ characters may be
+   interpreted oddly by some compilers, generating or not generating extra
+   newlines as they bloody please.  u-fix... */
+#ifdef GAPING_SECURITY_HOLE     /* needs to be separate holler() */
+  holler ("\
+        -e prog                 program to exec after connect [dangerous!!]");
+#endif
+  holler ("\
+        -g gateway              source-routing hop point[s], up to 8\n\
+        -G num                  source-routing pointer: 4, 8, 12, ...\n\
+        -h                      this cruft\n\
+        -i secs                 delay interval for lines sent, ports scanned\n\
+        -l                      listen mode, for inbound connects\n\
+        -n                      numeric-only IP addresses, no DNS\n\
+        -o file                 hex dump of traffic\n\
+        -p port                 local port number\n\
+        -r                      randomize local and remote ports\n\
+        -s addr                 local source address");
+#ifdef TELNET
+  holler ("\
+        -t                      answer TELNET negotiation");
+#endif
+  holler ("\
+        -u                      UDP mode\n\
+        -v                      verbose [use twice to be more verbose]\n\
+        -w secs                 timeout for connects and final net reads\n\
+        -z                      zero-I/O mode [used for scanning]");
+  bail ("port numbers can be individual or ranges: lo-hi [inclusive]");
+} /* helpme */
+#endif /* HAVE_HELP */
+
+/* None genuine without this seal!  _H*/
diff --git a/src/usr.bin/nc/scripts/README b/src/usr.bin/nc/scripts/README
new file mode 100644
index 0000000000..07aee0c8ea
--- /dev/null
+++ b/src/usr.bin/nc/scripts/README
@@ -0,0 +1,5 @@
+A collection of example scripts that use netcat as a backend, each
+documented by its own internal comments.
+
+I'll be the first to admit that some of these are seriously *sick*,
+but they do work and are quite useful to me on a daily basis.
diff --git a/src/usr.bin/nc/scripts/alta b/src/usr.bin/nc/scripts/alta
new file mode 100644
index 0000000000..7a091767e8
--- /dev/null
+++ b/src/usr.bin/nc/scripts/alta
@@ -0,0 +1,33 @@
+#! /bin/sh
+## special handler for altavista, since they only hand out chunks of 10 at
+## a time.  Tries to isolate out results without the leading/trailing trash.
+## multiword arguments are foo+bar, as usual.
+## Second optional arg switches the "what" field, to e.g. "news"
+
+test "${1}" = "" && echo 'Needs an argument to search for!' && exit 1
+WHAT="web"
+test "${2}" && WHAT="${2}"
+
+# convert multiple args
+PLUSARG="`echo $* | sed 's/ /+/g'`"
+
+# Plug in arg.  only doing simple-q for now; pg=aq for advanced-query
+# embedded quotes define phrases; otherwise it goes wild on multi-words
+QB="GET /cgi-bin/query?pg=q&what=${WHAT}&fmt=c&q=\"${PLUSARG}\""
+
+# ping 'em once, to get the routing warm
+nc -z -w 8 www.altavista.digital.com 24015 2> /dev/null
+echo "=== Altavista ==="
+
+for xx in 0 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 \
+  190 200 210 220 230 240 250 260 270 280 290 300 310 320 330 340 350 ; do
+  echo "${QB}&stq=${xx}" | nc -w 15 www.altavista.digital.com 80 | \
+  egrep '^<a href="http://'
+done
+
+exit 0
+
+# old filter stuff
+  sed -e '/Documents .* matching .* query /,/query?.*stq=.* Document/p' \
+  -e d
+
diff --git a/src/usr.bin/nc/scripts/bsh b/src/usr.bin/nc/scripts/bsh
new file mode 100644
index 0000000000..796e480354
--- /dev/null
+++ b/src/usr.bin/nc/scripts/bsh
@@ -0,0 +1,29 @@
+#! /bin/sh
+## a little wrapper to "password" and re-launch a shell-listener.
+## Arg is taken as the port to listen on.  Define "NC" to point wherever.
+
+NC=nc
+
+case "$1" in
+  ?* )
+  LPN="$1"
+  export LPN
+  sleep 1
+  echo "-l -p $LPN -e $0" | $NC > /dev/null 2>&1 &
+  echo "launched on port $LPN"
+  exit 0
+  ;;
+esac
+
+# here we play inetd
+echo "-l -p $LPN -e $0" | $NC > /dev/null 2>&1 &
+
+while read qq ; do
+case "$qq" in
+# here's yer password
+  gimme )
+  cd /
+  exec csh -i
+  ;;
+esac
+done
diff --git a/src/usr.bin/nc/scripts/dist.sh b/src/usr.bin/nc/scripts/dist.sh
new file mode 100644
index 0000000000..4d2534a0e3
--- /dev/null
+++ b/src/usr.bin/nc/scripts/dist.sh
@@ -0,0 +1,23 @@
+#! /bin/sh
+## This is a quick example listen-exec server, which was used for a while to
+## distribute netcat prereleases.  It illustrates use of netcat both as a
+## "fake inetd" and a syslogger, and how easy it then is to crock up a fairly
+## functional server that restarts its own listener and does full connection
+## logging.  In a half-screen of shell script!!
+
+PORT=31337
+
+sleep 1
+SRC=`tail -1 dist.log`
+echo "<36>elite: ${SRC}" | ./nc -u -w 1 localhost 514 > /dev/null 2>&1
+echo ";;; Hi, ${SRC}..."
+echo ";;; This is a PRERELEASE version of 'netcat', tar/gzip/uuencoded."
+echo ";;; Unless you are capturing this somehow, it won't do you much good."
+echo ";;; Ready??  Here it comes!  Have phun ..."
+sleep 8
+cat dist.file
+sleep 1
+./nc -v -l -p ${PORT} -e dist.sh < /dev/null >> dist.log 2>&1 &
+sleep 1
+echo "<36>elite: done" | ./nc -u -w 1 localhost 514 > /dev/null 2>&1
+exit 0
diff --git a/src/usr.bin/nc/scripts/irc b/src/usr.bin/nc/scripts/irc
new file mode 100644
index 0000000000..3557d7a0c6
--- /dev/null
+++ b/src/usr.bin/nc/scripts/irc
@@ -0,0 +1,79 @@
+#! /bin/sh
+## Shit-simple script to supply the "privmsg <recipient>" of IRC typein, and
+## keep the connection alive.  Pipe this thru "nc -v -w 5 irc-server port".
+## Note that this mechanism makes the script easy to debug without being live,
+## since it just echoes everything bound for the server.
+## if you want autologin-type stuff, construct some appropriate files and
+## shovel them in using the "<" mechanism.
+
+# magic arg: if "tick", do keepalive process instead of main loop
+if test "$1" = "tick" ; then
+# ignore most signals; the parent will nuke the kid
+# doesn't stop ^Z, of course.
+  trap '' 1 2 3 13 14 15 16
+  while true ; do
+    sleep 60
+    echo "PONG !"
+  done
+fi
+
+# top level: fire ourselves off as the keepalive process, and keep track of it
+sh $0 tick &
+ircpp=$!
+echo "[Keepalive: $ircpp]" >&2
+# catch our own batch of signals: hup int quit pipe alrm term urg
+trap 'kill -9 $ircpp ; exit 0' 1 2 3 13 14 15 16
+sleep 2
+
+sender=''
+savecmd=''
+
+# the big honkin' loop...
+while read xx yy ; do
+  case "${xx}" in
+# blank line: do nothing
+    "")
+        continue
+    ;;
+# new channel or recipient; if bare ">", we're back to raw literal mode.
+    ">")
+        if test "${yy}" ; then
+          sender="privmsg ${yy} :"
+        else
+          sender=''
+        fi
+        continue
+    ;;
+# send crud from a file, one line per second.  Can you say "skr1pt kidz"??
+# *Note: uses current "recipient" if set.
+    "<")
+        if test -f "${yy}" ; then
+          ( while read zz ; do
+            sleep 1
+            echo "${sender}${zz}"
+          done ) < "$yy"
+          echo "[done]" >&2
+        else
+          echo "[File $yy not found]" >&2
+        fi
+        continue
+    ;;
+# do and save a single command, for quick repeat
+    "/")
+        if test "${yy}" ; then
+          savecmd="${yy}"
+        fi
+        echo "${savecmd}"
+    ;;
+# default case goes to recipient, just like always
+    *)
+        echo "${sender}${xx} ${yy}"
+        continue
+    ;;
+  esac
+done
+
+# parting shot, if you want it
+echo "quit :Bye all!"
+kill -9 $ircpp
+exit 0
diff --git a/src/usr.bin/nc/scripts/iscan b/src/usr.bin/nc/scripts/iscan
new file mode 100644
index 0000000000..6279bc817f
--- /dev/null
+++ b/src/usr.bin/nc/scripts/iscan
@@ -0,0 +1,35 @@
+#! /bin/sh
+## duplicate DaveG's ident-scan thingie using netcat.  Oooh, he'll be pissed.
+## args: target port [port port port ...]
+## hose stdout *and* stderr together.
+##
+## advantages: runs slower than ident-scan, giving remote inetd less cause
+## for alarm, and only hits the few known daemon ports you specify.
+## disadvantages: requires numeric-only port args, the output sleazitude,
+## and won't work for r-services when coming from high source ports.
+
+case "${2}" in
+  "" ) echo needs HOST and at least one PORT ; exit 1 ;;
+esac
+
+# ping 'em once and see if they *are* running identd
+nc -z -w 9 "$1" 113 || { echo "oops, $1 isn't running identd" ; exit 0 ; }
+
+# generate a randomish base port
+RP=`expr $$ % 999 + 31337`
+
+TRG="$1"
+shift
+
+while test "$1" ; do
+  nc -v -w 8 -p ${RP} "$TRG" ${1} < /dev/null > /dev/null &
+  PROC=$!
+  sleep 3
+  echo "${1},${RP}" | nc -w 4 -r "$TRG" 113 2>&1
+  sleep 2
+# does this look like a lamer script or what...
+  kill -HUP $PROC
+  RP=`expr ${RP} + 1`
+  shift
+done
+
diff --git a/src/usr.bin/nc/scripts/ncp b/src/usr.bin/nc/scripts/ncp
new file mode 100644
index 0000000000..1931b03385
--- /dev/null
+++ b/src/usr.bin/nc/scripts/ncp
@@ -0,0 +1,46 @@
+#! /bin/sh
+## Like "rcp" but uses netcat on a high port.
+## do "ncp targetfile" on the RECEIVING machine
+## then do "ncp sourcefile receivinghost" on the SENDING machine
+## if invoked as "nzp" instead, compresses transit data.
+
+## pick your own personal favorite port, which will be used on both ends.
+## You should probably change this for your own uses.
+MYPORT=23456
+
+## if "nc" isn't systemwide or in your PATH, add the right place
+# PATH=${HOME}:${PATH} ; export PATH
+
+test "$3" && echo "too many args" && exit 1
+test ! "$1" && echo "no args?" && exit 1
+me=`echo $0 | sed 's+.*/++'`
+test "$me" = "nzp" && echo '[compressed mode]'
+
+# if second arg, it's a host to send an [extant] file to.
+if test "$2" ; then
+  test ! -f "$1" && echo "can't find $1" && exit 1
+  if test "$me" = "nzp" ; then
+    compress -c < "$1" | nc -v -w 2 $2 $MYPORT && exit 0
+  else
+    nc -v -w 2 $2 $MYPORT < "$1" && exit 0
+  fi
+  echo "transfer FAILED!"
+  exit 1
+fi
+
+# fall here for receiver.  Ask before trashing existing files
+if test -f "$1" ; then
+  echo -n "Overwrite $1? "
+  read aa
+  test ! "$aa" = "y" && echo "[punted!]" && exit 1
+fi
+# 30 seconds oughta be pleeeeenty of time, but change if you want.
+if test "$me" = "nzp" ; then
+  nc -v -w 30 -p $MYPORT -l < /dev/null | uncompress -c > "$1" && exit 0
+else
+  nc -v -w 30 -p $MYPORT -l < /dev/null > "$1" && exit 0
+fi
+echo "transfer FAILED!"
+# clean up, since even if the transfer failed, $1 is already trashed
+rm -f "$1"
+exit 1
diff --git a/src/usr.bin/nc/scripts/probe b/src/usr.bin/nc/scripts/probe
new file mode 100644
index 0000000000..c47dc3f495
--- /dev/null
+++ b/src/usr.bin/nc/scripts/probe
@@ -0,0 +1,50 @@
+#! /bin/sh
+## launch a whole buncha shit at yon victim in no particular order; capture
+## stderr+stdout in one place.  Run as root for rservice and low -p to work.
+## Fairly thorough example of using netcat to collect a lot of host info.
+## Will set off every intrusion alarm in existence on a paranoid machine!
+
+# where .d files are kept; "." if nothing else
+DDIR=../data
+# address of some well-connected router that groks LSRR
+GATE=192.157.69.11
+
+# might conceivably wanna change this for different run styles
+UCMD='nc -v -w 8'
+
+test ! "$1" && echo Needs victim arg && exit 1
+
+echo '' | $UCMD -w 9 -r "$1" 13 79 6667 2>&1
+echo '0' | $UCMD "$1" 79 2>&1
+# if LSRR was passed thru, should get refusal here:
+$UCMD -z -r -g $GATE "$1" 6473 2>&1
+$UCMD -r -z "$1" 6000 4000-4004 111 53 2105 137-140 1-20 540-550 95 87 2>&1
+# -s `hostname` may be wrong for some multihomed machines
+echo 'UDP echoecho!' | nc -u -p 7 -s `hostname` -w 3 "$1" 7 19 2>&1
+echo '113,10158' | $UCMD -p 10158 "$1" 113 2>&1
+rservice bin bin | $UCMD -p 1019 "$1" shell 2>&1
+echo QUIT | $UCMD -w 8 -r "$1" 25 158 159 119 110 109 1109 142-144 220 23 2>&1
+# newline after any telnet trash
+echo ''
+echo PASV | $UCMD -r "$1" 21 2>&1
+echo 'GET /' | $UCMD -w 10 "$1" 80 81 210 70 2>&1
+# sometimes contains useful directory info:
+echo 'GET /robots.txt' | $UCMD -w 10 "$1" 80 2>&1
+# now the big red lights go on
+rservice bin bin 9600/9600 | $UCMD -p 1020 "$1" login 2>&1
+rservice root root | $UCMD -r "$1" exec 2>&1
+echo 'BEGIN big udp -- everything may look "open" if packet-filtered'
+data -g < ${DDIR}/nfs-0.d | $UCMD -i 1 -u "$1" 2049 | od -x 2>&1
+# no wait-time, uses RTT hack
+nc -v -z -u -r "$1" 111 66-70 88 53 87 161-164 121-123 213 49 2>&1
+nc -v -z -u -r "$1" 137-140 694-712 747-770 175-180 2103 510-530 2>&1
+echo 'END big udp'
+$UCMD -r -z "$1" 175-180 2000-2003 530-533 1524 1525 666 213 8000 6250 2>&1
+# Use our identd-sniffer!
+iscan "$1" 21 25 79 80 111 53 6667 6000 2049 119 2>&1
+# this gets pretty intrusive, but what the fuck.  Probe for portmap first
+if nc -w 5 -z -u "$1" 111 ; then
+  showmount -e "$1" 2>&1
+  rpcinfo -p "$1" 2>&1
+fi
+exit 0
diff --git a/src/usr.bin/nc/scripts/web b/src/usr.bin/nc/scripts/web
new file mode 100644
index 0000000000..382b18e1e3
--- /dev/null
+++ b/src/usr.bin/nc/scripts/web
@@ -0,0 +1,148 @@
+#! /bin/sh
+## The web sucks.  It is a mighty dismal kludge built out of a thousand
+## tiny dismal kludges all band-aided together, and now these bottom-line
+## clueless pinheads who never heard of "TCP handshake" want to run
+## *commerce* over the damn thing.  Ye godz.  Welcome to TV of the next
+## century -- six million channels of worthless shit to choose from, and
+## about as much security as today's cable industry!
+##
+## Having grown mightily tired of pain in the ass browsers, I decided
+## to build the minimalist client.  It doesn't handle POST, just GETs, but
+## the majority of cgi forms handlers apparently ignore the method anyway.
+## A distinct advantage is that it *doesn't* pass on any other information
+## to the server, like Referer: or info about your local machine such as
+## Netscum tries to!
+##
+## Since the first version, this has become the *almost*-minimalist client,
+## but it saves a lot of typing now.  And with netcat as its backend, it's
+## totally the balls.  Don't have netcat?  Get it here in /src/hacks!
+## _H* 950824, updated 951009 et seq.
+##
+## args: hostname [port].  You feed it the filename-parts of URLs.
+## In the loop, HOST, PORT, and SAVE do the right things; a null line
+## gets the previous spec again [useful for initial timeouts]; EOF to exit.
+## Relative URLs behave like a "cd" to wherever the last slash appears, or
+## just use the last component with the saved preceding "directory" part.
+## "\" clears the "filename" part and asks for just the "directory", and
+## ".." goes up one "directory" level while retaining the "filename" part.
+## Play around; you'll get used to it.
+
+if test "$1" = "" ; then
+  echo Needs hostname arg.
+  exit 1
+fi
+umask 022
+
+# optional PATH fixup
+# PATH=${HOME}:${PATH} ; export PATH
+
+test "${PAGER}" || PAGER=more
+BACKEND="nc -v -w 15"
+TMPAGE=/tmp/web$$
+host="$1"
+port="80"
+if test "$2" != "" ; then
+  port="$2"
+fi
+
+spec="/"
+specD="/"
+specF=''
+saving=''
+
+# be vaguely smart about temp file usage.  Use your own homedir if you're
+# paranoid about someone symlink-racing your shell script, jeez.
+rm -f ${TMPAGE}
+test -f ${TMPAGE} && echo "Can't use ${TMPAGE}" && exit 1
+
+# get loopy.  Yes, I know "echo -n" aint portable.  Everything echoed would
+# need "\c" tacked onto the end in an SV universe, which you can fix yourself.
+while echo -n "${specD}${specF} " && read spec ; do
+  case $spec in
+  HOST)
+    echo -n 'New host: '
+    read host
+    continue
+  ;;
+  PORT)
+    echo -n 'New port: '
+    read port
+    continue
+  ;;
+  SAVE)
+    echo -n 'Save file: '
+    read saving
+# if we've already got a page, save it
+    test "${saving}" && test -f ${TMPAGE} &&
+      echo "=== ${host}:${specD}${specF} ===" >> $saving &&
+      cat ${TMPAGE} >> $saving && echo '' >> $saving
+    continue
+  ;;
+# changing the logic a bit here.  Keep a state-concept of "current dir"
+# and "current file".  Dir is /foo/bar/ ; file is "baz" or null.
+# leading slash: create whole new state.
+  /*)
+    specF=`echo "${spec}" | sed 's|.*/||'`
+    specD=`echo "${spec}" | sed 's|\(.*/\).*|\1|'`
+    spec="${specD}${specF}"
+  ;;
+# embedded slash: adding to the path.  "file" part can be blank, too
+  */*)
+    specF=`echo "${spec}" | sed 's|.*/||'`
+    specD=`echo "${specD}${spec}" | sed 's|\(.*/\).*|\1|'`
+  ;;
+# dotdot: jump "up" one level and just reprompt [confirms what it did...]
+  ..)
+    specD=`echo "${specD}" | sed 's|\(.*/\)..*/|\1|'`
+    continue
+  ;;
+# blank line: do nothing, which will re-get the current one
+  '')
+  ;;
+# hack-quoted blank line: "\" means just zero out "file" part
+  '\')
+    specF=''
+  ;;
+# sigh
+  '?')
+    echo Help yourself.  Read the script fer krissake.
+    continue
+  ;;
+# anything else is taken as a "file" part
+  *)
+    specF=${spec}
+  ;;
+  esac
+
+# now put it together and stuff it down a connection.  Some lame non-unix
+# http servers assume they'll never get simple-query format, and wait till
+# an extra newline arrives.  If you're up against one of these, change
+# below to (echo GET "$spec" ; echo '') | $BACKEND ...
+  spec="${specD}${specF}"
+    echo GET "${spec}" | $BACKEND $host $port > ${TMPAGE}
+  ${PAGER} ${TMPAGE}
+
+# save in a format that still shows the URLs we hit after a de-html run
+  if test "${saving}" ; then
+    echo "=== ${host}:${spec} ===" >> $saving
+    cat ${TMPAGE} >> $saving
+    echo '' >> $saving
+  fi
+done
+rm -f ${TMPAGE}
+exit 0
+
+#######
+# Encoding notes, finally from RFC 1738:
+# %XX -- hex-encode of special chars
+# allowed alphas in a URL: $_-.+!*'(),
+# relative names *not* described, but obviously used all over the place
+# transport://user:pass@host:port/path/name?query-string
+# wais: port 210, //host:port/database?search or /database/type/file?
+# cgi-bin/script?arg1=foo&arg2=bar&...  scripts have to parse xxx&yyy&zzz
+# ISMAP imagemap stuff: /bin/foobar.map?xxx,yyy -- have to guess at coords!
+# local access-ctl files: ncsa: .htaccess ; cern: .www_acl
+#######
+# SEARCH ENGINES: fortunately, all are GET forms or at least work that way...
+# multi-word args for most cases: foo+bar
+# See 'websearch' for concise results of this research...
diff --git a/src/usr.bin/nc/scripts/webproxy b/src/usr.bin/nc/scripts/webproxy
new file mode 100644
index 0000000000..cee2d29fd1
--- /dev/null
+++ b/src/usr.bin/nc/scripts/webproxy
@@ -0,0 +1,138 @@
+#! /bin/sh
+## Web proxy, following the grand tradition of Web things being handled by
+## gross scripts.  Uses netcat to listen on a high port [default 8000],
+## picks apart requests and sends them on to the right place.  Point this
+## at the browser client machine you'll be coming from [to limit access to
+## only it], and point the browser's concept of an HTTP proxy to the
+## machine running this.  Takes a single argument of the client that will
+## be using it, and rejects connections from elsewhere.  LOGS the queries
+## to a configurable logfile, which can be an interesting read later on!
+## If the argument is "reset", the listener and logfile are cleaned up.
+##
+## This works surprisingly fast and well, for a shell script, although may
+## randomly fail when hammered by a browser that tries to open several
+## connections at once.  Drop the "maximum connections" in your browser if
+## this is a problem.
+##
+## A more degenerate case of this, or preferably a small C program that
+## does the same thing under inetd, could handle a small site's worth of
+## proxy queries.  Given the way browsers are evolving, proxies like this
+## can play an important role in protecting your own privacy.
+##
+## If you grabbed this in ASCII mode, search down for "eew" and make sure
+## the embedded-CR check is intact, or requests might hang.
+##
+## Doesn't handle POST forms.  Who cares, if you're just watching HTTV?
+## Dumbness here has a highly desirable side effect: it only sends the first
+## GET line, since that's all you really ever need to send, and suppresses
+## the other somewhat revealing trash that most browsers insist on sending.
+
+# set these as you wish: proxy port...
+PORT=8000
+# logfile spec: a real file or /dev/null if you don't care
+LFILE=${0}.log
+# optional: where to dump connect info, so you can see if anything went wrong
+# CFILE=${0}.conn
+# optional extra args to the listener "nc", for instance "-s inside-net-addr"
+# XNC=''
+
+# functionality switch has to be done fast, so the next listener can start
+# prelaunch check: if no current client and no args, bail.
+case "${1}${CLIENT}" in
+  "")
+    echo needs client hostname
+    exit 1
+  ;;
+esac
+
+case "${1}" in
+  "")
+# Make like inetd, and run the next relayer process NOW.  All the redirection
+# is necessary so this shell has NO remaining channel open to the net.
+# This will hang around for 10 minutes, and exit if no new connections arrive.
+# Using -n for speed, avoiding any DNS/port lookups.
+    nc -w 600 -n -l -p $PORT -e "$0" $XNC "$CLIENT" < /dev/null > /dev/null \
+        2> $CFILE &
+  ;;
+esac
+
+# no client yet and had an arg, this checking can be much slower now
+umask 077
+
+if test "$1" ; then
+# if magic arg, just clean up and then hit our own port to cause server exit
+  if test "$1" = "reset" ; then
+    rm -f $LFILE
+    test -f "$CFILE" && rm -f $CFILE
+    nc -w 1 -n 127.0.0.1 $PORT < /dev/null > /dev/null 2>&1
+    exit 0
+  fi
+# find our ass with both hands
+  test ! -f "$0" && echo "Oops, cannot find my own corporeal being" && exit 1
+# correct launch: set up client access control, passed along thru environment.
+  CLIENT="$1"
+  export CLIENT
+  test "$CFILE" || CFILE=/dev/null
+  export CFILE
+  touch "$CFILE"
+# tell us what happened during the last run, if possible
+  if test -f "$CFILE"  ; then
+    echo "Last connection results:"
+    cat $CFILE
+  fi
+
+# ping client machine and get its bare IP address
+  CLIENT=`nc -z -v -w 8 "$1" 22000 2>&1 | sed 's/.*\[\(..*\)\].*/\1/'`
+  test ! "$CLIENT" && echo "Can't find address of $1" && exit 1
+
+# if this was an initial launch, be informative about it
+  echo "=== Launch: $CLIENT" >> $LFILE
+  echo "Proxy running -- will accept connections on $PORT from $CLIENT"
+  echo "  Logging queries to $LFILE"
+  test -f "$CFILE" && echo "  and connection fuckups to $CFILE"
+
+# and run the first listener, showing us output just for the first hit
+  nc -v -w 600 -n -l -p $PORT -e "$0" $XNC "$CLIENT" &
+  exit 0
+fi
+
+# Fall here to handle a page.
+# GET type://host.name:80/file/path HTTP/1.0
+# Additional: trash
+# More: trash
+# <newline>
+
+read x1 x2 x3 x4
+echo "=== query: $x1 $x2 $x3 $x4" >> $LFILE
+test "$x4" && echo "extra junk after request: $x4" && exit 0
+# nuke questionable characters and split up the request
+hurl=`echo "$x2" | sed -e "s+.*//++" -e 's+[\`'\''|$;<>{}\\!*()"]++g'`
+# echo massaged hurl: $hurl >> $LFILE
+hh=`echo "$hurl" | sed -e "s+/.*++" -e "s+:.*++"`
+hp=`echo "$hurl" | sed -e "s+.*:++" -e "s+/.*++"`
+test "$hp" = "$hh" && hp=80
+hf=`echo "$hurl" | sed -e "s+[^/]*++"`
+# echo total split: $hh : $hp : $hf >> $LFILE
+# suck in and log the entire request, because we're curious
+# Fails on multipart stuff like forms; oh well...
+if test "$x3" ; then
+  while read xx ; do
+    echo "${xx}" >> $LFILE
+    test "${xx}" || break
+# eew, buried returns, gross but necessary for DOS stupidity:
+    test "${xx}" = "
" && break
+  done
+fi
+# check for non-GET *after* we log the query...
+test "$x1" != "GET" && echo "sorry, this proxy only does GETs" && exit 0
+# no, you can *not* phone home, you miserable piece of shit
+test "`echo $hh | fgrep -i netscap`" && \
+  echo "access to Netscam's servers <b>DENIED.</b>" && exit 0
+# Do it.  30 sec net-wait time oughta be *plenty*...
+# Some braindead servers have forgotten how to handle the simple-query syntax.
+# If necessary, replace below with (echo "$x1 $hf" ; echo '') | nc...
+echo "$x1 $hf" | nc -w 30 "$hh" "$hp" 2> /dev/null || \
+  echo "oops, can't get to $hh : $hp".
+echo "sent \"$x1 $hf\" to $hh : $hp" >> $LFILE
+exit 0
+
diff --git a/src/usr.bin/nc/scripts/webrelay b/src/usr.bin/nc/scripts/webrelay
new file mode 100644
index 0000000000..829a8b0708
--- /dev/null
+++ b/src/usr.bin/nc/scripts/webrelay
@@ -0,0 +1,44 @@
+#! /bin/sh
+## web relay -- a degenerate version of webproxy, usable with browsers that
+## don't understand proxies.  This just forwards connections to a given server.
+## No query logging, no access control [although you can add it to XNC for
+## your own run], and full-URL links will undoubtedly confuse the browser
+## if it can't reach the server directly.  This was actually written before
+## the full proxy was, and it shows.
+## The arguments in this case are the destination server and optional port.
+## Please flame pinheads who use self-referential absolute links.
+
+# set these as you wish: proxy port...
+PORT=8000
+# any extra args to the listening "nc", for instance "-s inside-net-addr"
+XNC=''
+
+# functionality switch, which has to be done fast to start the next listener
+case "${1}${RDEST}" in
+  "")
+    echo needs hostname
+    exit 1
+  ;;
+esac
+
+case "${1}" in
+  "")
+# no args: fire off new relayer process NOW.  Will hang around for 10 minutes
+    nc -w 600 -l -n -p $PORT -e "$0" $XNC < /dev/null > /dev/null 2>&1 &
+# and handle this request, which will simply fail if vars not set yet.
+    exec nc -w 15 $RDEST $RPORT
+  ;;
+esac
+
+# Fall here for setup; this can now be slower.
+RDEST="$1"
+RPORT="$2"
+test "$RPORT" || RPORT=80
+export RDEST RPORT
+
+# Launch the first relayer same as above, but let its error msgs show up
+# will hang around for a minute, and exit if no new connections arrive.
+nc -v -w 600 -l -p $PORT -e "$0" $XNC < /dev/null > /dev/null &
+echo \
+  "Relay to ${RDEST}:${RPORT} running -- point your browser here on port $PORT"
+exit 0
diff --git a/src/usr.bin/nc/scripts/websearch b/src/usr.bin/nc/scripts/websearch
new file mode 100644
index 0000000000..60c3a3356a
--- /dev/null
+++ b/src/usr.bin/nc/scripts/websearch
@@ -0,0 +1,77 @@
+#! /bin/sh
+## Hit the major search engines.  Hose the [large] output to a file!
+## autoconverts multiple arguments into the right format for given servers --
+## usually worda+wordb, with certain lame exceptions like dejanews.
+## Extracting and post-sorting the URLs is highly recommended...
+##
+## Altavista currently handled by a separate script; may merge at some point.
+##
+## _H* original 950824, updated 951218 and 960209
+
+test "${1}" = "" && echo 'Needs argument[s] to search for!' && exit 1
+PLUSARG="`echo $* | sed 's/ /+/g'`"
+PIPEARG="`echo ${PLUSARG} | sed 's/+/|/g'`"
+IFILE=/tmp/.webq.$$
+
+# Don't have "nc"?  Get "netcat" from avian.org and add it to your toolkit.
+doquery () {
+  echo GET "$1" | nc -v -i 1 -w 30 "$2" "$3"
+}
+
+# changed since original: now supplying port numbers and separator lines...
+
+echo "=== Yahoo ==="
+doquery "/bin/search?p=${PLUSARG}&n=300&w=w&s=a" search.yahoo.com 80
+
+echo '' ; echo "=== Webcrawler ==="
+doquery "/cgi-bin/WebQuery?searchText=${PLUSARG}&maxHits=300" webcrawler.com 80
+
+# the infoseek lamers want "registration" before they do a real search, but...
+echo '' ; echo "=== Infoseek ==="
+echo "  is broken."
+# doquery "WW/IS/Titles?qt=${PLUSARG}" www2.infoseek.com 80
+# ... which doesn't work cuz their lame server wants the extra newlines, WITH
+# CRLF pairs ferkrissake.  Fuck 'em for now, they're hopelessly broken.  If
+# you want to play, the basic idea and query formats follow.
+# echo "GET /WW/IS/Titles?qt=${PLUSARG}" > $IFILE
+# echo "" >> $IFILE
+# nc -v -w 30 guide-p.infoseek.com 80 < $IFILE
+
+# this is kinda flakey; might have to do twice??
+echo '' ; echo "=== Opentext ==="
+doquery "/omw/simplesearch?SearchFor=${PLUSARG}&mode=phrase" \
+  search.opentext.com 80
+
+# looks like inktomi will only take hits=100, or defaults back to 30
+# we try to suppress all the stupid rating dots here, too
+echo '' ; echo "=== Inktomi ==="
+doquery "/query/?query=${PLUSARG}&hits=100" ink3.cs.berkeley.edu 1234 | \
+  sed '/^<IMG ALT.*inktomi.*\.gif">$/d'
+
+#djnews lame shit limits hits to 120 and has nonstandard format
+echo '' ; echo "=== Dejanews ==="
+doquery "/cgi-bin/nph-dnquery?query=${PIPEARG}+maxhits=110+format=terse+defaultOp=AND" \
+  smithers.dejanews.com 80
+
+# OLD lycos: used to work until they fucking BROKE it...
+# doquery "/cgi-bin/pursuit?query=${PLUSARG}&maxhits=300&terse=1" \
+#   query5.lycos.cs.cmu.edu 80
+# NEW lycos: wants the User-agent field present in query or it returns nothing
+# 960206: webmaster@lycos duly bitched at
+# 960208: reply received; here's how we will now handle it:
+echo \
+"GET /cgi-bin/pursuit?query=${PLUSARG}&maxhits=300&terse=terse&matchmode=and&minscore=.5 HTTP/1.x" \
+  > $IFILE
+echo "User-agent: *FUCK OFF*" >> $IFILE
+echo "Why: go ask todd@pointcom.com (Todd Whitney)" >> $IFILE
+echo '' >> $IFILE
+echo '' ; echo "=== Lycos ==="
+nc -v -i 1 -w 30 twelve.srv.lycos.com 80 < $IFILE
+
+rm -f $IFILE
+exit 0
+
+# CURRENTLY BROKEN [?]
+# infoseek
+
+# some args need to be redone to ensure whatever "and" mode applies